diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..caf1d68c45d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -24,11 +24,12 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
-import netsvc
+import logging
 import pooler
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 def check_cycle(self, cr, uid, ids, context=None):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -212,7 +213,6 @@ class account_account(osv.osv):
     _name = "account.account"
     _description = "Account"
     _parent_store = True
-    logger = netsvc.Logger()
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
@@ -295,8 +295,7 @@ class account_account(osv.osv):
             if aml_query.strip():
                 wheres.append(aml_query.strip())
             filters = " AND ".join(wheres)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Filters: %s'%filters)
+            _logger.debug('Filters: %s',(filters))
             # IN might not work ideally in case there are too many
             # children_and_consolidated, in that case join on a
             # values() e.g.:
@@ -312,8 +311,7 @@ class account_account(osv.osv):
                        " GROUP BY l.account_id")
             params = (tuple(children_and_consolidated),) + query_params
             cr.execute(request, params)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Status: %s'%cr.statusmessage)
+            _logger.debug('Status: %s',(cr.statusmessage))
 
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
@@ -2095,9 +2093,7 @@ class account_tax(osv.osv):
         }
 
     def compute(self, cr, uid, taxes, price_unit, quantity,  product=None, partner=None):
-        logger = netsvc.Logger()
-        logger.notifyChannel("warning", netsvc.LOG_WARNING,
-            "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+        _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
     def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 68a723aa4a0..a10cba705e4 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -39,7 +39,7 @@
                     <field name="quantity"/>
                     <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -61,8 +61,8 @@
                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         </div>
                         <field name="price_unit"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="discount"/>
+                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
+                        <field name="discount" groups="sale.group_discount_per_so_line"/>
                         <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
                         <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -98,7 +98,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
-                        <field name="account_id"/>
+                        <field name="account_id" groups="account.group_account_user"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -148,7 +148,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -190,7 +191,7 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
@@ -274,9 +275,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
@@ -339,7 +341,7 @@
                                     <field name="tax_line" nolabel="1">
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
-                                            <field name="account_id" groups="account.group_account_invoice"/>
+                                            <field name="account_id" groups="account.group_account_user"/>
                                             <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                             <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
                                             <field invisible="True" name="base_amount"/>
@@ -357,7 +359,7 @@
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
-                                    <field name="residual" style="margin-top: 10px"/>
+                                    <field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
                                     <field name="reconciled" invisible="1"/>
                                 </group>
                             </group>
@@ -482,7 +484,12 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
+            <field name="help">
+                Click here to create a new Invoice.
+                &lt;p&gt;
+                An invoice can be generated automatically from a sale order or a delivery order.
+                The invoice can be send by email.
+            </field>
         </record>
 
 
@@ -510,7 +517,12 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <field name="help">
+                Click here to create Supplier invoice.
+                &lt;p&gt;
+                You can control the invoice from your supplier according to what you purchased or received.
+                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            </field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -523,7 +535,12 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new customer refund.
+                &lt;p&gt;
+                A refund is a document that credits an invoice completely or partially.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -549,7 +566,12 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new supplier refund.
+                &lt;p&gt;
+                Track refunds you receive from your suppliers.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 12fd558a31f..e8899d0348a 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -555,19 +555,6 @@
             <field eval="1" name="number_increment"/>
         </record>
 
-        <!-- 
-        Sequence for analytic account 
-        -->
-        <record id="seq_type_analytic_account" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
-        <record id="seq_analytic_account" model="ir.sequence">
-            <field name="name">Analytic account sequence</field>
-            <field name="code">account.analytic.account</field>
-            <field eval="3" name="padding"/>
-            <field eval="2708" name="number_next"/>
-        </record>
 
         <!--
         Invoice requests (deprecated)
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index d861aa73278..3394913008b 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:08+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-25 09:07+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-06-22 04:37+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5437,7 +5437,7 @@ msgstr "Standardauswertung Finanzen"
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr "Buchungstext"
+msgstr "Kommunikation"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 6cf52f58f6c..5a2b0b346c4 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -30,11 +30,11 @@ from tools.translate import _
 from osv import fields, osv
 import netsvc
 import tools
+_logger = logging.getLogger(__name__)
 
 class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
-    __logger = logging.getLogger(_name)
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
@@ -149,7 +149,7 @@ class account_installer(osv.osv_memory):
             cr, uid, ids, context=context)
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
-        self.__logger.debug('Installing chart of accounts %s', chart)
+        _logger.debug('Installing chart of accounts %s', chart)
         return modules | set([chart])
 
 account_installer()
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index ec89d280774..2ca0e50e784 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -3,102 +3,85 @@
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
             <field name="name" model="res.company" use="name" search="[]"/>
-            <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
-            <field name="code">1</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">2</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
-            <field name="code">100</field>
             <field name="state">open</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
-            <field name="code">101</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
-            <field name="code">102</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">4</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_in_house" model="account.analytic.account">
             <field name="name">In House</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_online" model="account.analytic.account">
             <field name="name">Online</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">support</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_partners" model="account.analytic.account">
             <field name="name">Partners</field>
-            <field name="code">partners</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_customers" model="account.analytic.account">
             <field name="name">Customers</field>
-            <field name="code">customers</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">3</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_integration" model="account.analytic.account">
             <field name="name">Integration</field>
-            <field name="code">integration</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
-            <field name="code">4</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">5</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
-            <field name="code">1</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="state">open</field>
@@ -106,7 +89,6 @@
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
@@ -114,14 +96,12 @@
         </record>
         <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
-            <field name="code">7</field>
             <field name="type">normal</field>
             <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
             <field eval="time.strftime('%Y-12-31')" name="date"/>
@@ -131,28 +111,24 @@
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
-            <field name="code">4</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
-            <field name="code">7</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
-            <field name="code">2</field>
             <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
             <field eval="time.strftime('%Y-05-08')" name="date"/>
             <field name="parent_id" ref="analytic_partners"/>
@@ -162,7 +138,6 @@
         </record>
         <record id="analytic_thymbra" model="account.analytic.account">
             <field name="name">Thymbra</field>
-            <field name="code">3</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="time.strftime('%Y-07-01')" name="date"/>
             <field name="type">normal</field>
@@ -172,7 +147,6 @@
         </record>
         <record id="analytic_leclerc" model="account.analytic.account">
             <field name="name">Leclerc</field>
-            <field name="code">10</field>
             <field eval="time.strftime('%Y-04-24')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
             <field name="type">normal</field>
@@ -181,7 +155,6 @@
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
-            <field name="code">12</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
             <field name="type">normal</field>
@@ -190,14 +163,12 @@
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
-            <field name="code">15</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
-            <field name="code">21</field>
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field name="type">normal</field>
@@ -207,67 +178,56 @@
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_2_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_1_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_project_1_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_our_super_product_development" model="account.analytic.account">
             <field name="name">Our Super Product Development</field>
-            <field name="code">3</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_stable" model="account.analytic.account">
             <field name="name">Stable</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_trunk" model="account.analytic.account">
             <field name="name">Trunk</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_paid" model="account.analytic.account">
             <field name="name">Paid</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
         <record id="analytic_unpaid" model="account.analytic.account">
             <field name="name">Unpaid</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 2132eecb463..7658ab111d9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -19,6 +19,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -59,7 +60,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="code"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -71,50 +72,11 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Account" version="7.0">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name" colspan="4"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Account Data">
-                            <group>
-                                <group string="Contacts">
-                                    <field name="partner_id"/>
-                                    <field name="user_id"/>
-                                </group>
-                                <group name="contract" string="Contract Data">
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                    <field name="quantity_max"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Description">
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>
 
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
@@ -210,6 +172,7 @@
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index c7423675c15..6ca17a7ac0a 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -75,10 +75,10 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
         return res
 
     def _account_sum_debit(self, account, date1, date2):
-        return self._sum_debit(self, [account], date1, date2)
+        return self._sum_debit([account], date1, date2)
 
     def _account_sum_credit(self, account, date1, date2):
-        return self._sum_credit(self, [account], date1, date2)
+        return self._sum_credit([account], date1, date2)
 
     def _account_sum_balance(self, account, date1, date2):
         debit = self._account_sum_debit(account, date1, date2)
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 0ba4e4b6a3c..6897e15078d 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -497,7 +497,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -590,7 +590,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 79003c5aaa6..7ae5db98f20 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -505,7 +505,7 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency = company.currency_id) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
@@ -529,7 +529,7 @@
               <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
+              <para style="terp_default_7">[[ line['lref'] and strip_name(line['lref'],17) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ line['move'] ]]</para>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 8fcb41d5ca6..0d7122369c6 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -519,7 +519,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index c61b8147a69..b878ab44e47 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -524,7 +524,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 7c5007a24fb..0d18a35b8a1 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -162,7 +162,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id,'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index bd7d1b3e711..5c872051ba1 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -37,14 +37,14 @@ class account_config_settings(osv.osv_memory):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'has_default_company': fields.boolean('Has default company', readonly=True),
         'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
-            string='Chart of Accounts for this Company',
+            string='This Company Has its Own Chart of Accounts',
             help="""Check this box if this company is a legal entity."""),
         'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
             string='Default Company Currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
-            string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
+            string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
-            string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."),
+            string='Bank Accounts on Reports', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure  these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
@@ -77,12 +77,12 @@ class account_config_settings(osv.osv_memory):
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
         'module_account_accountant': fields.boolean('Accountant Features',
-            help="""If you do not check this box, you will be able to do Invoicing & Payments, but not accounting (Journal Items, Chart of  Accounts, ...)."""),
+            help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
         'module_account_asset': fields.boolean('Assets Management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
-                This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, 
-                but not accounting (Journal Items, Chart of Accounts, ...) """),
+                This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
+                but not accounting (Journal Items, Chart of Accounts, ...)"""),
         'module_account_budget': fields.boolean('Budget Management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
@@ -96,7 +96,7 @@ class account_config_settings(osv.osv_memory):
         'module_account_voucher': fields.boolean('Manage Customer Payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups',
+        'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
         'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals',
@@ -110,10 +110,12 @@ class account_config_settings(osv.osv_memory):
         'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
-        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
-        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
-        'decimal_precision': fields.integer('Decimal Precision',
-            help="""Set the decimal precision for rounding results in accounting."""),
+        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax',
+            help="This sale tax will be assigned by default on new products."),
+        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax',
+            help="This purchase tax will be assigned by default on new products."),
+        'decimal_precision': fields.integer('Decimal Precision on Journal Entries',
+            help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
     }
 
     def _default_company(self, cr, uid, context=None):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 45311de22cc..a27513a9f0c 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,52 +17,66 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <field name="has_default_company" invisible="1" />
-                        <field name="has_chart_of_accounts" invisible="1"/>
-                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                    <sheet>
+                    <field name="has_default_company" invisible="1" />
+                    <field name="has_chart_of_accounts" invisible="1"/>
+                    <field name="complete_tax_set" invisible="1"/>
+                    <field name="has_fiscal_year" invisible="1"/>
+
+                    <group groups="base.group_multi_company">
+                        <field name="company_id" string="Select Company" widget="selection"
+                            on_change="onchange_company_id(company_id)"
                             attrs="{'invisible': [('has_default_company', '=', True)]}"/>
                         <field name="expects_chart_of_accounts"/>
                     </group>
 
-                    <group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                    <div class="oe_form_button_save_dirty">
+                    <group string="Select a Chart of Accounts to Install"
+                        attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                        <group>
+                            <field name="chart_template_id" widget="selection" domain="[('visible','=', True)]"
+                                on_change="onchange_chart_template_id(chart_template_id)"/>
+                            <field name="code_digits" groups="account.group_account_user"/>
+                            <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                            <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
+                        </group>
                         <button string="Install More Chart Templates" icon="gtk-go-forward"
                             name="%(open_account_charts_modules)d" type="action"/>
-                        <newline/>
-                        <field name="code_digits" groups="account.group_account_user"/>
-                        <newline/>
-                        <field name="complete_tax_set" invisible="1"/>
-                        <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                        <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                        <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                        <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
                     </group>
+                    </div>
 
-                    <field name="has_fiscal_year" invisible="1"/>
-                    <group string="No Fiscal Year Defined for this Company" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
-                        <field name="date_start" on_change="onchange_start_date(date_start)"/>
-                        <field name="date_stop"/>
-                        <field name="period" colspan="4"/>
+                    <div class="oe_form_button_save_dirty">
+                    <group string="No Fiscal Year Defined for This Company"
+                        attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                        <label for="date_start" string="Date Range"/>
+                        <div>
+                            <field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
+                            <field name="date_stop" class="oe_inline"/>
+                        </div>
+                        <field name="period"/>
                     </group>
+                    </div>
 
-                    <field name="complete_tax_set" invisible="1"/>
                     <group string="Accounting Configuration">
                         <group>
-                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
+                                attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
-                            <field name="module_account_asset"/>
+                            <field name="currency_id"/>
+                            <field name="decimal_precision"/>
                         </group>
                         <group>
-                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
-                            <field name="currency_id"/>
+                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
+                                attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                            <field name="decimal_precision"/>
                         </group>
                     </group>
 
@@ -72,47 +86,55 @@
                     <field name="purchase_refund_journal_id" invisible="1"/>
                     <group>
                         <group string="Customer Invoices">
-                            <label string="Invoice Sequence" for="sale_sequence_prefix"/>
-                            <div>
-                                <field name="sale_sequence_prefix" class="oe_inline"/>
-                                <field name="sale_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                            </div>
-
-                            <label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
-                            <div>
-                                <field name="sale_refund_sequence_prefix" class="oe_inline"/>
-                                <field name="sale_refund_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                            </div>
+                            <label for="sale_sequence_next"/>
+                            <group>
+                                <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                            </group>
+                            <label for="sale_refund_sequence_next"/>
+                            <group>
+                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                            </group>
                             <field name="module_account_invoice_layout"/>
                             <field name="module_account_voucher"/>
                             <field name="module_account_followup"/>
                             <field name="group_proforma_invoices"/>
                         </group>
+
                         <group string="Supplier Invoices">
-                            <label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
-                            <div>
-                                <field name="purchase_sequence_prefix" class="oe_inline"/>
-                                <field name="purchase_sequence_next" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                            </div>
-                            <label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
-                            <div>
-                                <field name="purchase_refund_sequence_prefix" class="oe_inline"/>
-                                <field name="purchase_refund_sequence_next" class="oe_inline"
+                             <label for="purchase_sequence_next"/>
+                            <group>
+                                <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                            </group>
+                            <label for="purchase_refund_sequence_next"/>
+                            <group>
+                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                    help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
+                                <field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
                                   attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                            </div>
+                            </group>
                             <field name="module_account_payment"/>
                         </group>
+
                         <group string="Electronic Payments">
-                            <field name="paypal_account"/>
+                            <field name="paypal_account" placeholder="sales@openerp.com"/>
                         </group>
+
                         <group string="Bank &amp; Cash">
-                            <label string="Configure Bank Accounts :"/>
+                            <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>
                             <field name="module_account_check_writing"/>
                         </group>
+
                         <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..2af649ba19f 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
@@ -53,10 +54,6 @@ class account_fiscalyear_close_state(osv.osv_memory):
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
 
-            # Log message for Fiscalyear
-            fy_pool = self.pool.get('account.fiscalyear')
-            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
-            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
             return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index fecf43f07ab..b2c61d9197a 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -53,11 +53,8 @@ class account_period_close(osv.osv_memory):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
 
-                    # Log message for Period
-                    for period_id, name in period_pool.name_get(cr, uid, [id]):
-                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {'type': 'ir.actions.act_window_close'}
 
 account_period_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 20c170cb5c0..6e15fe1d5a5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -98,7 +98,7 @@ class account_analytic_account(osv.osv):
                             WHERE account_analytic_account.id IN %s \
                                 AND account_analytic_line.invoice_id IS NULL \
                                 AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type IN ('purchase','general') \
+                                AND account_analytic_journal.type = 'general' \
                             GROUP BY account_analytic_account.id;""", (parent_ids,))
                     for account_id, sum in cr.fetchall():
                         if account_id not in res:
@@ -257,6 +257,12 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
+    def _remaining_hours_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = max(account.hours_qtt_est - account.timesheet_ca_invoiced, account.ca_to_invoice)
+        return res
+
     def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
@@ -291,15 +297,34 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
+    def _fix_price_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        sale_obj = self.pool.get('sale.order')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id)], context=context)
+            for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
+                if not sale.invoiced:
+                    res[account.id] += sale.amount_untaxed
+                    for invoice in sale.invoice_ids:
+                        if invoice.state not in ('draft', 'cancel'):
+                            res[account.id] -= invoice.amount_untaxed
+        return res
+
+    def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+        lines_obj = self.pool.get('account.analytic.line')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
+            for line in lines_obj.browse(cr, uid, line_ids, context=context):
+                res[account.id] += line.invoice_id.amount_untaxed
+        return res
+
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
-            if account.amount_max != 0:
-                res[account.id] = account.amount_max - account.ca_invoiced
-            else:
-                res[account.id]=0.0
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
+            res[account.id] = max(account.amount_max - account.ca_invoiced, account.fix_price_to_invoice)
         return res
 
     def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
@@ -333,6 +358,47 @@ class account_analytic_account(osv.osv):
             result.add(line.account_id.id)
         return list(result)
 
+    def _get_total_estimation(self, account):
+        tot_est = 0.0
+        if account.fix_price_invoices:
+            tot_est += account.amount_max 
+        if account.invoice_on_timesheets:
+            tot_est += account.hours_qtt_est
+        return tot_est
+
+    def _get_total_invoiced(self, account):
+        total_invoiced = 0.0
+        if account.fix_price_invoices:
+            total_invoiced += account.ca_invoiced
+        if account.invoice_on_timesheets:
+            total_invoiced += account.timesheet_ca_invoiced
+        return total_invoiced
+
+    def _get_total_remaining(self, account):
+        total_remaining = 0.0
+        if account.fix_price_invoices:
+            total_remaining += account.remaining_ca
+        if account.invoice_on_timesheets:
+            total_remaining += account.remaining_hours_to_invoice
+        return total_remaining
+
+    def _get_total_toinvoice(self, account):
+        total_toinvoice = 0.0
+        if account.fix_price_invoices:
+            total_toinvoice += account.fix_price_to_invoice
+        if account.invoice_on_timesheets:
+            total_toinvoice += account.ca_to_invoice
+        return total_toinvoice
+
+    def _sum_of_fields(self, cr, uid, ids, name, arg, context=None):
+         res = dict([(i, {}) for i in ids])
+         for account in self.browse(cr, uid, ids, context=context):
+            res[account.id]['est_total'] = self._get_total_estimation(account)
+            res[account.id]['invoiced_total'] =  self._get_total_invoiced(account)
+            res[account.id]['remaining_total'] = self._get_total_remaining(account)
+            res[account.id]['toinvoice_total'] =  self._get_total_toinvoice(account)
+         return res
+
     _columns = {
         'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
                                                 store={
@@ -350,7 +416,7 @@ class account_analytic_account(osv.osv):
         'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
             digits_compute=dp.get_precision('Account')),
-        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Time',
+        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Worked Time',
             help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
         'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
             help="If invoice from the costs, this is the date of the latest invoiced."),
@@ -363,7 +429,13 @@ class account_analytic_account(osv.osv):
         'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time',
             help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."),
         'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
-            help="Computed using the formula: Maximum Time - Total Time"),
+            help="Computed using the formula: Maximum Time - Total Worked Time"),
+        'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
+            help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+        'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
+            help="Sum of quotations for this contract."),
+        'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
+            help="Sum of timesheet lines invoiced for this contract."),
         'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
             help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
             digits_compute=dp.get_precision('Account')),
@@ -379,10 +451,51 @@ class account_analytic_account(osv.osv):
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
+        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
+        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
+        'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
+        'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
+        'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"),
+        'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"),
+        'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Remaining", help="Expectation of remaining income for this contract. Computed as the sum of remaining subtotals which, in turn, are computed as the maximum between '(Estimation - Invoiced)' and 'To Invoice' amounts"),
+        'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total to Invoice", help=" Sum of everything that could be invoiced for this contract."),
     }
 
+    def open_sale_order_lines(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
+        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))])
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Sale Order Lines of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': context,
+            'domain' : [('order_id','in',sale_ids)],
+            'res_model': 'sale.order.line',
+            'nodestroy': True,
+        }
+
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        if not template_id:
+            return {}
+        res = {'value':{}}
+        template = self.browse(cr, uid, template_id, context=context)
+        res['value']['date_start'] = template.date_start
+        res['value']['date'] = template.date
+        res['value']['fix_price_invoices'] = template.fix_price_invoices
+        res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
+        res['value']['quantity_max'] = template.quantity_max
+        res['value']['hours_qtt_est'] = template.hours_qtt_est
+        res['value']['amount_max'] = template.amount_max
+        res['value']['to_invoice'] = template.to_invoice.id
+        res['value']['pricelist_id'] = template.pricelist_id.id
+        res['value']['description'] = template.description
+        return res
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index cf939c2ccfa..c3ac5f5b71c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -58,8 +58,8 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
-            <field name="domain">[('type','=','normal')]</field>
+            <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
+            <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
             <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
         </record>
@@ -70,8 +70,8 @@
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
-            <field name="domain">[('type','=','normal')]</field>
+            <field name="context">{'default_type':'contract'}</field>
+            <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
         </record>
         <menuitem id="base.menu_sales" name="Sales"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cd99299665b..ead87c176e3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -4,97 +4,99 @@
 
         <!--
         Analytic Account form
-
-        Remove information on Account data => because they move on analysis sheet
-        create a page with invoicing informations
         -->
-        <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.invoice.stat.form.inherit</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <group name="invoice_stats" position="inside">
-                    <field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <label string="" colspan="1"/>
-                    <button
-                        name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                        string="Create Invoice"
-                        type="action"
-                        attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
-                        icon="gtk-go-forward"/>
-                </group>
-            </field>
-        </record>
+
+        <act_window
+            id="action_sales_order"
+            name="Sales Orders"
+            res_model="sale.order"
+            src_model="account.analytic.account"
+        />
 
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-            <field eval="18" name="priority"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="40" name="priority"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Invoice Analysis">
-                        <separator colspan="4" string="Work Done Stats"/>
-
-                        <field name="total_cost"/>
-                        <field name="remaining_ca"/>
-                        <field name="ca_invoiced"/>
-                        <field name="ca_theorical"/>
-                        <newline/>
-                        <field name="hours_quantity"/>
-                        <field name="hours_qtt_invoiced"/>
-                        <field name="remaining_hours"/>
-                        <newline/>
-                        <separator colspan="4" string="Analysis Stats"/>
-
-                        <field name="revenue_per_hour"/>
-                        <field name="real_margin"/>
-                        <field name="real_margin_rate"/>
-                        <field name="theorical_margin"/>
-                        <separator colspan="4" string="Key Dates"/>
-
-                        <field name="last_invoice_date"/>
-                        <field name="last_worked_invoiced_date"/>
-                        <field name="last_worked_date"/>
-                    </page>
-                    <page string="Stats by month">
-                        <field colspan="4" name="month_ids" nolabel="1">
-                            <tree string="Month">
-                                <field name="month"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Stats by user">
-                        <field colspan="4" name="user_ids" nolabel="1">
-                            <tree string="Users">
-                                <field name="user"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                </notebook>
-
-            </field>
-        </record>
-
-        <!-- Add information on Account analytic list for the project management -->
-        <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
-            <field name="name">account.analytic.account.tree</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="quantity" position="replace">
-                    <field name="hours_quantity"/>
-                    <field name="hours_qtt_non_invoiced"/>
-                    <field name="remaining_hours"/>
-                    <field name="quantity_max"/>
-                </field>
+                <xpath expr='//field[@name="type"]' position='after'>
+                    <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                </xpath>
+                <xpath expr='//div[@name="duration"]' position="after" version="7.0">
+                    <label for="quantity_max"/>
+                    <div>
+                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
+                    </div>
+                </xpath>
+                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
+                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
+                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                    </group>
+                </xpath>
+                <xpath expr='//group[@name="master"]' position='after'>
+                    <separator name="toinvoice" string="Invoicing"/>
+                    <table width="100%%">
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field name="fix_price_invoices" class="oe_inline"/>
+                            </td><td>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td>
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
+                            <td>
+                                <label for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field name="invoice_on_timesheets"/>
+                            </td><td>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td>
+                        </tr><tr name='total'>
+                            <th>
+                                <label string="Total"/>
+                            </th><td>
+                            </td><td>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_inline"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                 </xpath>
             </field>
         </record>
 
@@ -106,10 +108,20 @@
             <field name="arch" type="xml">
                 <field name="date" position="before">
                     <field name="last_invoice_date"/>
-                    <field name="ca_to_invoice"/>
+                    <field name="toinvoice_total"/>
                 </field>
             </field>
         </record>
 
+        <record id="template_of_contract_action" model="ir.actions.act_window">
+            <field name="name">Template of Contract</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','template')]</field>
+            <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+        </record>
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
     </data>
 </openerp>
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index e2ad9e05b04..3e8eec81c55 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -109,7 +109,6 @@ class crossovered_analytic(report_sxw.rml_parse):
             res['ref_qty'] = info[0]['qty']
             res['ref_amt'] = info[0]['amt']
             self.base_amount = info[0]['amt']
-        
         result.append(res)
         return result
 
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 766fb9f0d0d..48e7c13b0a1 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -237,10 +237,10 @@
             <para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ a['ref_qty'] and formatLang(a['ref_qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9">[[ a['ref_amt'] and formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">100.00%</para>
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index d42e188679a..29b4c4fdb84 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -23,7 +23,6 @@
 import time
 from osv import osv, fields
 import decimal_precision as dp
-import netsvc
 from tools.translate import _
 
 class account_bank_statement(osv.osv):
diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
index 8e1e4b09e47..5dcaafe4845 100644
--- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
+++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
@@ -23,13 +23,13 @@
 import time
 from report import report_sxw
 import pooler
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 class bank_statement_balance_report(report_sxw.rml_parse):
 
     def set_context(self, objects, data, ids, report_type=None):
-        #logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
+        #_logger.warning('addons.'+__name__, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
         cr = self.cr
         uid = self.uid
         context = self.context
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 2e939ae7b58..b10469059fd 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -274,7 +274,7 @@
             <field name="name">account.analytic.account.form.inherot.budget</field>
             <field name="type">form</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Budget Lines">
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 6a214fa56dd..9bf37134920 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -20,7 +20,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
@@ -32,7 +32,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index e3cc6f40a0c..36700c97b84 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -22,9 +22,7 @@
 
 from osv import osv, fields
 import decimal_precision as dp
-import netsvc
 from tools.translate import _
-logger=netsvc.Logger()
 
 class coda_bank_account(osv.osv):
     _name= 'coda.bank.account'
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index c49eb9f1dbd..daa8bbd1026 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -24,11 +24,11 @@ import time
 import base64
 from osv import fields,osv
 from tools.translate import _
-import netsvc
+import logging
 import re
 from traceback import format_exception
 from sys import exc_info
-logger=netsvc.Logger()
+_logger = logging.getLogger(__name__)
 
 class account_coda_import(osv.osv_memory):
     _name = 'account.coda.import'
@@ -816,7 +816,7 @@ class account_coda_import(osv.osv_memory):
                                         ttype = line['type'] == 'supplier' and 'payment' or 'receipt',
                                         date = line['val_date'],
                                         context = context)
-                                    #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'voucher_dict = %s' % voucher_dict) 
+                                    #_logger.warning('voucher_dict = %s' % voucher_dict) 
                                     voucher_line_vals = False
                                     if voucher_dict['value']['line_ids']:
                                         for line_dict in voucher_dict['value']['line_ids']:
@@ -889,22 +889,19 @@ class account_coda_import(osv.osv_memory):
                 nb_err += 1
                 err_string += _('\nError ! ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
             except Exception, e:
                 cr.rollback()
                 nb_err += 1
                 err_string += _('\nSystem Error : ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
             except :
                 cr.rollback()
                 nb_err += 1
                 err_string = _('\nUnknown Error : ') + str(e)
                 tb = ''.join(format_exception(*exc_info()))
-                logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR,
-                    'Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
+                _logger.error('Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
 
         # end 'for statement in coda_statements'
                           
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index ed397668148..49e7f09863d 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Followup Management',
+    'name': 'Follow-up Management',
     'version': '1.0',
     'category': 'Accounting & Finance',
     'description': """
@@ -28,16 +28,16 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
-    Accounting/Configuration/Miscellaneous/Follow-Ups
+    Accounting/Configuration/Miscellaneous/Follow-ups
 
 Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
-    Accounting/Periodical Processing/Billing/Send followups
+    Accounting/Periodical Processing/Billing/Send follow-ups
 
 It will generate a PDF with all the letters according to the the
 different levels of recall defined. You can define different policies
 for different companies. You can also send mail to the customer.
 
-Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu:
+Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
     Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent
 
 """,
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index b53558ab0e7..60499603295 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -23,11 +23,11 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Account Follow Up'
+    _description = 'Account Follow-up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
-        'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
+        'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-up'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
@@ -38,7 +38,7 @@ followup()
 
 class followup_line(osv.osv):
     _name = 'account_followup.followup.line'
-    _description = 'Follow-Up Criteria'
+    _description = 'Follow-up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 4c3d84fb642..7103ffa0386 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="demo_followup1" model="account_followup.followup">
-            <field name="name">Default Follow-Up</field>
+            <field name="name">Default Follow-up</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="description">First letter after 15 net days, 30 net days and 45 days end of month levels.</field>
         </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index c2e89202553..9c11815e05b 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up Steps">
+                <tree string="Follow-up Steps">
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="start"/>
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Steps" version="7.0">
+                <form string="Follow-up Steps" version="7.0">
                     <group col="4">
                        <field name="name"/>
                        <field name="delay"/>
@@ -43,7 +43,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up" version="7.0">
+                <form string="Follow-up" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -58,7 +58,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up">
+                <tree string="Follow-up">
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
@@ -70,9 +70,9 @@
             <field name="model">account_followup.followup</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Followup">
+                <search string="Search Follow-up">
                     <group>
-                        <field name="name" string="Followup"/>
+                        <field name="name" string="Follow-up"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
@@ -81,16 +81,16 @@
         </record>
 
         <record id="action_account_followup_definition_form" model="ir.actions.act_window">
-            <field name="name">Follow-Ups</field>
+            <field name="name">Follow-ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account_followup.followup</field>
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
-            <field name="help">Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.</field>
+            <field name="help">Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.</field>
         </record>
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_configuration_misc"/>
 
-        <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Followup Report"/>
+        <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 908bca04f70..c0173b056a0 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -17,7 +17,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup:0
-msgid "Search Followup"
+msgid "Search Follow-up"
 msgstr ""
 
 #. module: account_followup
@@ -34,12 +34,12 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
-msgid "Follow-Up"
+msgid "Follow-up"
 msgstr ""
 
 #. module: account_followup
 #: help:account.followup.print.all,test_print:0
-msgid "Check if you want to print followups without changing followups level."
+msgid "Check if you want to print follow-ups without changing follow-ups level."
 msgstr ""
 
 #. module: account_followup
@@ -80,7 +80,7 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_followup_stat
-msgid "Follow up on the reminders sent over to your partners for unpaid invoices."
+msgid "Follow-up on the reminders sent over to your partners for unpaid invoices."
 msgstr ""
 
 #. module: account_followup
@@ -91,7 +91,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-msgid "Follow up Entries with period in current year"
+msgid "Follow-up Entries with period in current year"
 msgstr ""
 
 #. module: account_followup
@@ -117,7 +117,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
-msgid "Follow-Ups"
+msgid "Follow-ups"
 msgstr ""
 
 #. module: account_followup
@@ -175,7 +175,7 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
-msgid "Account Follow Up"
+msgid "Account Follow-up"
 msgstr ""
 
 #. module: account_followup
@@ -227,7 +227,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
-msgid "Latest followup"
+msgid "Latest follow-up"
 msgstr ""
 
 #. module: account_followup
@@ -269,7 +269,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
-msgid "Send followups"
+msgid "Send follow-ups"
 msgstr ""
 
 #. module: account_followup
@@ -280,13 +280,13 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
-msgid "Follow Ups"
+msgid "Follow-ups"
 msgstr ""
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:296
 #, python-format
-msgid "All E-mails have been successfully sent to Partners:.\n"
+msgid "All Emails have been successfully sent to Partners:.\n"
 "\n"
 "%s"
 msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
-msgid "Followup Statistics by Partner"
+msgid "Follow-up Statistics by Partner"
 msgstr ""
 
 #. module: account_followup
@@ -326,7 +326,7 @@ msgstr ""
 #, python-format
 msgid "\n"
 "\n"
-"E-Mail sent to following Partners successfully. !\n"
+"Email sent to following Partners successfully. !\n"
 "\n"
 "%s"
 msgstr ""
@@ -354,7 +354,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account.followup.print.all:0
-msgid "Print Follow Ups"
+msgid "Print Follow-ups"
 msgstr ""
 
 #. module: account_followup
@@ -364,7 +364,7 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
-msgid "Followup Statistics"
+msgid "Follow-up Statistics"
 msgstr ""
 
 #. module: account_followup
@@ -430,7 +430,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-msgid "Follow-Up lines"
+msgid "Follow-up lines"
 msgstr ""
 
 #. module: account_followup
@@ -453,7 +453,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
-msgid "Print Followup & Send Mail to Customers"
+msgid "Print Follow-up & Send Mail to Customers"
 msgstr ""
 
 #. module: account_followup
@@ -464,12 +464,12 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
-msgid "Followup Report"
+msgid "Follow-up Report"
 msgstr ""
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
-msgid "Follow-Up Steps"
+msgid "Follow-up Steps"
 msgstr ""
 
 #. module: account_followup
@@ -480,7 +480,7 @@ msgstr ""
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
-msgid "Followup Summary"
+msgid "Follow-up Summary"
 msgstr ""
 
 #. module: account_followup
@@ -496,12 +496,12 @@ msgstr ""
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
-msgid "Max Follow Up Level"
+msgid "Max Follow-up Level"
 msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
-msgid "Review Invoicing Follow-Ups"
+msgid "Review Invoicing Follow-ups"
 msgstr ""
 
 #. module: account_followup
@@ -511,7 +511,7 @@ msgstr ""
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
-msgid "Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
+msgid "Define follow-up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages."
 msgstr ""
 
 #. module: account_followup
@@ -522,7 +522,7 @@ msgstr ""
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:298
 #, python-format
-msgid "E-Mail not sent to following Partners, E-mail not available !\n"
+msgid "Email not sent to following Partners, Email not available !\n"
 "\n"
 "%s"
 msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-msgid "Followup Level"
+msgid "Follow-up Level"
 msgstr ""
 
 #. module: account_followup
@@ -556,7 +556,7 @@ msgstr ""
 
 #. module: account_followup
 #: constraint:account_followup.followup:0
-msgid "Only One Followup by Company."
+msgid "Only One Follow-up by Company."
 msgstr ""
 
 #. module: account_followup
@@ -682,11 +682,11 @@ msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat:0
-msgid "Latest Followup Date"
+msgid "Latest Follow-up Date"
 msgstr ""
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
-msgid "Follow-Up Criteria"
+msgid "Follow-up Criteria"
 msgstr ""
 
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index ae581528a1e..3d096ecf3ac 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="Account Followup.pdf">
-  <template title="Account Followup" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Follow-up.pdf">
+  <template title="Account Follow-up" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="31.0" y1="28.0" width="532" height="786"/>
     </pageTemplate>
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index c2a842cfd4c..ceb8a389c0e 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -24,7 +24,7 @@ import tools
 
 class account_followup_stat(osv.osv):
     _name = "account_followup.stat"
-    _description = "Followup Statistics"
+    _description = "Follow-up Statistics"
     _rec_name = 'partner_id'
     _auto = False
     _columns = {
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 9627d12aa88..2bdf8eb74bf 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -7,7 +7,7 @@
             <field name="model">account_followup.stat</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Follow-Up lines">
+                <tree string="Follow-up lines">
                     <field name="partner_id"/>
                     <field name="date_move"/>
                     <field name="date_move_last"/>
@@ -28,7 +28,7 @@
            <field name="model">account_followup.stat</field>
            <field name="type">graph</field>
            <field name="arch" type="xml">
-               <graph string="Follow-Up lines" type="bar">
+               <graph string="Follow-up lines" type="bar">
                   <field name="partner_id"/>
                   <field name="balance" operator="+"/>
                </graph>
@@ -47,7 +47,7 @@
                         <filter icon="terp-go-year" string="This Fiscal year"
                             name="fiscalyear"
                             domain="[('period_id','in','current_year')]"
-                            help="Follow up Entries with period in current year"/>
+                            help="Follow-up Entries with period in current year"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Not Litigation"
                             domain="[('blocked','=', False)]"
@@ -62,8 +62,8 @@
                         <separator orientation="vertical"/>
                         <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
-                        <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
+                        <filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
+                        <filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
                     </group>
@@ -77,7 +77,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{'search_default_followup_level':1}</field>
             <field name="search_view_id" ref="view_account_followup_stat_search"/>
-            <field name="help">Follow up on the reminders sent over to your partners for unpaid invoices.</field>
+            <field name="help">Follow-up on the reminders sent over to your partners for unpaid invoices.</field>
         </record>
 
         <menuitem action="action_followup_stat" id="menu_action_followup_stat_follow" parent="account.next_id_22" groups="account.group_account_user"/>
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index f21c21e2367..fd90e16fec8 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -3,14 +3,14 @@
     <data>
 
     <record id="account_followup_comp_rule" model="ir.rule">
-        <field name="name">Account Followup multi company rule</field>
+        <field name="name">Account Follow-up multi company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_followup_followup"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
      
     <record id="account_followup_stat_by_partner_comp_rule" model="ir.rule">
-        <field name="name">Account Followup Statistics by Partner Rule</field>
+        <field name="name">Account Follow-up Statistics by Partner Rule</field>
         <field ref="model_account_followup_stat_by_partner" name="model_id"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml
index 5d4a7f3bd47..5b9ffa3d51c 100644
--- a/addons/account_followup/test/account_followup.yml
+++ b/addons/account_followup/test/account_followup.yml
@@ -1,23 +1,23 @@
 -
-  In order to test account followup module in OpenERP, I change the state of invoice to "open".
+  In order to test account follow-up module in OpenERP, I change the state of invoice to "open".
 -
   !record {model: account.invoice, id: account.demo_invoice_0}:
     check_total: 14.0
 -
   !workflow {model: account.invoice, action: invoice_open, ref: account.demo_invoice_0}
 -
-  I create a followup.
+  I create a follow-up.
 -
   !record {model: account.followup.print, id: account_followup_print_0}:
     {}
 -
-  I select the followup to send it to the partner.
+  I select the follow-up to send it to the partner.
 -
   !python {model: account.followup.print}: |
     self.do_continue(cr, uid, [ref("account_followup_print_0")], {"active_ids": [ref("account_followup.account_followup_print_menu")], "active_id": ref("account_followup.account_followup_print_menu"),
       })
 -
-  I select partners whom I want to send followups.
+  I select partners whom I want to send follow-ups.
 -
   !record {model: account.followup.print.all, id: account_followup_print_all_0}:
     email_body: 'Date : %(date)s\n\nDear %(partner_name)s,\n\nPlease find in attachment
@@ -28,7 +28,7 @@
       - base.res_partner_desertic_hispafuentes
     partner_lang: 1
 -
-  I send a followup mail to partner.
+  I send a follow-up mail to partner.
 -
   !python {model: account.followup.print.all}: |
     import time
diff --git a/addons/account_followup/test/account_followup_report.yml b/addons/account_followup/test/account_followup_report.yml
index 1aab384dc3b..f2ad8a5bb9f 100644
--- a/addons/account_followup/test/account_followup_report.yml
+++ b/addons/account_followup/test/account_followup_report.yml
@@ -1,10 +1,10 @@
 -
-  In order to test the report I print followup report.
+  In order to test the report I print follow-up report.
 -
   !python {model: account.followup.print.all}: |
     import time
     ctx = {'form_view_ref':'account_followup.view_account_followup_print_all', 'followup_id': ref('account_followup.demo_followup1'),'date': time.strftime('%Y-%m-%d'),'model': 'account_followup.followup','active_ids':[ref('account_followup_print_all_0')], 'company_id':ref('base.main_company')}
     data_dict = {'email_conf': 1}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow Ups"], our_module='account_followup')
+    test_reports.try_report_action(cr, uid, 'action_account_followup_print_all', context=ctx, wiz_data=data_dict,wiz_buttons=["Print Follow-ups"], our_module='account_followup')
 
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 088ff868ca0..b4629062455 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -28,7 +28,7 @@ from tools.translate import _
 
 class account_followup_print(osv.osv_memory):
     _name = 'account.followup.print'
-    _description = 'Print Followup & Send Mail to Customers'
+    _description = 'Print Follow-up & Send Mail to Customers'
     _columns = {
         'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
         'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
@@ -71,14 +71,14 @@ account_followup_print()
 
 class account_followup_stat_by_partner(osv.osv):
     _name = "account_followup.stat.by.partner"
-    _description = "Followup Statistics by Partner"
+    _description = "Follow-up Statistics by Partner"
     _rec_name = 'partner_id'
     _auto = False
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'date_move':fields.date('First move', readonly=True),
         'date_move_last':fields.date('Last move', readonly=True),
-        'date_followup':fields.date('Latest followup', readonly=True),
+        'date_followup':fields.date('Latest follow-up', readonly=True),
         'max_followup_id': fields.many2one('account_followup.followup.line',
                                     'Max Follow Up Level', readonly=True, ondelete="cascade"),
         'balance':fields.float('Balance', readonly=True),
@@ -90,7 +90,7 @@ class account_followup_stat_by_partner(osv.osv):
         # Here we don't have other choice but to create a virtual ID based on the concatenation
         # of the partner_id and the company_id, because if a partner is shared between 2 companies,
         # we want to see 2 lines for him in this table. It means that both company should be able
-        # to send him followups separately . An assumption that the number of companies will not
+        # to send him follow-ups separately . An assumption that the number of companies will not
         # reach 10 000 records is made, what should be enough for a time.
         cr.execute("""
             create or replace view account_followup_stat_by_partner as (
@@ -118,7 +118,7 @@ account_followup_stat_by_partner()
 
 class account_followup_print_all(osv.osv_memory):
     _name = 'account.followup.print.all'
-    _description = 'Print Followup & Send Mail to Customers'
+    _description = 'Print Follow-up & Send Mail to Customers'
     _columns = {
         'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
         'email_conf': fields.boolean('Send email confirmation'),
@@ -126,7 +126,7 @@ class account_followup_print_all(osv.osv_memory):
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
         'email_body': fields.text('Email body'),
         'summary': fields.text('Summary', required=True, readonly=True),
-        'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
+        'test_print': fields.boolean('Test Print', help='Check if you want to print follow-ups without changing follow-ups level.')
     }
     def _get_summary(self, cr, uid, context=None):
         if context is None:
@@ -289,15 +289,15 @@ class account_followup_print_all(osv.osv_memory):
                     msg += partner.name + '\n'
                     msg_unsent += msg
             if not msg_unsent:
-                summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent
+                summary = _("All Emails have been successfully sent to Partners:.\n\n%s") % msg_sent
             else:
-                msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent
-                msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent
+                msg_unsent = _("Email not sent to following Partners, Email not available !\n\n%s") % msg_unsent
+                msg_sent = msg_sent and _("\n\nEmail sent to following Partners successfully. !\n\n%s") % msg_sent
                 line = '=========================================================================='
                 summary = msg_unsent + line + msg_sent
             context.update({'summary': summary})
         else:
-            context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
+            context.update({'summary': '\n\n\nEmail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
 
         return {
             'name': _('Followup Summary'),
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..bf3b95a0189 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,12 +7,12 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send follow-ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
                     <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                 </header>
-                <separator string="Send Follow-Ups"/>
+                <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
@@ -23,7 +23,7 @@
         </record>
 
         <record id="action_account_followup_print" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send follow-ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print</field>
             <field name="view_type">form</field>
@@ -75,7 +75,7 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send follow-ups" version="7.0">
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
                     <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
@@ -126,7 +126,7 @@
         </record>
 
         <record id="action_account_followup_print_all" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send follow-ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print.all</field>
             <field name="view_type">form</field>
diff --git a/addons/account_invoice_layout/i18n/ja.po b/addons/account_invoice_layout/i18n/ja.po
index 88df3263cce..03716e551d1 100644
--- a/addons/account_invoice_layout/i18n/ja.po
+++ b/addons/account_invoice_layout/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-09 09:04+0000\n"
+"PO-Revision-Date: 2012-06-25 05:21+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@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: 2012-05-10 05:20+0000\n"
-"X-Generator: Launchpad (build 15213)\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -120,7 +120,7 @@ msgstr "詳細"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "請求書行のリスト表示は、シーケンスの順序になっています。"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 79bce6248d3..f2539e6d444 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -193,7 +193,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 84049b18f0a..8bfcfd17654 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -197,7 +197,7 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..2cefaf15f0e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -250,6 +250,7 @@ class account_voucher(osv.osv):
 
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
+    _inherit = ['mail.thread']
     _order = "date desc, id desc"
 #    _rec_name = 'number'
     _columns = {
@@ -323,7 +324,7 @@ class account_voucher(osv.osv):
         'amount': _get_amount,
         'type':_get_type,
         'state': 'draft',
-        'pay_now': 'pay_later',
+        'pay_now': 'pay_now',
         'name': '',
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
@@ -334,6 +335,11 @@ class account_voucher(osv.osv):
         'payment_rate_currency_id': _get_payment_rate_currency,
     }
 
+    def create(self, cr, uid, vals, context=None):
+        voucher =  super(account_voucher, self).create(cr, uid, vals, context=context)
+        self.create_send_note(cr, uid, [voucher], context=context)
+        return voucher
+
     def compute_tax(self, cr, uid, ids, context=None):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
@@ -556,7 +562,7 @@ class account_voucher(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         def _remove_noise_in_o2m():
-            """if the line is partially reconciled, then we must pay attention to display it only once and 
+            """if the line is partially reconciled, then we must pay attention to display it only once and
                 in the good o2m.
                 This function returns True if the line is considered as noise and should not be displayed
             """
@@ -1249,12 +1255,16 @@ class account_voucher(osv.osv):
                 'state': 'posted',
                 'number': name,
             })
+            self.post_send_note(cr, uid, [voucher.id], context=context)
             if voucher.journal_id.entry_posted:
                 move_pool.post(cr, uid, [move_id], context={})
             # We automatically reconcile the account move lines.
+            reconcile = False
             for rec_ids in rec_list_ids:
                 if len(rec_ids) >= 2:
-                    move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                    reconcile = move_line_pool.reconcile_partial(cr, uid, rec_ids, writeoff_acc_id=voucher.writeoff_acc_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+            if reconcile:
+                self.reconcile_send_note(cr, uid, [voucher.id], context=context)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -1270,6 +1280,32 @@ class account_voucher(osv.osv):
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
 
+    # -----------------------------------------
+    # OpenChatter notifications and need_action
+    # -----------------------------------------
+    _document_type = {
+        'sale': 'Sales Receipt',
+        'purchase': 'Purchase Receipt',
+        'payment': 'Supplier Payment',
+        'receipt': 'Customer Payment',
+        False: 'Payment',
+    }
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>created</b>." % self._document_type[obj.type or False]
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
+    def post_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
+    def reconcile_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
+            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+
 account_voucher()
 
 class account_voucher_line(osv.osv):
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index da669ad04ee..c6128c4e619 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -2,15 +2,18 @@
 <openerp>
     <data>
         <record id="view_invoice_customer" model="ir.ui.view">
-           <field name="name">account.invoice.customer.pay</field>
-           <field name="model">account.invoice</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="account.invoice_form"/>
-           <field name="arch" type="xml">
-           <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward"/>
-           </button>
-           </field>
+            <field name="name">account.invoice.customer.pay</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                </xpath>
+            </field>
         </record>
         <record id="view_invoice_supplier" model="ir.ui.view">
             <field name="name">account.invoice.supplier.pay</field>
@@ -18,9 +21,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <button name="invoice_open" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward"/>
-                </button>
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..3658ebba14a 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -11,7 +11,7 @@
                     <field name="number"/>
                     <field name="reference"/>
                     <field name="partner_id"/>
-                    <field name="journal_id"/>
+                    <field name="journal_id" groups="account.group_account_user"/>
                     <field name="period_id" invisible="context.get('visible', True)"/>
                     <field name="type" invisible="context.get('visible', True)"/>
                     <field name="amount" sum="Total Amount"/>
@@ -110,7 +110,10 @@
                             </field>
                         </page>
                     </notebook>
-                   </sheet>
+                  </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py
index e44adee974e..146fcbc258a 100644
--- a/addons/account_voucher/report/account_voucher.py
+++ b/addons/account_voucher/report/account_voucher.py
@@ -72,4 +72,4 @@ report_sxw.report_sxw(
     parser=report_voucher,header="external"
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py
index 8bd8644c03c..6a5762be493 100644
--- a/addons/account_voucher/report/account_voucher_print.py
+++ b/addons/account_voucher/report/account_voucher_print.py
@@ -93,4 +93,4 @@ report_sxw.report_sxw(
     parser=report_voucher_print,header="external"
 )
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index cfed906e431..5bda06622b1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -143,7 +143,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
@@ -183,8 +183,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
@@ -199,8 +199,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
@@ -257,6 +257,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -270,7 +273,9 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
             <field name="target">current</field>
-            <field name="help">The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills.</field>
+            <field name="help">Click on "Create" to register a supplier payment. 
+                    &lt;p&gt;
+                    Track payments you do to your supplier and amounts you pay.</field>
         </record>
         <record id="action_vendor_payment_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -295,7 +300,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
@@ -425,6 +430,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -438,7 +446,11 @@
             <field name="search_view_id" ref="view_voucher_filter_customer_pay"/>
             <field name="view_id" eval="False"/>
             <field name="target">current</field>
-            <field name="help">Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.</field>
+            <field name="help">
+                Click on create to register a payment.
+                &lt;p&gt;
+                Enter the customer and the payment method and then, either create manually a payment record or OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.
+            </field>
         </record>
         <record id="action_vendor_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5de7636c0c1..e5919d9089e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,8 +80,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft"/>
-                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
@@ -119,7 +119,7 @@
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -167,6 +167,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -181,7 +184,11 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
-            <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
+            <field name="help">
+                Click here to create a sale receipt.
+                &lt;p&gt;
+                When the sales receipt is confirmed, you can record the customer payment related to this sales receipt.
+            </field>
         </record>
         <record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -217,8 +224,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft"/>
-                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
@@ -259,7 +266,7 @@
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"  groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -313,6 +320,9 @@
                         </page>
                     </notebook>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -325,6 +335,11 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" eval="view_voucher_filter_vendor"/>
             <field name="target">current</field>
+            <field name="help">
+                Click here to create a purchase receipt.
+                &lt;p&gt;
+                When the purchase receipt is confirmed, you can record the supplier payment related to this purchase receipt.
+            </field>
         </record>
         <record id="action_purchase_receipt_tree" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 95983ecdc10..fe9a42fe4c4 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -25,7 +25,7 @@
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category": 'Hidden/Dependency',
-    "depends" : ["base", "decimal_precision"],
+    "depends" : ["base", "decimal_precision", "mail"],
     "description": """
 Module for defining analytic accounting object.
 ===============================================
@@ -37,6 +37,8 @@ that have no counterpart in the general financial accounts.
     "init_xml" : [],
     "update_xml": ['security/analytic_security.xml',
                    "security/ir.model.access.csv",
+                   "analytic_sequence.xml",
+                   "analytic_view.xml"
     ],
     'demo_xml': [
     ],
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 7cb61ee22aa..af8b1615864 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -27,6 +27,7 @@ import decimal_precision as dp
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
+    _inherit = ['mail.thread']
     _description = 'Analytic Account'
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
@@ -155,7 +156,11 @@ class account_analytic_account(osv.osv):
         'name': fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Code/Reference', size=24, select=True),
-        'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
+                                 help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
+                                  "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
+                                  "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
+                                  "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
@@ -166,23 +171,28 @@ class account_analytic_account(osv.osv):
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'user_id': fields.many2one('res.users', 'Account Manager'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
+        'user_id': fields.many2one('res.users', 'Project Manager'),
+        'manager_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
-                                  help='* When an account is created its in \'Draft\' state.\
-                                  \n* If any associated partner is there, it can be in \'Open\' state.\
-                                  \n* If any pending balance is there it can be in \'Pending\'. \
-                                  \n* And finally when all the transactions are over, it can be in \'Close\' state. \
-                                  \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
-                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,),
         'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
     }
+    
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+        res={}
+        if partner_id:
+            partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            if partner.user_id:
+                res['manager_id'] = partner.user_id.id
+            if not name:
+                res['name'] = _('Contract: ') + partner.name
+        return {'value': res}
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
@@ -197,6 +207,7 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'type': 'normal',
         'company_id': _default_company,
+        'code' : lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account'),
         'state': 'open',
         'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
@@ -266,6 +277,17 @@ class account_analytic_account(osv.osv):
             account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
 
+    def create(self, cr, uid, vals, context=None):
+        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if contract:
+            self.create_send_note(cr, uid, [contract], context=context)
+        return contract
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+
 account_analytic_account()
 
 
@@ -290,17 +312,17 @@ class account_analytic_line(osv.osv):
     }
 
     _order = 'date desc'
-    
+
     def _check_no_view(self, cr, uid, ids, context=None):
         analytic_lines = self.browse(cr, uid, ids, context=context)
         for line in analytic_lines:
             if line.account_id.type == 'view':
                 return False
         return True
-    
+
     _constraints = [
         (_check_no_view, 'You can not create analytic line on view account.', ['account_id']),
-    ]    
+    ]
 
 account_analytic_line()
 
diff --git a/addons/analytic/analytic_sequence.xml b/addons/analytic/analytic_sequence.xml
new file mode 100644
index 00000000000..b4e8358bdf9
--- /dev/null
+++ b/addons/analytic/analytic_sequence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+	<record id="seq_type_analytic_account_main" model="ir.sequence.type">
+            <field name="name">Analytic account</field>
+            <field name="code">account.analytic.account</field>
+        </record>
+        <record id="seq_analytic_account_base" model="ir.sequence">
+            <field name="name">Analytic account sequence</field>
+            <field name="code">account.analytic.account</field>
+            <field name="prefix">AA</field>
+            <field name="padding">3</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
new file mode 100644
index 00000000000..85a1520e561
--- /dev/null
+++ b/addons/analytic/analytic_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">analytic.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form version="7.0">
+                    <sheet string="Analytic Account">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="type"/>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="manager_id"/>
+                                <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
+                                <group name="master">
+                                    <group string="Validity" name="contract">
+                                        <label for="date_start" string="Duration"/>
+                                        <div name="duration">
+                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                        </div>
+                                    </group>
+                                    <group name="project">
+                                        <separator string="Project Management" name="project_sep" invisible="1"/>
+                                    </group>
+                                </group>
+                                <separator string="Terms and Conditions" name="description"/>
+                                <field name="description"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+     </data>
+</openerp>
diff --git a/addons/analytic_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
new file mode 100644
index 00000000000..05c84916922
--- /dev/null
+++ b/addons/analytic_contract_expense_project/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import analytic_contract_expense_project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
similarity index 55%
rename from addons/analytic_journal_billing_rate/__openerp__.py
rename to addons/analytic_contract_expense_project/__openerp__.py
index b8e8ab7baf5..41e0bbd084a 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -19,28 +19,28 @@
 #
 ##############################################################################
 
+
 {
-    'name': 'Billing Rates on Contracts',
-    'version': '1.0',
+    'name': 'Projects Management: hr_expense link',
+    'version': '1.1',
     'category': 'Sales Management',
     'description': """
-This module allows you to define what is the default invoicing rate for a specific journal on a given account.
-==============================================================================================================
+This module is for modifying project view to show some data related to the hr_expense module.
+======================================================================================================
 
-This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available.
-
-Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.
-
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'images': ['images/analytic_journal_billing_rate.jpeg'],
-    'depends': ['analytic_user_function', 'account', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': ['analytic_journal_billing_rate_view.xml', 'security/ir.model.access.csv'],
+""",
+    "author": "OpenERP S.A.",
+    "website": "http://www.openerp.com/",
+    "depends": ["analytic_contract_hr_expense","project"],
+    "init_xml": [],
+    "update_xml": [
+                    "analytic_contract_expense_project_view.xml",
+                    ],
     'demo_xml': [],
+    "css" : [
+             ],
     'installable': True,
-    'auto_install': False,
-    'certificate': '0030271787965',
+    'auto_install': True,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
new file mode 100644
index 00000000000..efbb8b75a9e
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+
+    def open_hr_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
+
+    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
+
+project_project()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
new file mode 100644
index 00000000000..d4350c7325f
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="project_form_expense_form" model="ir.ui.view">
+            <field name="name">project.project.form.expense.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="total"]' position='before'>
+                    <tr>
+                        <td>
+                            <label for="charge_expenses"/>
+                        </td><td>
+                            <field name="charge_expenses"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/analytic_journal_billing_rate/__init__.py b/addons/analytic_contract_hr_expense/__init__.py
similarity index 96%
rename from addons/analytic_journal_billing_rate/__init__.py
rename to addons/analytic_contract_hr_expense/__init__.py
index d2b6ac90561..ca4044b0584 100644
--- a/addons/analytic_journal_billing_rate/__init__.py
+++ b/addons/analytic_contract_hr_expense/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import analytic_journal_billing_rate
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import analytic_contract_hr_expense
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
new file mode 100644
index 00000000000..981f7226d6a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Contracts Management: hr_expense link',
+    'version': '1.1',
+    'category': 'Sales Management',
+    'description': """
+This module is for modifying account analytic view to show some data related to the hr_expense module.
+======================================================================================================
+
+""",
+    "author": "OpenERP S.A.",
+    "website": "http://www.openerp.com/",
+    "depends": ["hr_expense","account_analytic_analysis"],
+    "init_xml": [],
+    "update_xml": [
+                    "analytic_contract_hr_expense_view.xml",
+                    ],
+    'demo_xml': [],
+    "css" : [
+             ],
+    'installable': True,
+    'auto_install': True,
+    'certificate': '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
new file mode 100644
index 00000000000..8f24f12808b
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from osv.orm import intersect, except_orm
+import tools.sql
+from tools.translate import _
+from decimal_precision import decimal_precision as dp
+
+
+class account_analytic_account(osv.osv):
+    _name = "account.analytic.account"
+    _inherit = "account.analytic.account"
+
+    def _get_total_estimation(self, account):
+        tot_est = super(account_analytic_account, self)._get_total_estimation(account)
+        if account.charge_expenses:
+            tot_est += account.est_expenses
+        return tot_est
+
+    def _get_total_invoiced(self, account):
+        total_invoiced = super(account_analytic_account, self)._get_total_invoiced(account)
+        if account.charge_expenses:
+            total_invoiced += account.expense_invoiced
+        return total_invoiced
+
+    def _get_total_remaining(self, account):
+        total_remaining = super(account_analytic_account, self)._get_total_remaining(account)
+        if account.charge_expenses:
+            total_remaining += account.remaining_expense
+        return total_remaining
+
+    def _get_total_toinvoice(self, account):
+        total_toinvoice = super(account_analytic_account, self)._get_total_toinvoice(account)
+        if account.charge_expenses:
+            total_toinvoice += account.expense_to_invoice
+        return total_toinvoice
+
+    def _remaining_expnse_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.est_expenses != 0:
+                res[account.id] = max(account.est_expenses - account.expense_invoiced, account.expense_to_invoice)
+            else:
+                res[account.id]=0.0
+        return res
+
+    def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        res_final = {}
+        child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        for i in child_ids:
+            res[i] =  0.0
+        if not child_ids:
+            return res
+
+        if child_ids:
+            cr.execute("""SELECT account_analytic_account.id, \
+                                COALESCE(SUM (product_template.list_price * \
+                                    account_analytic_line.unit_amount * \
+                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
+                                    AS ca_to_invoice \
+                            FROM product_template \
+                            JOIN product_product \
+                                ON product_template.id = product_product.product_tmpl_id \
+                            JOIN account_analytic_line \
+                                ON account_analytic_line.product_id = product_product.id \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            JOIN account_analytic_account \
+                                ON account_analytic_account.id = account_analytic_line.account_id \
+                            JOIN hr_timesheet_invoice_factor \
+                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
+                            WHERE account_analytic_account.id IN %s \
+                                AND account_analytic_line.invoice_id IS NULL \
+                                AND account_analytic_line.to_invoice IS NOT NULL \
+                                AND account_analytic_journal.type = 'purchase' \
+                            GROUP BY account_analytic_account.id;""",(child_ids,))
+            for account_id, sum in cr.fetchall():
+                res[account_id] = sum
+        res_final = res
+        return res_final
+
+    def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+        lines_obj = self.pool.get('account.analytic.line')
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = 0.0
+            line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'purchase')], context=context)
+            for line in lines_obj.browse(cr, uid, line_ids, context=context):
+                res[account.id] += line.invoice_id.amount_untaxed
+        return res
+
+
+    _columns = {
+        'charge_expenses' : fields.boolean('Charge Expenses'),
+        'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
+        'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
+        'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"), 
+        'est_expenses': fields.float('Estimation of Expenses to Invoice'),
+    }
+
+    def on_change_template(self, cr, uid, id, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, id, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['charge_expenses'] = template.charge_expenses
+            res['value']['est_expenses'] = template.est_expenses
+        return res
+
+    def open_hr_expense(self, cr, uid, ids, context=None):
+        line_ids = self.pool.get('hr.expense.line').search(cr,uid,[('analytic_account', 'in', ids)])
+        domain = [('line_ids', 'in', line_ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Expenses of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'hr.expense.expense',
+            'nodestroy': True,
+        }
+
+    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'purchase'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Expenses to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+account_analytic_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
new file mode 100644
index 00000000000..0148c05d0b4
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="account_analytic_account_form_expense_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.expense.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field eval="60" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="total"]' position='before'>
+                    <tr>
+                        <td>
+                            <label for="charge_expenses"/>
+                        </td><td>
+                            <field name="charge_expenses"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <group>
+                                <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                                <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            </group>
+                        </td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+        
+        <!--<record id="project_form_expense_form" model="ir.ui.view">
+            <field name="name">project.project.form.expense.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//div[@name="end_of_tabl_hook"]' position='before'>
+                        <tr>
+                            <th class="oe_border_right">Charge Expenses</th>
+                            <td><field name="charge_expenses" nolabel="1"/></td>
+                            <td><field class="oe_th_110px" name="est_expenses" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td width="10px"></td>
+                            <td><button icon="gtk-select-all" class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                            <td><button icon="terp-dolar" class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        </tr>
+                </xpath>
+            </field>
+        </record>-->
+    </data>
+</openerp>
diff --git a/addons/analytic_contract_project/__init__.py b/addons/analytic_contract_project/__init__.py
new file mode 100644
index 00000000000..dd60ac32096
--- /dev/null
+++ b/addons/analytic_contract_project/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import analytic_contract_project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
new file mode 100644
index 00000000000..ccf712dc987
--- /dev/null
+++ b/addons/analytic_contract_project/__openerp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Contract On Project",
+    "version": "1.1",
+    "author" : "OpenERP SA",
+    "website" : "http://www.openerp.com",
+    "depends" : ["project", "account_analytic_analysis"],
+    "description": """
+        Add "Contract Data" in project view.
+    """,
+    "init_xml" : [],
+    "update_xml": ["analytic_contract_project_view.xml"],
+    'demo_xml': [],
+    'installable': True,
+    'auto_install': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
new file mode 100644
index 00000000000..6221617637e
--- /dev/null
+++ b/addons/analytic_contract_project/analytic_contract_project.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class project_project(osv.osv):
+    _inherit = 'project.project'
+
+    _defaults = {
+        'use_timesheets': True,
+    }
+
+    def open_sale_order_lines(self,cr,uid,ids,context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
+
+    def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
+        analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
+        context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Timesheet Lines to Invoice'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': context,
+            'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+    def open_timesheets(self, cr, uid, ids, context=None):
+        """ open Timesheets view """
+        project = self.browse(cr, uid, ids[0], context)
+        try:
+            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
+        except ValueError:
+            journal_id = False
+        view_context = {
+            'search_default_account_id': [project.analytic_account_id.id],
+            'default_account_id': project.analytic_account_id.id,
+            'default_journal_id': journal_id,
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Bill Tasks Works'),
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'context': view_context,
+            'nodestroy': True,
+        }
+project_project()
+
+class task(osv.osv):
+    _inherit = "project.task"
+    
+    def create(self, cr, uid, vals, context=None):
+        task_id = super(task, self).create(cr, uid, vals, context=context)
+        task_browse = self.browse(cr, uid, task_id, context=context)
+        self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
+        return task_id
+task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
new file mode 100644
index 00000000000..0e61fe08d01
--- /dev/null
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="project_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">project.project.form.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//page[@name="team"]' position='after'>
+                    <page string="Contract Data">
+                        <group>
+                            <group string="Validity">
+                                <label for="date_start" string="Duration"/>
+                                <div name="duration">
+                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                </div>
+                                <label for="quantity_max"/>
+                                <div>
+                                    <field name="quantity_max" class="oe_inline"/>
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
+                                    <field name="remaining_hours" class="oe_inline"/> 
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group string="Invoice Options">
+                                <field name="manager_id" />
+                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                            </group>
+                        </group>
+                    <separator name="toinvoice" string="Invoicing"/>
+                    <table width="100%%">
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field name="fix_price_invoices" class="oe_inline"/>
+                            </td><td>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
+                            <td>
+                                <label for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field name="invoice_on_timesheets"/>
+                            </td><td>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
+                                <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td>
+                        </tr><tr name="total">
+                            <th>
+                                <label string="Total"/>
+                            </th><td>
+                            </td><td>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_inline"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_inline"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                    <separator string="Terms and Conditions" name="description"/>
+                    <field name="description"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_timesheets"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="contract_inherited_form" model="ir.ui.view">
+            <field name="name">Inherit contract form : adding UoM</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="priority">50</field>
+            <field name="arch" type="xml">
+                <xpath expr='//field[@name="remaining_hours"]' position='after'>
+                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
deleted file mode 100644
index 0896e7d443c..00000000000
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-
-class analytic_journal_rate_grid(osv.osv):
-
-    _name="analytic_journal_rate_grid"
-    _description= "Relation table between journals and billing rates"
-    _columns={
-        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True,),
-        'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        'rate_id': fields.many2one("hr_timesheet_invoice.factor", "Invoicing Rate",),
-        }
-
-analytic_journal_rate_grid()
-
-class account_analytic_account(osv.osv):
-
-    _inherit = "account.analytic.account"
-    _columns = {
-        'journal_rate_ids': fields.one2many('analytic_journal_rate_grid', 'account_id', 'Invoicing Rate per Journal'),
-    }
-
-account_analytic_account()
-
-class hr_analytic_timesheet(osv.osv):
-
-    _inherit = "hr.analytic.timesheet"
-
-
-    def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0, journal_id=0):
-        res = {}
-        if not (account_id):
-            #avoid a useless call to super
-            return res 
-
-        if not (journal_id):
-            return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id, user_id, unit_amount)
-
-        #get the browse record related to journal_id and account_id
-        temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id) ])
-
-        if not temp:
-            #if there isn't any record for this journal_id and account_id
-            return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id,user_id, unit_amount)
-        else:
-            #get the old values from super and add the value from the new relation analytic_journal_rate_grid
-            r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp)[0]
-            res.setdefault('value',{})
-            res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id, user_id, unit_amount)['value']
-            if r.rate_id.id:
-                res['value']['to_invoice'] = r.rate_id.id
-    
-        return res
-
-
-    def on_change_journal_id(self, cr, uid, ids, journal_id, account_id):
-        res = {}
-        if not (journal_id and account_id):
-            return res 
-
-        #get the browse record related to journal_id and account_id
-        temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id) ])
-        if temp:
-            #add the value from the new relation analytic_user_funct_grid
-            r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp)[0]
-            res.setdefault('value',{})
-            if r.rate_id.id:
-                res['value']['to_invoice'] = r.rate_id.id
-                return res
-        to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [account_id], ['to_invoice'])[0]['to_invoice']
-        if to_invoice:
-            res.setdefault('value',{})
-            res['value']['to_invoice'] = to_invoice[0]
-
-        return res
-
-hr_analytic_timesheet()
-
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-
-    def _get_analytic_lines(self, cr, uid, id, context=None):
-        iml = super(account_invoice, self)._get_analytic_lines(cr, uid, id, context=context)
-        for il in iml:
-            if il['account_analytic_id'] and il.get('analytic_lines', False):
-
-                #get the browse record related to journal_id and account_id
-                journal_id = il['analytic_lines'][0][2]['journal_id']
-                account_id = il['analytic_lines'][0][2]['account_id']
-                if journal_id and account_id:
-                    temp = self.pool.get('analytic_journal_rate_grid').search(cr, uid, [('journal_id', '=', journal_id),('account_id', '=', account_id)], context=context)
-
-                    if temp:
-                        r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp, context=context)[0]
-                        il['analytic_lines'][0][2]['to_invoice'] = r.rate_id.id
-        return iml
-
-account_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
deleted file mode 100644
index 13a159a9321..00000000000
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-        <!-- analytic_journal_rate_grid views -->
-        <record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
-            <field name="name">analytic_journal_rate_grid.tree</field>
-            <field name="model">analytic_journal_rate_grid</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
-                    <field name="journal_id" required="1"/>
-                    <field name="rate_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="analytic_journal_rate_grid_form">
-            <field name="name">analytic_journal_rate_grid.form</field>
-            <field name="model">analytic_journal_rate_grid</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Billing Rate per Journal for this Analytic Account">
-                    <field name="journal_id" required="1"/>
-                    <field name="rate_id" />
-                </form>
-            </field>
-        </record>
-
-        <!-- account.analytic.account inherited view -->
-        <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='to_invoice']" position="after">
-                    <field name="journal_rate_ids" nolabel="1" colspan="4"/>
-                </xpath>                
-            </field>
-        </record>
-
-        <!-- hr_timesheet_sheet.sheet inherited view -->
-        <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
-            <field name="name">hr.timesheet.sheet.form</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)"/>
-                </xpath>
-            </field>
-        </record>
-
-        <!-- hr.analytic.timesheet inherited views -->
-        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
-            <field name="name">hr.analytic.timesheet.form</field>
-            <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@string='Information']//field[@name='account_id']" position="replace">
-                    <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)" select="1"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
-            <field name="name">hr.analytic.timesheet.form</field>
-            <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@string='Information']//field[@name='journal_id']" position="replace">
-                    <field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
deleted file mode 100644
index c83f406c70b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 00:35+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
diff --git a/addons/analytic_journal_billing_rate/i18n/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
deleted file mode 100644
index 76941f061e5..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-05 20:55+0000\n"
-"Last-Translator: kifcaliph <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "يومية تحليلية"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "قيمة الفواتير لكل يومية للحساب التحليلي هذا"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "حساب تحليلي"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "جدول العلاقة بين اليوميات ومعدلات الفواتير"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "قيمة الفاتورة لكل يومية"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "فاتورة"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "قيمة الفاتورة"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "خط سجل الدوام"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "القيم التحليلية للفواتير اليومية, حدد قيمة الفاتورة الافتراضية ليومية محددة"
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
deleted file mode 100644
index 8ba12019391..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-01 20:24+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Аналитичен дневник"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Фактура"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Грешка! Не можете да създавате рекурсивни аналитични сметки."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ред в графика"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
deleted file mode 100644
index da239c6ec7d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:19+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitička knjiženja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Cijana naplate po knjiženju za ovo Analitičko konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitičko konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela relacija između knjiženja i cijene naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Cijena po knjiženju"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
deleted file mode 100644
index 5b7cc0e6290..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diari analític"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de facturació per diari per aquesta compte analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Taula de relació entre diaris i taxes de facturació"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturació per diari"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de facturació"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! No podeu crear comptes analítics recursius."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línia del full de serveis"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Rati facturació diari analític"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Error! La moneda ha de ser la mateixa que la moneda de la companyia "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taxa de facturació d'un diari analític. Defineix la taxa de facturació per "
-#~ "defecte per a un diari en concret."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Aquest mòdul us permet definir el percentatge de facturació per a un "
-#~ "cert diari en un compte donat. S'utilitza principalment quan un usuari "
-#~ "codifica el seu full de serveis: els valors són recuperats i els camps són "
-#~ "auto emplenats tot i que la possibilitat de canviar-los està encara "
-#~ "disponible.\n"
-#~ "\n"
-#~ "Òbviament si no s'ha guardat dades per al compte actual, es proporciona el "
-#~ "valor per defecte per a les dades del compte com sempre, pel que aquest "
-#~ "mòdul és perfectament compatible amb configuracions anteriors.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
deleted file mode 100644
index a8a8e0a7357..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po
deleted file mode 100644
index 76a0270f929..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/da.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-11-09 21:41+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
-"Language-Team: Danish <da@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
deleted file mode 100644
index 61874c71a9a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-13 19:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Die Rechnungsnummer muss je Firma eindeutig sein"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytisches Journal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "ungültige BBA Kommunikations Stuktur"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Abrechnungsquote nach Journal"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytisches Konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relation zwischen Journal und Abrechnungsquote"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Abrechnungsquote nach Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Abrechnungsquote"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zeiterfassung Positionen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytisches Journal Verrechnungssatz"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Abrechnungsquote für analytische Buchungen. Definieren Sie einen "
-#~ "Standardwert je spezifiziertem Journal."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Fehler! Die Währung muss der Währung der gewählten Firma entsprechen"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Diese Anwendung ermöglicht Ihnen die Definition einer Standard "
-#~ "Abrechnungsquote für ein analytisches Konto bei Buchung   im Kontext eines "
-#~ "bestimmten Journals. Angewendet wird die Abrechnungsquote meistens, wenn ein "
-#~ "Benutzer seine Zeiterfassung auf  bestimmte Konten vornimmt. Dabei werden "
-#~ "dann die Konten und Beträge automatisch vorausgefüllt, mit der Möglichkeit "
-#~ "diese\n"
-#~ "individuell anzupassen.\n"
-#~ "\n"
-#~ "     Wenn keine Konfiguration bei der Eingabe eines Kontos gefunden wird, "
-#~ "würde weiterhin der Standardwert des Kontos verwendet, so dass dieses Modul "
-#~ "gleichzeitig kompatibel mit älteren Konfigurationseinstellungen ist.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
deleted file mode 100644
index e4447dc733b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-29 10:33+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Ημερολόγιο Αναλυτικής"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-"Ποσοστό Τιμολόγησης ανα Ημερολόγιο για αυτόν τον Αναλυτικό Λογαριασμό"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Πίνακας σχέσεων μεταξύ ημερολογίων και ποσοστών χρέωσης"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Ποσό Τιμολόγησης ανα Ημερολόγιο"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Ποσό Τιμολόγησης"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Ποσό Τιμολόγησης Ημερολόγιου Αναλυτικής"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
diff --git a/addons/analytic_journal_billing_rate/i18n/en_GB.po b/addons/analytic_journal_billing_rate/i18n/en_GB.po
deleted file mode 100644
index be92d92aa3a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/en_GB.po
+++ /dev/null
@@ -1,130 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-23 13:36+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Invoice Number must be unique per Company!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytic Journal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Invalid BBA Structured Communication !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Billing Rate per Journal for this Analytic Account"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytic Account"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relation table between journals and billing rates"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Invoicing Rate per Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Invoicing Rate"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! You can not create recursive analytic accounts."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Timesheet Line"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Error! The currency has to be the same as that of the selected company"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define the default invoicing rate for a "
-#~ "specific journal on a given account. This is mostly used when a user encodes "
-#~ "their timesheet: the values are retrieved and the fields are auto-filled... "
-#~ "but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given by the account data so that this module is perfectly "
-#~ "compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytic Journal Billing Rate"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "The Object name must start with x_ and not contain any special characters!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
deleted file mode 100644
index 87fbe32c17d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación de un diario analítico. Define la tasa de facturación "
-#~ "por defecto para un diario en concreto."
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
deleted file mode 100644
index cb0058df1a3..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-14 18:33+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Libro Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por libro diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre libros diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por libro diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación del libro diario analítico"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-#~ "especial!"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_CR.po b/addons/analytic_journal_billing_rate/i18n/es_CR.po
deleted file mode 100644
index 5f24420f6e8..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_CR.po
+++ /dev/null
@@ -1,136 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-15 15:53+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\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: 2012-02-16 05:06+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-"Language: \n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "¡El número de factura debe ser único por compañía!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "¡Estructura de comunicación BBA no válida!"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"No se puede modificar una entrada en un parte de horas Confirmado / ¡Ya "
-"está!."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación de un diario analítico. Define la tasa de facturación "
-#~ "por defecto para un diario en concreto."
diff --git a/addons/analytic_journal_billing_rate/i18n/es_EC.po b/addons/analytic_journal_billing_rate/i18n/es_EC.po
deleted file mode 100644
index adebfb2920a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_EC.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-13 03:51+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación diario analítico. Define la tasa de facturación por "
-#~ "defecto para un diario en concreto."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-#~ "seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/es_MX.po b/addons/analytic_journal_billing_rate/i18n/es_MX.po
deleted file mode 100644
index be708d5fbe7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_MX.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default invoicing rate for "
-"a specific journal on a given account. This is mostly used when a user "
-"encodes his timesheet: the values are retrieved and the fields are auto-"
-"filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the account data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir el porcentaje de facturación para un "
-"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-"usuario codifica su hoja de servicios: los valores son recuperados y los "
-"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-"está todavía disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos de la cuenta como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"Analytic Journal Billing Rate, Define the default invoicing rate for a "
-"specific journal"
-msgstr ""
-"Tasa de facturación de un diario analítico. Define la tasa de facturación "
-"por defecto para un diario en concreto."
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/es_PY.po b/addons/analytic_journal_billing_rate/i18n/es_PY.po
deleted file mode 100644
index 3cb80026dca..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_PY.po
+++ /dev/null
@@ -1,121 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-07 23:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Tasa de facturación diario analítico. Define la tasa de facturación por "
-#~ "defecto para un diario en concreto."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo le permite definir el porcentaje de facturación para un "
-#~ "cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-#~ "usuario codifica su hoja de servicios: los valores son recuperados y los "
-#~ "campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-#~ "está todavía disponible.\n"
-#~ "\n"
-#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
-#~ "proporciona el valor por defecto para los datos de la cuenta como siempre "
-#~ "por lo que este módulo es perfectamente compatible con configuraciones "
-#~ "anteriores.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/es_VE.po b/addons/analytic_journal_billing_rate/i18n/es_VE.po
deleted file mode 100644
index be708d5fbe7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/es_VE.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-11 10:47+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default invoicing rate for "
-"a specific journal on a given account. This is mostly used when a user "
-"encodes his timesheet: the values are retrieved and the fields are auto-"
-"filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the account data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir el porcentaje de facturación para un "
-"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
-"usuario codifica su hoja de servicios: los valores son recuperados y los "
-"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
-"está todavía disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos de la cuenta como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasa de facturación por diario para esta cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabla de relación entre diarios y tasas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid ""
-"Analytic Journal Billing Rate, Define the default invoicing rate for a "
-"specific journal"
-msgstr ""
-"Tasa de facturación de un diario analítico. Define la tasa de facturación "
-"por defecto para un diario en concreto."
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tasa facturación diario analítico"
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
deleted file mode 100644
index 73bc7debeac..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-11-09 16:30+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analüütiline päevik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Arve esitamise määr päeviku kohta sellel analüütilisel kontol"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Seoste tabel päevikute ja arve esitamise määrade vahel"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Arveldamise määr päeviku kohta"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Arveldamise määr"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
diff --git a/addons/analytic_journal_billing_rate/i18n/fa.po b/addons/analytic_journal_billing_rate/i18n/fa.po
deleted file mode 100644
index d3f1924359b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fa.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-18 17:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian <fa@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/fi.po b/addons/analytic_journal_billing_rate/i18n/fi.po
deleted file mode 100644
index fb9cce2592e..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fi.po
+++ /dev/null
@@ -1,91 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-08-08 07:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analyyttinen päiväkirja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Veloitushinta päiväkirjoittain tälle analyyttiselle tilille"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Suhdetaulu päiväkirjojen ja veloituhintojen välillä"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Veloitushinta päiväkirjoittain"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Lasku"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Laskutushinta"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analyyttisen päiväkirjan veloitushinta, määrittele oletushinta tietylle "
-#~ "päiväkirjalle"
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
deleted file mode 100644
index 60d66e52b74..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Journal Analytique"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taux de Facturation par Journal pour ce Compte Analytique"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte Analytique"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tableau de Relations entre les journaux et les taux de Facturations"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taux de Facturation par Journal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taux de Facturation"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ligne de prestation"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-#~ "spéciaux !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Taux de Facturation des Journaux Analytiques"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taux de facturation par journal analytique. Définir le taux de facturation "
-#~ "par défaut pour un journal donné"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Erreur ! La monnaie doit être la même que la monnaie de la société "
-#~ "sélectionnée"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Ce module vous permet de définir quel est le taux de facturation par "
-#~ "défaut pour un journal spécifique et pour un compte donné. Ceci est surtout "
-#~ "utilisé quand un utilisateur saisit sa feuille de temps : les valeurs sont "
-#~ "récupérées et les champs sont automatiquement remplis... mais la possibilité "
-#~ "de changer ces valeurs est toujours disponible.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
deleted file mode 100644
index 9a2ac1d8a96..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ /dev/null
@@ -1,132 +0,0 @@
-# translation of analytic-journal-billing-rate-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: analytic-journal-billing-rate-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-02-07 10:37+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diario analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de facturación por diario para esta conta analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Táboa de relación entre diarios e taxas de facturación"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturación por diario"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de facturación"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Erro! Non pode crear contas analíticas recorrentes."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Liña de parte de horas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML non válido para a definición da vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-#~ "especial!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Taxa facturación diario analítico"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Taxa Analítico de Diario de Facturación, Define o taxa de facturación por "
-#~ "defecto para un diario específico"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "¡Erro! A divisa ten que se-la mesma ca da compañía seleccionada"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Este módulo permítelle establecer cal é a taxa de facturación por "
-#~ "defecto para un diario específico nunha determinada conta. Isto é usado "
-#~ "sobre todo cando un usuario cubre o seu parte de horas: os valores son "
-#~ "recuperados e os campos son cubertos automáticamente... pero a posibilidade "
-#~ "de modificar estes valores aínda está dispoñible.\n"
-#~ "\n"
-#~ "     Por suposto, se ningún dato foi rexistrado para a conta actual, o valor "
-#~ "por defecto é dado como de costume polos datos da conta para que este módulo "
-#~ "sexa perfectamente compatible coas configuracións máis antigas.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/gu.po b/addons/analytic_journal_billing_rate/i18n/gu.po
deleted file mode 100644
index c8034ae4d0c..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/gu.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-03-06 18:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gujarati <gu@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: 2012-03-07 05:13+0000\n"
-"X-Generator: Launchpad (build 14907)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "વિશ્લેષણાત્મક ખાતું"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "ત્રુટિ! તમે અંદરોઅંદર વિશ્લેષણાત્મક ખાતાઓ ન બનાવી શકો."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
deleted file mode 100644
index 0962c52b6f7..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-08 15:46+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Dnevnik analitike"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stupanj naplate po temeljnici za ovaj analitički račun"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relacijska tablica između temeljnica i stupnjeva naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Greška! Valuta ne odgovara valuti organizacije."
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
deleted file mode 100644
index a2c566dbf22..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ /dev/null
@@ -1,119 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-30 18:59+0000\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Gyűjtőnapló"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "A gyűjtőkód naplónkénti számlázási rátája"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Gyűjtőkód"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Naplók és számlázási ráták közötti kapcsolati tábla"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Naplónkénti számlázási ráta"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Számlázási ráta"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Munkaidő-kimutatás sora"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Ez a modul lehetővé teszi annak meghatározását, hogy mi a gyűjtőkód "
-#~ "naplójának alapértelmezett számlázási rátája. Leginkább akkor használják, "
-#~ "amikor a felhasználó berögzíti a munkaidő-kimutatását: az értékek feljönnek "
-#~ "és a mezők automatikusan kitöltődnek... De ezeket az értékeket meg lehet "
-#~ "változtatni.\n"
-#~ "\n"
-#~ "    Nyilvánvalóan, ha az aktuális gyűjtőkódra nem vittek be adatot, az "
-#~ "alapértelmezett érték a könyvelési adatokból kerül meghatározásra.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Gyűjtőnapló számlázási ráta. Az adott naplóra meghatározza az "
-#~ "alapértelmezett számlázási rátát."
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
deleted file mode 100644
index 3c4bc6239f9..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:27+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jurnal Analisis"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Akun Analisis"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
deleted file mode 100644
index adb466b3f0b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ /dev/null
@@ -1,97 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-17 20:25+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Giornale conti analitici"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tasso di fatturazione per Giornale per questo Conto Analitico"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conto analitico"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabella di relazione tra Giornali e tassi di fatturazione"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Tasso di fatturazione diviso per Giornale"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Tasso di fatturazione"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linea del Timesheet"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzare l'architettura!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Giornale Conti Analitici Tasso di fatturazione"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Errore! La valuta deve essere la stessa di quella impostata nell'azienda "
-#~ "selezionata"
diff --git a/addons/analytic_journal_billing_rate/i18n/ja.po b/addons/analytic_journal_billing_rate/i18n/ja.po
deleted file mode 100644
index a61b0106483..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ja.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-26 08:50+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
-"Language-Team: Japanese <ja@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: 2012-04-27 04:38+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとに固有である必要があります。"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "分析仕訳帳"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "この分析アカウントの仕訳ごとの請求割合"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "分析アカウント"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "仕訳帳と請求割合の関連表"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "仕訳ごとの請求割合"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "請求書"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "請求割合"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "エラー。反復した分析アカウントを作成することはできません。"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "勤務表の行"
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
deleted file mode 100644
index d6bffd7b370..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:10+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "분석 저널"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "이 분석 계정을 위한 저널 당 청구 비율"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "분석 계정"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "저널과 청구 비율 간의 관계"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "저널 당 인보이스 비율"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "청구 비율"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "분석 저널 청구 비율"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
deleted file mode 100644
index 05afa024123..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/lv.po b/addons/analytic_journal_billing_rate/i18n/lv.po
deleted file mode 100644
index 01b645557dd..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/lv.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-28 13:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@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: 2012-05-29 04:46+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/mn.po b/addons/analytic_journal_billing_rate/i18n/mn.po
deleted file mode 100644
index 3d59865b775..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/mn.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-21 14:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитик Данс"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Нэхэмжлэл"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Цаг бүртгэлийн мөр"
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
deleted file mode 100644
index dee199ddb49..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ /dev/null
@@ -1,132 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 15:06+0000\n"
-"Last-Translator: Erwin <Unknown>\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: 2012-02-14 05:45+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Factuurnummer moet uniek zijn per bedrijf!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analytisch dagboek"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Ongeldige BBA gestructureerde communicatie!"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Doorbelastingsfactor per dagboek voor deze kostenplaats"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Kostenplaats"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Koppelingstabel tussen dagboeken en doorbelastingsfactoren"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Facturerings factor per dagboek"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Het is niet mogelijk een bevestigde/Gereed zijnde boeking van een urenstaat "
-"te wijzigen!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Facturerings factor"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Urenstaatregel"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytisch dagboek factureringstarief"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Kostenplaats dagboek facturatie factor, definieert de standaard facturatie "
-#~ "tarief voor een specifiek dagboek"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Fout! De munteenheid moet hetzelfde zijn als de munteenheid van het "
-#~ "geselecteerde bedrijf"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Deze module laat u standaard factuurtarief voor een specifiek dagboek op "
-#~ "een gegeven rekening. Dit wordt meestal gebruikt bij het invullen van "
-#~ "urenstaten: de waardes worden opgehaald en automatisch ingevuld... met de "
-#~ "mogelijkheid hiervan af te wijken.\n"
-#~ "\n"
-#~ "    Natuurlijk wordt bij het ontbreken ervan bij de huidige rekening, de "
-#~ "standaard waarde als gebruikelijk bepaald uit de rekening gegevens zodat de "
-#~ "module perfect compatibel blijft met oudere configuraties.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
deleted file mode 100644
index cd33100480d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-04-24 15:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
deleted file mode 100644
index 83be8512443..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/oc.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:30+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jornal analitic"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte Analitic"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid per l'arquitectura de la vista"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-#~ "especials !"
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
deleted file mode 100644
index a5475a40063..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-11-17 09:13+0000\n"
-"Last-Translator: Mariusz Bednarz <mbednarz@bedmar.pl>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Dziennik analityczny"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stawki rozliczeniowe na Dziennik dla konta analitycznego"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analityczne"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela relacji między dziennikiem a stawkami rozliczeniowymi"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Faktura w dzienniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Stawki rozliczeniowe dziennika analitycznego"
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
deleted file mode 100644
index 5d6ee807e34..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-16 05:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diário Analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de Facturação por Diário para esta Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela de Relação entre diários e taxas de facturação"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de facturação por diário"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de Facturação"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivamente"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-#~ "especial !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Diário Analítico da Taxa de Faturação"
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
deleted file mode 100644
index ca814e34f35..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-19 20:12+0000\n"
-"Last-Translator: Emerson <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Diário Analítico"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Taxa de Cobrança por Diário para esta Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela de relação entre diários e taxas de cobrança"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Taxa de Faturamento por Diário"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Taxa de Faturamento"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Você não pode criar contas analíticas recursivas"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linha de Apontamento de Horas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
deleted file mode 100644
index 18b684c8b7c..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ /dev/null
@@ -1,131 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Jurnal analitic"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Rată facturare per jurnal pentru acest cont analitic"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cont analitic"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabel de relaţii între jurnale şi ratele de facturare"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Rată facturare per jurnal"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Factură"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Rată facturare"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Eroare! Nu puteti crea conturi analitice recursive."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linie foaie de pontaj"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Jurnal analitic rată de facturare"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Eroare! Moneda trebuie sa fie aceeasi ca si moneda companiei selectate"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Rata de facturare in Jurnalul analitic, Definiti rata predefinita de "
-#~ "facturare pentru un anumit jurnal"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Acest modul va permite sa definiti rata implicita de facturare pentru un "
-#~ "anumit jurnal intr-un cont dat. Acesta este folosit mai ales atunci cand un "
-#~ "utilizator isi codeaza propria foaie de pontaj: valorile sunt recuperate, "
-#~ "iar campurile sunt completate automat... dar inca aveti posibilitatea de a "
-#~ "modifica aceste valori.\n"
-#~ "\n"
-#~ "Este evident faptul ca, daca nu au fost inregistrate date pentru contul "
-#~ "curent, valoarea default este data de obicei de datele contului, astfel ca "
-#~ "acest modul este perfect compatibil cu configurarile mai vechi.\n"
-#~ "\n"
-#~ "    "
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
deleted file mode 100644
index 01e13b33fcd..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-03 00:33+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Книга аналитики"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Счет аналитического учета"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Счет"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Скорость выставления счета"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Строка табеля"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
deleted file mode 100644
index da15537789b..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-16 18:05+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitični dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Tarifa zaračunavanja po dnevnikih za ta analitični konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela odnosov med dnevniki in tarifami zaračunavanja"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Fakturna stopnja za dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Fakturna stopnja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Postavka časovnice"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Tarifa zaračunavanja analitičnega dnevnika"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
diff --git a/addons/analytic_journal_billing_rate/i18n/sq.po b/addons/analytic_journal_billing_rate/i18n/sq.po
deleted file mode 100644
index f907979e379..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sq.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-02 14:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
deleted file mode 100644
index 7d6baf67750..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sr.po
+++ /dev/null
@@ -1,97 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-10-27 08:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analiticki Dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stepen naplate po Dnevniku za ovaj Analiticki Konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Relaciona tabela izmedju dnevnika i stepena naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Stepen fakturiranja po Dnevniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Fakturisanje cene"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Timesheet Linija"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analiticki Dnevnik obracunate cene"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost "
-#~ "za specificni dnevnik"
diff --git a/addons/analytic_journal_billing_rate/i18n/sr@latin.po b/addons/analytic_journal_billing_rate/i18n/sr@latin.po
deleted file mode 100644
index 91eda48bf01..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sr@latin.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-12-27 15:53+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Broj fakture mora biti jedinstven po kompaniji"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analitički dnevnik"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Nepravilno BBA struktuirana komunikacija !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Stepen naplate po Dnevniku za ovaj Analitički Konto"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Tabela odnosa između dnevnika i stepenova naplate"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Stepen fakturiranja po Dnevniku"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Ne možete izmeniti unos u kontrolnoj kartici obeleženim kao "
-"Potvrđenim/Završenim"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Stepen fakturisanja"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Niz kontrolne kartice"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost "
-#~ "za specificni dnevnik"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analiticki Dnevnik obracunate cene"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
deleted file mode 100644
index 28c03b9dbfa..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-23 04:55+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Analysjournal"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analys konto"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fel! Du kan inte skapa rekursiva analyskonton."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Tidrapportrad"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "Analytic Journal Billing Rate"
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
deleted file mode 100644
index a0eaa131125..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
deleted file mode 100644
index 95977462f5a..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ /dev/null
@@ -1,121 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-25 00:10+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "Yevmiye Analizi"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "Geçersiz BBA Yapılı İletişim !"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "Bu Analiz Hesabına ait her yevmiyenin Ödem Oranı"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "Ödeme oranı ve yevmiyeler arası ilişki tablosu"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "Her yevmiye için faturalama oranı"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !."
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "Faturalama Oranı"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zaman Çizelgesi Satırı"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    Bu modül verilen bir hesapta belirli bir yevmiye için varsayılan "
-#~ "faturalama oranını tanımlar. Bu ençok bir kullanıcı zaman çizelgesi "
-#~ "kodlarken kullanılır: Değerler alınır ve alanlar otomatik doldurulur... ama "
-#~ "bu değerleri değiştirebilme olanağı henüz yoktur.\n"
-#~ "\n"
-#~ "    Açıkçası geçerli hesap için bilgi kayıt edilmemişse, varsayılan değer "
-#~ "olağan şekilde hesap verisi tarafından verilir ki; bu da mbu modülün eski "
-#~ "yapılandırmayla uyumlu olduğunu gösterir.\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr ""
-#~ "Analitik Yevmiye Ödeme Oranı, belirli bir yevmiye için varsayılan faturalama "
-#~ "oranı tanımlayın."
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
deleted file mode 100644
index cc467dce71d..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 13:49+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/analytic_journal_billing_rate/i18n/vi.po b/addons/analytic_journal_billing_rate/i18n/vi.po
deleted file mode 100644
index 8c4d2e41175..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/vi.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-08-02 14:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
deleted file mode 100644
index a06d9d0c4e5..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ /dev/null
@@ -1,118 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-09 15:22+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "发票号必须在公司范围内唯一"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr "辅助核算账薄"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr "BBA传输结构有误！"
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr "这辅助核算项每个账簿的开单税率"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "辅助核算项"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr "账簿和开票税率的关系表"
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr "每个账簿的开票税率"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr "发票"
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "已经确认和完成的计工单行不能修改！"
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr "开票税率"
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算项"
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "计工单明细"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效XML视图结构!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
-#~ msgid "Analytic Journal Billing Rate"
-#~ msgstr "辅助核算集合的开票税率"
-
-#~ msgid ""
-#~ "Analytic Journal Billing Rate, Define the default invoicing rate for a "
-#~ "specific journal"
-#~ msgstr "辅助核算账簿的开票税率，为特定辅助核算账簿定义默认开票税率。"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "    This module allows you to define what is the default invoicing rate for "
-#~ "a specific journal on a given account. This is mostly used when a user "
-#~ "encodes his timesheet: the values are retrieved and the fields are auto-"
-#~ "filled... but the possibility to change these values is still available.\n"
-#~ "\n"
-#~ "    Obviously if no data has been recorded for the current account, the "
-#~ "default value is given as usual by the account data so that this module is "
-#~ "perfectly compatible with older configurations.\n"
-#~ "\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "    这模块允许您定义辅助核算项目的指定账簿的默认开票税率，这主要用在用户记工单：这值自动检索和填上。。但可以修改。\n"
-#~ "\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "错误！此币别必须是选定公司的默认币别。"
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
deleted file mode 100644
index a7aee6f1a57..00000000000
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_journal_billing_rate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\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: 2012-02-09 06:45+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: analytic_journal_billing_rate
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: view:analytic_journal_rate_grid:0
-msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
-msgid "Relation table between journals and billing rates"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:account.analytic.account,journal_rate_ids:0
-msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
diff --git a/addons/analytic_journal_billing_rate/security/ir.model.access.csv b/addons/analytic_journal_billing_rate/security/ir.model.access.csv
deleted file mode 100644
index b4a604b2362..00000000000
--- a/addons/analytic_journal_billing_rate/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_analytic_journal_rate_user,analytic journal rate user,model_analytic_journal_rate_grid,account.group_account_manager,1,0,0,0
-access_analytic_journal_rate_manager,analytic journal rate manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
-access_analytic_journal_rate_account_manager,analytic journal rateaccount manager,model_analytic_journal_rate_grid,account.group_account_manager,1,1,1,1
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index d14ed977776..524f0310401 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -32,7 +32,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page" position="after">
                     <page string="Users/Products Rel.">
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js
index a28c56ac411..0e33998cd90 100644
--- a/addons/anonymous/static/src/js/anonymous.js
+++ b/addons/anonymous/static/src/js/anonymous.js
@@ -18,6 +18,9 @@ openerp.anonymous = function(instance) {
                 }
             });
         },
+        restart: function() {
+            return this.start();
+        }
     });
 
 
@@ -35,8 +38,9 @@ openerp.anonymous = function(instance) {
             this.$element.find('.oe_topbar_anonymous_login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
+                p.$element.find('.oe_leftbar').hide();
                 am.do_action({type:'ir.actions.client', tag:'login'});
-                am.client_widget.on('login', p, p.show_application);
+                am.client_widget.on('login', p, p.restart);
             });
         }
     });
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index af30566a643..0ee7f98a020 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -44,8 +44,8 @@ from .. import utils
 
 
 
-_logger = logging.getLogger('web.auth_openid')
-oidutil.log = logging.getLogger('openid').debug
+_logger = logging.getLogger(__name__)
+oidutil.log = _logger.debug
 
 
 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b208864700b..1a3d96cbc33 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -327,7 +327,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         reply_to = emailfrom
         if not emailfrom:
             raise osv.except_osv(_('Error!'),
-                    _("No E-Mail ID Found for your Company address!"))
+                    _("No Email ID Found for your Company address!"))
         return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
 
 
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_action_rule/i18n/ar.po
index 42070d4161e..ffa14e16d39 100644
--- a/addons/base_action_rule/i18n/ar.po
+++ b/addons/base_action_rule/i18n/ar.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -331,8 +331,8 @@ msgstr "نشط"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "لا يوجد هوية للبريد الالكتروني لعنوان شركتك!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -528,3 +528,7 @@ msgstr "تاريخ تريجر"
 
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr "يسمح لك هذا النموذج بتطبيق قواعد الاجراء لاي هدف."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "لا يوجد هوية للبريد الالكتروني لعنوان شركتك!"
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index ee3c87629b1..9b09e28a1f3 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -286,7 +286,7 @@ msgstr ""
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index 0e4b3b030e6..65175f9f607 100644
--- a/addons/base_action_rule/i18n/bg.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -310,7 +310,7 @@ msgstr "Активен"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index 7ca94da11e6..f6d8bb8e743 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -320,8 +320,8 @@ msgstr "Aktivan"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nije pronađen E-Mail ID za adresu Vašeg poduzeća!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -518,3 +518,7 @@ msgstr "Datum okidanja"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Ovaj modul omogućuje da implementirate pravila radnji za bilo koji objekat."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nije pronađen E-Mail ID za adresu Vašeg poduzeća!"
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index b3b921cba5f..4758ba0bee3 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -340,8 +340,8 @@ msgstr "Actiu"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -538,5 +538,9 @@ msgstr "Data d'activació"
 #~ msgstr ""
 #~ "Aquest mòdul permet implementar regles d'accions per a qualsevol objecte."
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Paraules clau especials per ser utilitzades en el missatge"
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 1b2fbc0521c..60cadce5714 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "Aktiv"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index fb5c9264799..fdfbfd021f4 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -334,8 +334,8 @@ msgstr "Aktiv"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "EMail Daten fehlen bei den Adressdaten Ihrer Firma!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -531,6 +531,10 @@ msgstr "Auslösetermin"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Schlüsselwörter zur Benutzung im Haupttext"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "EMail Daten fehlen bei den Adressdaten Ihrer Firma!"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Dieses Modul ermöglicht die Definition von Regeln für bestimmte Aktionen von "
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 6de2217ea2e..cb70ea7aa4d 100644
--- a/addons/base_action_rule/i18n/el.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -312,7 +312,7 @@ msgstr "Ενεργό"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index 494715097b0..02ba275ca89 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -339,9 +339,8 @@ msgstr "Activo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -540,3 +539,8 @@ msgstr "Fecha activación"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_action_rule/i18n/es_CR.po
index 02db82f62fb..29831a5edd3 100644
--- a/addons/base_action_rule/i18n/es_CR.po
+++ b/addons/base_action_rule/i18n/es_CR.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: base_action_rule
@@ -340,9 +340,8 @@ msgstr "Activo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -538,6 +537,11 @@ msgstr "Fecha activación"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palabras especiales a usar en el mensaje"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index d02f3e23359..b740c070618 100644
--- a/addons/base_action_rule/i18n/es_EC.po
+++ b/addons/base_action_rule/i18n/es_EC.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -314,7 +314,7 @@ msgstr ""
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 0bdd1fff2d6..2b8ccaac91d 100644
--- a/addons/base_action_rule/i18n/es_PY.po
+++ b/addons/base_action_rule/i18n/es_PY.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -335,9 +335,8 @@ msgstr "Activo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
-"¡No se ha encontrado un ID de email para su dirección de la compañía!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -536,3 +535,8 @@ msgstr "Fecha activación"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite implementar reglas de acciones para cualquier objeto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "¡No se ha encontrado un ID de email para su dirección de la compañía!"
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
index e8b64ea0013..75fc2cc2279 100644
--- a/addons/base_action_rule/i18n/fa.po
+++ b/addons/base_action_rule/i18n/fa.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr ""
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index 384bc079ba6..461a0d399b7 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -321,8 +321,8 @@ msgstr "Aktiivinen"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -517,3 +517,7 @@ msgstr "Liipaisupäivämäärä"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Tämä moduuli mahdolistaa toimintosääntöjen luomisen mille tahansa objektille."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Sähköpostiosoitetta ei löytynyt yrityksen tiedoista!"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 49dc58e3692..0a3d8a1cac1 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -336,8 +336,8 @@ msgstr "Actif"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Pas de courriel défini dans l'adresse de votre société"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -538,3 +538,7 @@ msgstr "Date de déclenchement"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Mots-clés spéciaux à utiliser dans le corps du texte"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Pas de courriel défini dans l'adresse de votre société"
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index ef89baa495d..93fd06edf22 100644
--- a/addons/base_action_rule/i18n/gl.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -335,8 +335,8 @@ msgstr "Activo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Non se atopou ningún ID de email para o enderezo da súa compañía!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -534,3 +534,7 @@ msgstr "Data de activación"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite implementar regras de accións para calquera obxecto."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Non se atopou ningún ID de email para o enderezo da súa compañía!"
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_action_rule/i18n/gu.po
index 963f2b35185..64de67c903f 100644
--- a/addons/base_action_rule/i18n/gu.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "કાર્યશીલ"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
index 4fe807d9f08..6bc267af06f 100644
--- a/addons/base_action_rule/i18n/hr.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -331,7 +331,7 @@ msgstr "Aktivan"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index d509940ccc6..8991306d89b 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -331,8 +331,8 @@ msgstr "aktív"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nem található e-mail ID az Ön válallatának címéhez!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -529,6 +529,10 @@ msgstr "Indítás dátuma"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciális kulcsszavak használata a levéltözsben"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nem található e-mail ID az Ön válallatának címéhez!"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Ez a modul lehetővé teszi bármely objektumhoz tartozó műveleti szabály "
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 4403028685e..9ba91b1fead 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -327,8 +327,8 @@ msgstr "Attivo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nessun Email ID trovato per l'indirizzo della tua azienda"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -529,3 +529,7 @@ msgstr "Data Programmata"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Questo modulo permette di implementare regole d'azione per alcuni oggetti"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nessun Email ID trovato per l'indirizzo della tua azienda"
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index 960ad6f657c..e25e5039751 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.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: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -315,8 +315,8 @@ msgstr "アクティブ"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "あなたの会社住所にEメールアドレスが見つかりません。"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -502,3 +502,7 @@ msgstr "状態の条件"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "トリガー日"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "あなたの会社住所にEメールアドレスが見つかりません。"
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index 538436b3e37..bdb426cf798 100644
--- a/addons/base_action_rule/i18n/lt.po
+++ b/addons/base_action_rule/i18n/lt.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -161,11 +161,16 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
+"Naudokite automatinius veiksmus, kad automatiškai iškviesti veiksmus "
+"įvairiuose atvejuose. Pavyzdžiui, iniciatyva sukurta tam tikro žmogaus "
+"turėtų būti automatiškai perduota pardavimų komandai, arba galimybė, kuri "
+"turi statusą \"Laukiama\" jau 14 dienų, turėtų būti priminta el. paštu "
+"atsakingam asmeniui."
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Asmens, kuriam turi būti nusiųstas laiškas, el. pašto ID"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -228,6 +233,8 @@ msgid ""
 "Use a python expression to specify the right field on which one than we will "
 "use for the 'To' field of the header"
 msgstr ""
+"Naudokite Python išraišką teisingo laukelio nurodymui, kuris bus naudojamas "
+"antraštės \"Kam\" laukeliui."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -296,6 +303,8 @@ msgid ""
 "Use a python expression to specify the right field on which one than we will "
 "use for the 'From' field of the header"
 msgstr ""
+"Naudokite Python išraišką teisingo laukelio nurodymui, kuris bus naudojamas "
+"antraštės \"Nuo\" laukeliui."
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
@@ -314,6 +323,9 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Delsa po iškvietimo datos,nurodo, kad galite įterpti neigiamą skaičių. Jei "
+"Jums reikia delsos prieš iškvietimo datą, pavyzdžiui siųsti priminimą 15 "
+"min. prieš susitikimą."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -323,8 +335,8 @@ msgstr "Aktyvus"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -517,3 +529,7 @@ msgstr "Įvykio data"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Specialūs raktažodžiai naudojami tekste"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Jūsų kompanijos adrese nerastas el. pašto ID!"
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
index 2aea834f5a2..9d90296ba3d 100644
--- a/addons/base_action_rule/i18n/lv.po
+++ b/addons/base_action_rule/i18n/lv.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "Aktīvs"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 791e282f169..5a6ec729eb2 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -316,8 +316,8 @@ msgstr "Идэвхитэй"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Таны компаны хаягийн санд Э-мэйл ID байхгүй байна!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -506,5 +506,9 @@ msgstr "Нөхцөл байдал"
 msgid "Trigger Date"
 msgstr "Гарааны огноо"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Таны компаны хаягийн санд Э-мэйл ID байхгүй байна!"
+
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Их биенд тусгай түлхүүр үгсийг хэрэглэсэн байх"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index 41e79f4c8b2..a49c3ebb18c 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -336,8 +336,8 @@ msgstr "Actief"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Geen email-ID gevonden bij uw bedrijfsadres!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -535,3 +535,7 @@ msgstr "Activeerdatum"
 
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr "Deze module laat u actieregels voor elk object implementeren."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Geen email-ID gevonden bij uw bedrijfsadres!"
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index effd847b868..eb5852c78e5 100644
--- a/addons/base_action_rule/i18n/pl.po
+++ b/addons/base_action_rule/i18n/pl.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -310,8 +310,8 @@ msgstr "Aktywne"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Brak ID email dla adresu twojej firmy !"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -498,3 +498,7 @@ msgstr ""
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Specjalne słowa kluczowe do zastosowania w treści"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Brak ID email dla adresu twojej firmy !"
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index 8729928632c..f62330d679a 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -335,8 +335,8 @@ msgstr "Ativo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nenhum ID de e-mail encontrado para o endereço da empresa!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -532,6 +532,10 @@ msgstr "Data Limite"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Palavras-chave especial para ser usado no corpo"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nenhum ID de e-mail encontrado para o endereço da empresa!"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite a aplicação das regras de acção para qualquer objecto."
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index 94e5d6ab3f4..26c34b1bf31 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -327,8 +327,8 @@ msgstr "Ativo"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Nenhum ID de Email foi encontrado para o endereço da empresa!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -518,6 +518,10 @@ msgstr ""
 msgid "Trigger Date"
 msgstr "Data de Disparo"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Nenhum ID de Email foi encontrado para o endereço da empresa!"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Este módulo permite implementar regras de ações para qualquer objeto."
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index b79bcdf43e7..998bf5aa400 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -14,15 +14,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
-"Bifati daca doriti ca regula sa trimita un mesaj persoanei responsabile."
+"Bifati aici daca doriti ca regula sa trimita un e-mail persoanei "
+"responsabile."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
@@ -32,17 +33,17 @@ msgstr "Memento Partener"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr "Categoria partenerului"
+msgstr "Categorie Partener"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr "Mail catre observatori (CC)"
+msgstr "Mail catre Observatori (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "Buton apăsat"
+msgstr "Buton apasat"
 
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
@@ -52,7 +53,7 @@ msgstr "Obiect"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr "Mail catre aceste email-uri"
+msgstr "Mesaj la aceste e-mail-uri"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
@@ -77,7 +78,7 @@ msgstr "Zile"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr "Ultima rulare"
+msgstr "Ultima executare"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:328
@@ -88,7 +89,7 @@ msgstr "Eroare!"
 #. module: base_action_rule
 #: field:base.action.rule,act_reply_to:0
 msgid "Reply-To"
-msgstr "Răspunde către:"
+msgstr "Raspunde"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_cc:0
@@ -114,7 +115,7 @@ msgstr "Numele regulii"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
-"Bifaţi aici dacă doriţi ca regula să trimită un memento prin email "
+"Bifati aici daca doriti ca regula sa trimita un memento prin e-mail "
 "partenerului."
 
 #. module: base_action_rule
@@ -125,7 +126,7 @@ msgstr "Conditii pe Partener Model"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr "Termen-limită"
+msgstr "Termen limita"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
@@ -179,12 +180,12 @@ msgstr "Regula actiunii"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
-msgstr "Campuri care trebuie schimbate"
+msgstr "Campuri care vor fi schimbate"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Creation Date"
-msgstr "Data creării"
+msgstr "Data crearii"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -214,7 +215,7 @@ msgstr "Memento cu Atasament"
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr "Argumente invalide"
+msgstr "Argumente nevalide"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
@@ -224,7 +225,7 @@ msgstr "Setare responsabil"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr "Nimic"
+msgstr "Niciunul"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -238,7 +239,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
-msgstr "%(obiect_utilizator_telefon) = Responsabil telefon"
+msgstr "%(obiect_telefon_utilizator) = Responsabil telefon"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -271,7 +272,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr "Metoda obiectului de apel"
+msgstr "Metoda de apel a obiectului"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
@@ -295,7 +296,7 @@ msgstr "%(partener)i = Numele partenerului"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Note"
-msgstr "Notă"
+msgstr "Nota"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_from:0
@@ -314,7 +315,7 @@ msgstr "Intarziere dupa data declansarii"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
-msgstr "Condiţii"
+msgstr "Conditii"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -323,21 +324,20 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
-"Intarziere dupa data declansarii, specifica faptul ca puteti sa puneti un "
-"numar negativ. Daca doriti o intarziere inainte de data declansarii, precum "
-"trimiterea unui memento cu 15 minute inaintea unei intalniri."
+"Intarziere dupa data declansarii, specifica faptul ca puteti sa introduceti "
+"un numar negativ. Daca doriti o intarziere inainte de data declansarii, "
+"precum trimiterea unui memento cu 15 minute inaintea unei intalniri."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
-"Nu a fost gasit nici un ID de email pentru adresa companiei dumneavoastra!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -352,7 +352,7 @@ msgstr "Da ordinea secventei atunci cand afiseaza o lista de reguli."
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr "Luni"
+msgstr "Luni de zile"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
@@ -362,7 +362,7 @@ msgstr "Filtru"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr "Dată"
+msgstr "Data"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -401,7 +401,7 @@ msgstr "Informatii Email"
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr "Reguli de acţiune"
+msgstr "Reguli de actiune"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
@@ -438,12 +438,12 @@ msgstr "Corp email"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
-"Bifati daca doriti ca regula sa trimita un memento prin email utilizatorului."
+"Bifati daca doriti ca regula sa trimita utilizatorului un memento prin email."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server Action to be Triggered"
-msgstr "Actiunea serverului de declansat"
+msgstr "Actiunea serverului care va fi declansat"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_user:0
@@ -464,7 +464,7 @@ msgstr "Conditii in Campurile model"
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
 #: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
 msgid "Automated Actions"
-msgstr "Acţiuni automate"
+msgstr "Actiuni automate"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
@@ -488,17 +488,17 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Timing"
-msgstr "Conditii referitoare la Sincronizare"
+msgstr "Conditii privind Sincronizarea"
 
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr "Secvenţă"
+msgstr "Secventa"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr "Acţiuni"
+msgstr "Actiuni"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -517,21 +517,26 @@ msgstr "%(obiect_utilizator) = Nume responsabil"
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr "Data creării"
+msgstr "Data Crearii"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on States"
-msgstr "Conditii referitoare la Stari"
+msgstr "Conditii privind Starile"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr "Data Declansare"
-
-#~ msgid "Special Keywords to Be Used in The Body"
-#~ msgstr "Cuvinte-cheie speciale de utilizat în corpul mesajului"
+msgstr "Data declansarii"
 
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Acest modul permite implementarea regulilor actiunii pentru orice obiect."
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Cuvinte cheie speciale pentru a fi utilizate in corpul mesajului"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr ""
+#~ "Nu a fost gasit nici un ID de email pentru Adresa companiei dumneavoastra!"
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index f4bcbd2dc54..1c1e396b826 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -334,8 +334,8 @@ msgstr "Активен"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Нет ID эл. почты в адресе вашей компании!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -535,3 +535,7 @@ msgstr "Дата активации"
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Специальные ключевые слова используемые в тексте"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Нет ID эл. почты в адресе вашей компании!"
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
index 7062231f605..766e01ab842 100644
--- a/addons/base_action_rule/i18n/sl.po
+++ b/addons/base_action_rule/i18n/sl.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -312,7 +312,7 @@ msgstr ""
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index 4944ad82d03..83e6df669b6 100644
--- a/addons/base_action_rule/i18n/sq.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr ""
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index cc9f278aa20..059e39b35e1 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -325,8 +325,8 @@ msgstr "Aktivan"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -524,3 +524,7 @@ msgstr "Datum Okidanja"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Ovaj modul omogucava implementiranje pravila akcija za svaki objekat."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index 7b8185e63df..74bf9728138 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -325,8 +325,8 @@ msgstr "Aktivan"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -521,6 +521,10 @@ msgstr "Datum Okidanja"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Specijalne kljucne reci za koriscenje u sadrzaju poruke"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "NIje nadjena sifra Emaila  adrese tvog Preduzeca"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Ovaj modul omogucava implementiranje pravila akcija za svaki objekat."
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index 4400e1fd492..42186fcbfdc 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -36,7 +36,7 @@ msgstr "Partnerkategori"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
 msgid "Mail to Watchers (CC)"
-msgstr ""
+msgstr "E-post till bevakare (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
@@ -61,7 +61,7 @@ msgstr "Sätt status till"
 #. module: base_action_rule
 #: field:base.action.rule,act_email_from:0
 msgid "Email From"
-msgstr ""
+msgstr "E-post från"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -76,7 +76,7 @@ msgstr "Dagar"
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
 msgid "Last Run"
-msgstr ""
+msgstr "Senaste körning"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:328
@@ -104,7 +104,7 @@ msgstr "Minuter"
 #. module: base_action_rule
 #: field:base.action.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Regelnamn"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_partner:0
@@ -120,12 +120,12 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr ""
+msgstr "Tidsfrist"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -179,7 +179,7 @@ msgstr "Skapad datum"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr ""
+msgstr "Senaste uppdatering"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Delay After Trigger Date"
-msgstr ""
+msgstr "Ledtid efter utlösningsdatum"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
@@ -309,7 +309,7 @@ msgstr "Aktiv"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index 7d488479ea2..c5590533bc9 100644
--- a/addons/base_action_rule/i18n/tr.po
+++ b/addons/base_action_rule/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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -333,8 +333,8 @@ msgstr "Etkin"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "Firma adresinizde bir Eposta Kimliği yok!"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -533,3 +533,7 @@ msgstr "Tetikleme Tarihi"
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr ""
 #~ "Bu modül herhangi bir nesne için eylem kurallaru uygulamanızı sağlar."
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Firma adresinizde bir Eposta Kimliği yok!"
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index fac6336fca7..75312afd054 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -314,8 +314,8 @@ msgstr "激活"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
-msgstr "您的公司地址找不到电子邮件标识"
+msgid "No Email ID Found for your Company address!"
+msgstr ""
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
@@ -505,5 +505,9 @@ msgstr "触发日期"
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "指定正文里的关键字"
 
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "您的公司地址找不到电子邮件标识"
+
 #~ msgid "This module allows to implement action rules for any object."
 #~ msgstr "这个模块允许任何对象实现的行动规则。"
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
index 160b5d9ee82..ebf49a55f21 100644
--- a/addons/base_action_rule/i18n/zh_TW.po
+++ b/addons/base_action_rule/i18n/zh_TW.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: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -309,7 +309,7 @@ msgstr "活躍"
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
-msgid "No E-Mail ID Found for your Company address!"
+msgid "No Email ID Found for your Company address!"
 msgstr ""
 
 #. module: base_action_rule
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 9b91f7d3108..8a9d1ac1dc7 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -42,8 +42,10 @@ from osv import fields,osv
 import pooler
 from tools.translate import _
 from service import security
+import logging
 
 magic_md5 = '$1$'
+_logger = logging.getLogger(__name__)
 
 def gen_salt( length=8, symbols=ascii_letters + digits ):
     seed()
@@ -179,8 +181,7 @@ class users(osv.osv):
             cr = pooler.get_db(db).cursor()
             return self._login(cr, db, login, password)
         except Exception:
-            import logging
-            logging.getLogger('netsvc').exception('Could not authenticate')
+            _logger.exception('Could not authenticate')
             return Exception('Access Denied')
         finally:
             if cr is not None:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
index 2aab8596862..42198337450 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
@@ -27,21 +27,20 @@ LOG_INFO='info'
 LOG_WARNING='warn'
 LOG_ERROR='error'
 LOG_CRITICAL='critical'
+_logger = logging.getLogger(__name__)
 
 def log_detail(self):
     import os
-    logger = logging.getLogger()
     logfile_name = os.path.join(tempfile.gettempdir(), "openerp_report_designer.log")
     hdlr = logging.FileHandler(logfile_name)
     formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
     hdlr.setFormatter(formatter)
-    logger.addHandler(hdlr)
-    logger.setLevel(logging.INFO)
+    _logger.addHandler(hdlr)
+    _logger.setLevel(logging.INFO)
 
 class Logger(object):
     def log_write(self,name,level,msg):
-        log = logging.getLogger(name)
-        getattr(log,level)(msg)
+        getattr(_logger,level)(msg)
 
     def shutdown(self):
         logging.shutdown()
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..9c1d7d9fa8e 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -97,27 +97,4 @@ class specify_partner_terminology(osv.osv_memory):
                 self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
 
-# Preferences wizard for Sales & CRM.
-# It is defined here because it is inherited independently in modules sale, crm,
-# plugin_outlook and plugin_thunderbird.
-class sale_config_settings(osv.osv_memory):
-    _name = 'sale.config.settings'
-    _inherit = 'res.config.settings'
-    _columns = {
-        'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
-            help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, a task, a project, an analytical
-                account, or any other object and attach the selected mail as a .eml file in
-                the attachment of a selected record. You can create documents for CRM Lead,
-                HR Applicant and Project Issue from the selected emails.
-                This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook Plugin',
-            help="""The Outlook plugin allows you to select an object that you would like to add
-                to your email and its attachments from MS Outlook. You can select a partner, a task,
-                a project, an analytical account, or any other object and archive a selected
-                email into an OpenERP mail message with attachments.
-                This installs the module plugin_outlook."""),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e4b9b9dadb2..eb59d918681 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -43,43 +43,5 @@
           <field name="target">new</field>
       </record>
 
-    <record id="base.view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale settings</field>
-        <field name="model">sale.config.settings</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Configure Sales" version="7.0">
-                <header>
-                    <button string="Apply" type="object" name="execute"/>
-                    <button string="Cancel" special="cancel"/>
-                </header>
-                <group>
-                    <group name="config_sale" colspan="4"/>
-
-                    <!-- this part is necessary to allow the plugins to extend the view -->
-                    <field name="module_crm" invisible="1"/>
-                    <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <separator string="Emails"/>
-                    </group>
-                    <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                    <newline/>
-                    <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                    <group name="config_crm" colspan="2"/>
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <!-- Sale config wizard -->
-    <record id="base.action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.config.settings</field>
-        <field name="view_id" ref="base.view_sale_config_settings"/>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 92290c2dd95..8bf029ddbdb 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
 "X-Generator: Launchpad (build 15482)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 92914f8f7a3..f6fdcefe8fe 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,13 +28,44 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('Multi Company',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Portal',
-            help="""Define a portal for your customers or suppliers.  The portal is a group of
-                external users that has specific access rights and rules.
-                This installs the module portal."""),
-        'module_share': fields.boolean('Share',
-            help="""Share OpenERP documents (records) with external users.
-                This installs the module share."""),
+        'module_portal': fields.boolean('Activate Customer Portal',
+            help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
+        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+            help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
+    }
+
+    def open_company(self, cr, uid, ids, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Your Company',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'res.company',
+            'res_id': user.company_id.id,
+         }
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+class sale_config_settings(osv.osv_memory):
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+            help="""The plugin allows you archive email and its attachments to the selected
+                OpenERP objects. You can select a partner, or a lead and
+                attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                Partner from the selected emails.
+                This installs the module plugin_thunderbird."""),
+        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+            help="""The Outlook plugin allows you to select an object that you would like to add
+                to your email and its attachments from MS Outlook. You can select a partner,
+                or a lead object and archive a selected
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0b85e13a08f..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,24 +8,32 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group>
+                    <sheet>
                         <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                        </group>
-
-                        <group string="Others">
-                            <label string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
+                            <group>
+                                <field name="module_multi_company"/>
+                            </group>
+                            <group>
+                                <div>
+                                    You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc.
+                                </div>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
+                            </group>
                         </group>
                         <group string="External Accesses">
                             <field name="module_share"/>
                             <field name="module_portal"/>
                         </group>
-                    </group>
+                        <group string="Others">
+                            <label for="id" string="Outgoing Mail Servers"/>
+                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -39,5 +47,38 @@
         <menuitem id="menu_general_configuration" parent="base.menu_config"
             sequence="100" action="action_general_configuration"/>
 
+        <!-- Sale config wizard -->
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Sales" version="7.0">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
+                    </header>
+                    <sheet>
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_sale"/>
+                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <field name="module_plugin_thunderbird"/>
+                            <field name="module_plugin_outlook"/>
+                        </group>
+                        <group name="config_crm"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_config" model="ir.actions.act_window">
+            <field name="name">Configure Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.settings</field>
+            <field name="view_id" ref="view_sale_config_settings"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 7b8363ffd6b..e76442b62fe 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -23,11 +23,12 @@ import logging
 import string
 import datetime
 import re
+_logger = logging.getLogger(__name__)
 
 try:
     import vatnumber
 except ImportError:
-    logging.getLogger('base_vat').warning("VAT validation partially unavailable because the `vatnumber` Python library cannot be found. "
+    _logger.warning("VAT validation partially unavailable because the `vatnumber` Python library cannot be found. "
                                           "Install it to support more countries, for example with `easy_install vatnumber`.")
     vatnumber = None
 
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 71e9bdc2468..da5c5f017a6 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -23,6 +23,7 @@ from document_webdav import nodes
 from document.nodes import _str2time, nodefd_static
 import logging
 from orm_utils import get_last_modified
+_logger = logging.getLogger(__name__)
 
 try:
     from tools.dict_tools import  dict_merge2
@@ -223,7 +224,6 @@ class node_calendar(nodes.node_class):
         res = []
         if not filters:
             return res
-        _log = logging.getLogger('caldav.query')
         if filters.localName == 'calendar-query':
             res = []
             for filter_child in filters.childNodes:
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 94d28e4ad37..fb98e00a86f 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -34,6 +34,7 @@ import logging
 from caldav_node import res_node_calendar
 from orm_utils import get_last_modified
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 try:
     import vobject
@@ -240,7 +241,6 @@ def map_data(cr, uid, obj, context=None):
 
 class CalDAV(object):
     __attribute__ = {}
-    _logger = logging.getLogger('document.caldav')
 
     def ical_set(self, name, value, type):
         """ set calendar Attribute
@@ -725,13 +725,13 @@ class Calendar(CalDAV, osv.osv):
                 objs.append(cal_children[child.name.lower()])
             elif child.name.upper() == 'CALSCALE':
                 if child.value.upper() != 'GREGORIAN':
-                    self._logger.warning('How do I handle %s calendars?',child.value)
+                    _logger.warning('How do I handle %s calendars?',child.value)
             elif child.name.upper() in ('PRODID', 'VERSION'):
                 pass
             elif child.name.upper().startswith('X-'):
-                self._logger.debug("skipping custom node %s", child.name)
+                _logger.debug("skipping custom node %s", child.name)
             else:
-                self._logger.debug("skipping node %s", child.name)
+                _logger.debug("skipping node %s", child.name)
         
         res = []
         for obj_name in list(set(objs)):
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 1abbf573ef0..3a5604b2f67 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -23,6 +23,7 @@ from osv import osv, fields
 from tools.translate import _
 import caldav_node
 import logging
+_logger = logging.getLogger(__name__)
 
 class calendar_collection(osv.osv):
     _inherit = 'document.directory' 
@@ -44,8 +45,7 @@ class calendar_collection(osv.osv):
             root_cal_dir = self.browse(cr,uid, root_id, context=context) 
             return root_cal_dir.name
         except Exception:
-            logger = logging.getLogger('document')
-            logger.warning('Cannot set root directory for Calendars:', exc_info=True)
+            _logger.warning('Cannot set root directory for Calendars:', exc_info=True)
             return False
         return False
 
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index ec489ff4d14..db77719a85b 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -59,7 +59,7 @@ class base_action_rule(osv.osv):
         else:
             reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("No E-Mail Found for your Company address!"))
+            raise osv.except_osv(_('Error!'), _("No Email Found for your Company address!"))
         return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
 
     def do_check(self, cr, uid, action, obj, context=None):
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index bab3e4bca5f..4ca40a691f5 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -11,7 +11,7 @@
             <field name="name">direct</field>
         </record>
         <record model="crm.case.channel">
-            <field name="name">e-mail</field>
+            <field name="name">email</field>
         </record>
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index addd26785a1..fa4643db156 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -193,7 +193,7 @@ class crm_lead(base_stage, osv.osv):
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'email_from': fields.char('Email', size=128, help="E-mail address of the contact", select=1),
+        'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='When sending mails, the default email address is taken from the sales team.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 8fc6beabe8b..7f8cbdf77aa 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -263,7 +263,7 @@
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Interest in your Kitchen Design Project'" name="name"/>
-            <field eval="'Send Catalogue by E-Mail'" name="title_action"/>
+            <field eval="'Send Catalogue by Email'" name="title_action"/>
             <field eval="time.strftime('%Y-01-10')" name="date_action"/>
             <field eval="time.strftime('%Y-02-23')" name="date_deadline"/>
             <field name="partner_name">Lucie Vonck</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4fa4d778082..d9c65daaada 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -245,7 +245,7 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index cadd813a959..1e21d535c55 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -26,6 +26,7 @@ import logging
 from osv import fields, osv
 import tools
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 class crm_lead(base_stage, osv.osv):
         """ CRM Leads """
@@ -180,7 +181,7 @@ class res_users(osv.osv):
                                             'user_id': user_id}, context=context)
             except:
                 # Tolerate a missing shortcut. See product/product.py for similar code.
-                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+                _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
         return user_id
 
 res_users()
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
index 7427afe1e58..a1179fab075 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -53,7 +53,7 @@
 			<field eval="6.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="&quot;open&quot;" name="state"/>
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet3"/>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 690948a8817..9cafe950410 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -61,7 +61,7 @@ added to partners that match the segmentation criterions after computation.'),
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel \
+                    cr.execute('delete from res_partner_res_partner_category_rel \
                             where category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
@@ -81,7 +81,7 @@ added to partners that match the segmentation criterions after computation.'),
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) \
+                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
                         values (%s,%s)', (categ['categ_id'][0], partner_id))
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 85e1f493643..f3d70b709af 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -540,7 +540,7 @@ msgstr ""
 
 #. module: crm
 #: field:crm.lead,email:0
-msgid "E-Mail"
+msgid "Email"
 msgstr ""
 
 #. module: crm
@@ -2675,7 +2675,7 @@ msgstr ""
 
 #. module: crm
 #: help:crm.lead,email_from:0
-msgid "E-mail address of the contact"
+msgid "Email address of the contact"
 msgstr ""
 
 #. module: crm
@@ -3401,7 +3401,7 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
-msgid "No E-Mail Found for your Company address!"
+msgid "No Email Found for your Company address!"
 msgstr ""
 
 #. module: crm
@@ -3563,7 +3563,7 @@ msgstr ""
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b40ed78bb16..563da4bd137 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,7 +26,7 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
+        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'module_crm_caldav': fields.boolean("Caldav Synchronization",
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index a09f333076f..38c8c2db2e4 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -6,30 +6,37 @@
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_fetchmail" position="after">
-                    <field name="fetchmail_lead"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <label for="fetchmail_lead"/>
+                    <div>
+                        <field name="fetchmail_lead"/>
+                    	<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
+                    </div>
                 </group>
 
                 <group name="config_crm" position="after">
-                    <separator string="Import and Synchronize Data from an Other Application" colspan="4"/>
-                    <field name="module_import_sugarcrm"/>
-                    <field name="module_crm_caldav"/>
-                    <field name="module_import_google"/>
+                    <group string="Import and Synchronize Data from an Other Application">
+                        <field name="module_import_sugarcrm"/>
+                        <field name="module_crm_caldav"/>
+                        <field name="module_import_google"/>
+                    </group>
 
-                    <separator string="Documents and Wiki" colspan="4"/>
-                    <field name="module_wiki_sale_faq" />
+                    <group string="Documents and Wiki">
+                        <field name="module_wiki_sale_faq"/>
+                    </group>
 
-                    <separator string="Customer Form" colspan="4"/>
-                    <field name="module_google_map"/>
+                    <group string="Customer Form">
+                        <field name="module_google_map"/>
+                    </group>
                 </group>
             </field>
         </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base.action_sale_config"/>
+            sequence="1" action="base_setup.action_sale_config"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index ad1a763fa46..de4219fb42d 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -13,7 +13,8 @@
                     <header>
                         <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
                         <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        or
+                        <button name="action_cancel" string="_Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <group>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 75bfd9ce211..d4bfd8f21bb 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -51,9 +51,13 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        <menuitem id="menu_project_config_project" name="Stages" parent="menu_definitions" sequence="1"/>
-        <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="menu_project_config_project" sequence="20"/>
+        <menuitem
+            icon="terp-project" id="base.menu_main_pm"
+            name="Project" sequence="10"/>
+        
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
+        <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 0dca243890b..05f7962e18b 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails", readonly=True,
+        'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails",
             fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
             help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
     }
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 72632c1afef..ba9e75ba7c0 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -6,12 +6,16 @@
             <field name="name">crm_claim settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
-            <field name="priority" eval="12"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="config_fetchmail" position="after">
-                    <field name="fetchmail_claim"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
+                <group name="config_fetchmail" version="7.0" position="inside">
+                    <label for="fetchmail_claim"/>
+                    <div>
+                        <field name="fetchmail_claim"/>
+                        <button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
index 76b8a4f5bd0..6e98f9387a7 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_partner_assign/i18n/ar.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-12 18:49+0000\n"
-"Last-Translator: amani ali <applepie9911@yahoo.com>\n"
+"Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.com>\n"
 "Language-Team: Arabic <ar@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: 2012-02-13 04:50+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "إحذف دائمًا الإيميل بعد ارساله"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -61,7 +61,7 @@ msgstr "تجميع حسب..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "قالب"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -81,7 +81,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "النص"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "تأخير الإغلاق"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#شريك"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -166,6 +166,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"اضف هنا جميع المرفقات للوثيقة الحالية التي تريد ان تضعها في البريد "
+"الإلكتروني."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -193,12 +195,12 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "عرض HTML للرسالة"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "حذف تلقائي"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
@@ -252,7 +254,7 @@ msgstr "قسم"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "أرسل"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -284,7 +286,7 @@ msgstr "نوع"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "الاسم"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -462,7 +464,7 @@ msgstr "عدد الفرص"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "فريق"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -568,7 +570,7 @@ msgstr "الحدود الجغرافية"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "عدد الفرص"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -598,7 +600,7 @@ msgstr "تقديم شريك هذه الحالة/خصص لـ."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "التاريخ"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
@@ -624,12 +626,12 @@ msgstr ""
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "مرفقات"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "نسخة"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -639,7 +641,7 @@ msgstr "سبتمبر"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "مراجع"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -699,7 +701,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "عدد الشركاء"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -710,7 +712,7 @@ msgstr "تقديم الى الشريك"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "اسم الشريك"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -725,7 +727,7 @@ msgstr "الربح المحتمل"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "رد على"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -745,7 +747,7 @@ msgstr "فرصة"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "إرسال بريد"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -783,7 +785,7 @@ msgstr "تحويل إلي فرصة"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "نسخة مخفية"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -799,7 +801,7 @@ msgstr "أبريل"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "تحليل الشراكة"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -829,7 +831,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -848,7 +850,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
@@ -870,7 +872,7 @@ msgstr "إنشاء تاريخ"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "مرشحات الفرز"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -927,3 +929,15 @@ msgstr ""
 
 #~ msgid "Set New State To"
 #~ msgstr "اضف حالة جديدة إلى"
+
+#~ msgid ""
+#~ "\n"
+#~ "This is the module used by OpenERP SA to redirect customers to his "
+#~ "partners,\n"
+#~ "based on geolocalization.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "تم استخدام هذه الوحدة بواسطة OpenERP SA لاعادة توجيه العملاء لشركائهم,\n"
+#~ "بناءًا على الموقع الجغرافي.\n"
+#~ "    "
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index 770246d3c28..5256cfeaff8 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index 73ff3315231..fe30bd763c7 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -851,7 +851,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 8e36d36aebd..3fb9fc0e915 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -832,7 +832,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
index 5612ec184b7..e31c71898f0 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_partner_assign/i18n/da.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 4af10e5ba7f..fef4c496a5e 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -854,8 +854,8 @@ msgstr "CRM Partner Report"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -945,3 +945,6 @@ msgstr "Bevorzugte Antwortadresse für diese Nachricht"
 #~ "Interessenten \n"
 #~ "zu Partnern eingesetzt.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index 251ad9d26ad..e8a94911693 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index 2be5968d801..d2220b0966b 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -851,7 +851,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
index 6550b62f23f..cadd504cd29 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_partner_assign/i18n/es_CR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-15 20:17+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: crm_partner_assign
@@ -862,8 +862,8 @@ msgstr "CRM Informe de Socio"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -952,3 +952,6 @@ msgstr "Dirección de respuesta preferida para el mensaje"
 #~ "partners o asesores,\n"
 #~ "basándose en geo-localización.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index 33b1ad87edc..9e8cc200ddc 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -851,7 +851,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index f8c5ce9f811..167c3cf9576 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index cbe4512adb2..0533e831900 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -26,12 +26,12 @@ msgstr "Envoyer à"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Type de message"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Supprimer définitivement les courriels après envoi"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -41,7 +41,7 @@ msgstr "Délai pour fermer"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinataires du message"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -62,7 +62,7 @@ msgstr "Regrouper par..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Modèle"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -77,12 +77,12 @@ msgstr "Géolocalisation"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Version plein texte du message"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Corps"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -102,7 +102,7 @@ msgstr "Délai pour fermer"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "Nb de partenaires"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -138,7 +138,7 @@ msgstr "La Plus haute"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_text:0
 msgid "Text contents"
-msgstr ""
+msgstr "Contenu du texte"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -149,7 +149,7 @@ msgstr "Jour"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identifiant unique de message"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -168,6 +168,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Ajouter ici toutes les pièces jointes du document actuel que vous souhaitez "
+"joindre au courriel."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -196,17 +198,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Version texte enrichi/HTML du message"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Suppression Automatique"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Destinataires en Copie Conforme Invisible (CCI)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -255,7 +257,7 @@ msgstr "Équipe de vente"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Envoyer"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -287,7 +289,7 @@ msgstr "Type"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -300,11 +302,14 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Le type de message, généralement «Texte enrichi - html» ou «texte», utilisé "
+"pour respectivement sélectionner un contenu qui puisse être mis en forme ou "
+"un texte brut"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Attribuer une date"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -319,7 +324,7 @@ msgstr "Date de création"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID du document associé"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -350,7 +355,7 @@ msgstr "Étape"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modèle du document associé"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -393,7 +398,7 @@ msgstr "Fermer"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Utiliser un modèle"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -465,12 +470,12 @@ msgstr "Nb. d'opportunités"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Équipe"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Partenaire visé"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -491,7 +496,7 @@ msgstr "Fermé"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Réexpédition en masse au partenaire"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -571,7 +576,7 @@ msgstr "Longitude"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "Nb d'opportunités"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -601,12 +606,12 @@ msgstr "Le partenaire auquel ce cas a été transmis / affecté."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Contenu en texte enrichi"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -621,18 +626,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "ID du message"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -642,7 +647,7 @@ msgstr "Septembre"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Références"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -669,7 +674,7 @@ msgstr "Ouvert"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinataires en copie carbone (Cc)"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -677,6 +682,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"En-têtes complet de message, par exemple en-têtes de session SMTP "
+"(généralement disponible sur les messages entrants uniquement)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -699,11 +706,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Expéditeur du message, pris à partir des préférences utilisateur. Si le "
+"champ est vide, ce n'est pas un courriel mais un message."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Nb de partenaires"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -714,7 +723,7 @@ msgstr "Transférer au partenaire"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nom du partenaire"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -729,7 +738,7 @@ msgstr "Revenu probable"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Répondre à"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -749,7 +758,7 @@ msgstr "Opportunité"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Envoyer le courriel"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -777,7 +786,7 @@ msgstr "Pays"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "En-têtes de message"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -787,7 +796,7 @@ msgstr "Convertir en opportunité"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Copie cachée à (BCC)"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -803,7 +812,7 @@ msgstr "Avril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Analyse du partenariat"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -818,7 +827,7 @@ msgstr "En attente"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Analyse du partenaire attribué"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -829,11 +838,13 @@ msgstr "Rapport sur les pistes du CRM"
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Références du message, tel que les identifiants des messages précédents"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -848,11 +859,11 @@ msgstr "Séquence"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "Rapport CRM du partenaire"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
@@ -874,7 +885,7 @@ msgstr "Date de création"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtres"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -885,7 +896,7 @@ msgstr "Année"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Adresse de réponse préférée pour le message"
 
 #~ msgid "HTML formatting?"
 #~ msgstr "Mettre au format HTML ?"
@@ -943,3 +954,6 @@ msgstr ""
 
 #~ msgid "Message Body"
 #~ msgstr "Corps du message"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant de composition de courriels"
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 5e6aea1bdeb..c3396b253b9 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -850,7 +850,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
index 6139f8005d5..58189b136c6 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index d322cfd489c..7d677566d49 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index cd07f7f10c9..a9c402418f3 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -850,7 +850,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index e400396e074..043ade7d9cc 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.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: 2012-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,8 +846,8 @@ msgstr "CRMパートナ報告書"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ウィザード"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -880,3 +880,6 @@ msgstr "年"
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
 msgstr "メッセージの優先返信アドレス"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ウィザード"
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
index 4952ad04ce5..f00ccb08b69 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_partner_assign/i18n/lt.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: 2012-05-10 05:20+0000\n"
-"X-Generator: Launchpad (build 15213)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index 207b2e9e737..6cc10c30aa7 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_partner_assign/i18n/lv.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index 43742689ca4..57168192655 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/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: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -121,7 +121,7 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
-"Kreeg geen contact met geolokatie servers, zorg aub voor een werkende "
+"Kreeg geen contact met geolocatie servers, zorg aub voor een werkende "
 "internet verbinding (%s)"
 
 #. module: crm_partner_assign
@@ -370,7 +370,7 @@ msgstr "Geo lokalisatie"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "Verkoopkansen toekenning analyse"
+msgstr "Prospect toekenning analyse"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -463,7 +463,7 @@ msgstr "Categorie"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr "#Verkoopkansen"
+msgstr "#Prospects"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -500,7 +500,7 @@ msgstr "Als bulk doorsturen naar relatie"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr "Toegewezen verkoopkansen"
+msgstr "Toegewezen prospects"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
@@ -704,6 +704,8 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Bericht verzender, zoals ingevuld bij de voorkeuren van de gebruiker. Indien "
+"leeg is dit geen mail maar een bericht."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
@@ -808,7 +810,7 @@ msgstr "April"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Relatieanalyses"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -823,7 +825,7 @@ msgstr "Wachtend"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Relatie toewijzinganalyses"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -858,8 +860,8 @@ msgstr "CRM relatierapport"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
-msgstr "E-mail opmaak wizard"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -948,3 +950,6 @@ msgstr "Voorkeur antwoordadres voor het bericht"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Fout ! U kunt geen recursieve aangesloten leden maken."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index 98e687fbb88..6e97e8fecae 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_partner_assign/i18n/pl.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -848,7 +848,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index 81967f95f6a..a1e83bb9267 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,27 +25,27 @@ msgstr "Enviar para"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tipo de mensagem"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Apagar emails após o seu envio"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Demora para fechar"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Receita planeada"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@@ -61,27 +61,27 @@ msgstr "Agrupar por..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Template"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
-msgstr ""
+msgstr "Avançar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Localizar Geograficamente"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Formatação do texto da versão da mensagem"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Corpo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -91,22 +91,22 @@ msgstr "Março"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Lead"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Atraso para encerrar"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
-msgstr ""
+msgstr "Toda a história"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -121,6 +121,8 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
+"Não se conseguiu contactar servidores de geolocalização, assegure que tem "
+"uma ligação funcional à internet (%s)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -130,12 +132,12 @@ msgstr "Data do parceiro"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Maior"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_text:0
 msgid "Text contents"
-msgstr ""
+msgstr "Conteúdos do texto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -146,18 +148,18 @@ msgstr "Dia"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador de mensagem exclusivo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
-msgstr ""
+msgstr "Último email"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Latitude Geográfica"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -165,16 +167,18 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Acrescentar aqui todos os anexos do documento atual que deseja incluir no e-"
+"mail."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
-msgstr ""
+msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -187,21 +191,23 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
+"Dá a possibilidade de associar a oportunidade a este parceiro. (0 significa "
+"que não se associou.)"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Rich-text / HTML versão da mensagem"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Eliminar Automático"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem BCc"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -250,12 +256,12 @@ msgstr "Secção"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Próximo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -272,7 +278,7 @@ msgstr "Estado"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -282,12 +288,12 @@ msgstr "Tipo"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Menor"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,subtype:0
@@ -295,16 +301,18 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensagem, geralmente 'html' ou 'simples', usado para selecionar "
+"texto ou conteúdo de texto rico e em conformidade"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Atribuir Data"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Análise de lead"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
@@ -314,7 +322,7 @@ msgstr "Data de criação"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID Documentos Relacionados"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -324,12 +332,12 @@ msgstr "7 dias"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
-msgstr ""
+msgstr "Atribuição parceiro"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Tipo é usado para separar leads e oportunidades"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -340,29 +348,29 @@ msgstr "Julho"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modelo de documento relacionado"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
 #, python-format
 msgid "Fwd"
-msgstr ""
+msgstr "Redirecionar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr ""
+msgstr "Oportunidades de Análise de Atribuição"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -372,12 +380,12 @@ msgstr "Cancelar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
-msgstr ""
+msgstr "Enviar histórico"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
-msgstr "Contacto"
+msgstr "Contato"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -388,18 +396,18 @@ msgstr "Fechar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Utilize um Template"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
-msgstr ""
+msgstr "Análise do Encaminhamento de Oportunidades"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de dias para fechar o caso"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -409,7 +417,7 @@ msgstr "Peso"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Tempo para abrir"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -455,17 +463,17 @@ msgstr "Categori­a"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#Oportunidades"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Equipa"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Parceiro referido"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -475,29 +483,29 @@ msgstr "Rascunho"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baixo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Encerrado"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Envio em massa para um parceiro"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr ""
+msgstr "Oportunidades atribuídas"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Data de atribuição"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
@@ -512,12 +520,12 @@ msgstr "Agosto"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escalate"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -527,12 +535,12 @@ msgstr "Junho"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Número de dias para abrir o caso"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Demora para abrir"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
@@ -545,7 +553,7 @@ msgstr "Utilizador"
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -561,17 +569,17 @@ msgstr "Filtros avançados"
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Longitude Geográfica"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# da Oportunidade"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr ""
+msgstr "Lead atríbuir"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -581,7 +589,7 @@ msgstr "Outubro"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Atribuição"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -591,22 +599,22 @@ msgstr "Janeiro"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Parceiro deste caso foi encaminhado / atribuído."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Conteúdo Rich-text"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Rendimentos planeados"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -616,18 +624,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id mensagem"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -637,7 +645,7 @@ msgstr "Setembro"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referências"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -647,12 +655,12 @@ msgstr "Últimos 30 dias"
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Nome grau"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr ""
+msgstr "Última data neste caso foi encaminhada / atribuída a um parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -663,7 +671,7 @@ msgstr "Abrir"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem Cc"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -671,11 +679,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeçalhos de mensagens completos, por exemplo, Cabeçalhos de sessão SMTP "
+"(normalmente disponível nas mensagens de entrada apenas)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Data da Localização Geográfica"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -685,7 +695,7 @@ msgstr "Atual"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
@@ -693,11 +703,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remetente da mensagem, tirada de preferências do utilizador. Se estiver "
+"vazia, este não é um mail, mas uma mensagem."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "# de Parceiro"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -708,7 +720,7 @@ msgstr "Reencaminhar para o parceiro"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nome Parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -718,17 +730,17 @@ msgstr "Maio"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Retorno provável"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder- Para"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr ""
+msgstr "Parceiro Atribuído"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
@@ -743,7 +755,7 @@ msgstr "Oportunidade"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar e-mail"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -771,7 +783,7 @@ msgstr "País"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Cabeçalho mensagem"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -781,12 +793,12 @@ msgstr "Converter em oportunidade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -797,7 +809,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Análise de Parceria"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -812,27 +824,28 @@ msgstr "Pendente"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Parceiro atribuído Análise"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "Relatório de Dicas de CRM"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referências de mensagens, tais como identificadores de mensagens anteriores"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Não pode criar membros recursivos."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "Informações sobre o caso"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
@@ -842,17 +855,17 @@ msgstr "Sequência"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "Relatório Parceiro CRM"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alto"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
@@ -868,7 +881,7 @@ msgstr "Data de criação"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -879,7 +892,7 @@ msgstr "Ano"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Endereço de resposta preferido para a mensagem"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Erro! Não pode criar membros associados recursivamente."
@@ -901,3 +914,25 @@ msgstr ""
 
 #~ msgid "Send new email"
 #~ msgstr "Enviar nova mensagem"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de e-mail"
+
+#~ msgid ""
+#~ "These addresses will receive a copy of this email. To modify the permanent "
+#~ "CC list, edit the global CC field of this case"
+#~ msgstr ""
+#~ "Estes endereços receberam uma cópia deste e-mail. Para modificar a lista de "
+#~ "CC permanente, edite o campo CC global deste caso"
+
+#~ msgid "Reply-to of the Sales team defined on this case"
+#~ msgstr "Responder há equipa de vendas definida sobre este caso"
+
+#~ msgid "Select this if you want to send email with HTML formatting."
+#~ msgstr "Seleccione se quer enviar e-mails com formatação HTML."
+
+#~ msgid "unknown"
+#~ msgstr "Desconhecido"
+
+#~ msgid "Set New State To"
+#~ msgstr "Defina estado novo para"
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 9892f5c95d4..8a82e213888 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -850,7 +850,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index ec84ff61e79..a3d144eaefb 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Trimite catre"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tip de mesaj"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Sterge definitiv email-urile dupa ce sunt trimise"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Intarziere la inchidere"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatari mesaj"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -56,17 +56,17 @@ msgstr "# din Cazuri"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupeaza dupa..."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Sablon"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
-msgstr "Redirecţionaţi"
+msgstr "Redirectionare"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -76,12 +76,12 @@ msgstr "Localizare Geo"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versiune text-simplu a mesajului"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Corp"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -91,17 +91,17 @@ msgstr "Martie"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr "Pistă"
+msgstr "Pista"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr "Întârziere la inchidere"
+msgstr "Intarziere la inchidere"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Partener"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -122,7 +122,7 @@ msgid ""
 "internet connection (%s)"
 msgstr ""
 "Nu au putut fi contactate serverele geolocalizare, va rugam sa va asigurati "
-"ca aveti o conectare la internet functionabila (%s)"
+"ca aveti o conexiune la internet functionabila (%s)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -137,7 +137,7 @@ msgstr "Cel mai ridicat (cea mai ridicata)"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_text:0
 msgid "Text contents"
-msgstr ""
+msgstr "Cuprins text"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Zi"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificator unic mesaj"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,11 +167,13 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Adaugati aici toate atasamentele pentru documentul curent daca doriti sa le "
+"includeti in Email."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
-msgstr "Anulat"
+msgstr "Anulat(a)"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -181,7 +183,7 @@ msgstr "Alocare Geo"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
-msgstr "Data închiderii"
+msgstr "Data inchiderii"
 
 #. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
@@ -195,17 +197,18 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Rich-text/versiune HTML a mesajului"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Sterge Automat"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
 msgstr ""
+"Destinatari bcc (blind carbon copy) (copie carbon invizibila) ai mesajului"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -219,18 +222,18 @@ msgstr "Partener"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
-msgstr "Probabilitate medie"
+msgstr "Probabilitatea medie"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
-msgstr "Precedent"
+msgstr "Precedent(a)"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
-msgstr "Eroare de reţea"
+msgstr "Eroare de retea"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
@@ -249,17 +252,17 @@ msgstr "Grad partener"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
-msgstr "Secţiune"
+msgstr "Sectiune"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Trimite"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
-msgstr "Următor"
+msgstr "Urmatorul (urmatoarea)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -286,7 +289,7 @@ msgstr "Tip"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -299,11 +302,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipul de mesaj, de obicei 'html' sau 'simplu', folosit pentru a selecta ca "
+"atare cuprinsul textului simplu sau textului imbogatit"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Data atribuirii"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -313,12 +318,12 @@ msgstr "Analiza pistelor"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
-msgstr "Data creării"
+msgstr "Data crearii"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID Document Asociat"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -344,23 +349,23 @@ msgstr "Iulie"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Model Document asociat"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
 #, python-format
 msgid "Fwd"
-msgstr "Fwd"
+msgstr "Fwd (redirectionare)"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr "Geo localizare"
+msgstr "Localizare geo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -371,7 +376,7 @@ msgstr "Analiza Atribuirii Oportunitatilor"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Cancel"
-msgstr "Renunță"
+msgstr "Anuleaza"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
@@ -387,12 +392,12 @@ msgstr "Contact"
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Close"
-msgstr "Închide"
+msgstr "Inchideti"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Folositi Sablonul"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -403,7 +408,7 @@ msgstr "Analiza Alocarii Oportunitatilor"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr "Numarul de zile pana la inchiderea (rezolvarea) cazului"
+msgstr "Numarul de zile pana la inchiderea cazului"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -432,7 +437,7 @@ msgstr "Decembrie"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
-msgstr "Lună"
+msgstr "Luna"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
@@ -448,7 +453,7 @@ msgstr "Subiect"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Salesman"
-msgstr "Agent de vânzări"
+msgstr "Agent de vanzari"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -459,38 +464,38 @@ msgstr "Categorie"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr "#Oportunităţi"
+msgstr "#Oportunitati"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Echipa"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Partener mentionat"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
-msgstr "Redus"
+msgstr "Scazut(a)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
-msgstr "Închis"
+msgstr "Inchis"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Redirectionare in masa catre partener"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -521,7 +526,7 @@ msgstr "Normal"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
-msgstr "Escaladează"
+msgstr "Promoveaza"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -549,7 +554,7 @@ msgstr "Utilizator"
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -559,7 +564,7 @@ msgstr "Noiembrie"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
@@ -570,7 +575,7 @@ msgstr "Geo Longitudine"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# Oportunitate"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -595,17 +600,17 @@ msgstr "Ianuarie"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr "Partenerul caruia i-a fost transmis/atribuit cazul."
+msgstr "Partenerul caruia i-a fost redirectionat/atribuit cazul."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Continuturi rich-text (text imbogatit)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -615,23 +620,23 @@ msgstr "Veniturile planificate"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr "res.partner.grade (res.partener.grad)"
+msgstr "res.grad.partener"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id-Mesaj"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Atasamente"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc (copie carbon)"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -641,7 +646,7 @@ msgstr "Septembrie"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referinte"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -656,18 +661,19 @@ msgstr "Nume grad"
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr "Ultima data cand acest caz a fost transmis/alocat unui partener"
+msgstr ""
+"Ultima data cand acest caz a fost redirectionat/atribuit unui partener"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
-msgstr "Deschis"
+msgstr "Deschideti"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinatari mesaj copie carbon (Cc)"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -675,21 +681,23 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Antete mesaje complete, de exemplu antetele sesiunii SMTP (de obicei "
+"disponibile doar pentru mesajele primite)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr "Data Geo Localizare"
+msgstr "Data Localizare Geo"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
-msgstr "Curent"
+msgstr "Actual(a)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr "Către"
+msgstr "Catre"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
@@ -697,22 +705,24 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Expeditorul mesajului, luat din preferintele utilizatorului. Daca este lasat "
+"necompletat, acesta nu este un e-mail, ci un mesaj."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "# Partener"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
-msgstr "Trimite mai departe catre partener"
+msgstr "Redirectioneaza catre partener"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nume partener"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -727,7 +737,7 @@ msgstr "Venituri probabile"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Raspunde"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -737,7 +747,7 @@ msgstr "Partener alocat"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
-msgstr "Adresă"
+msgstr "Adresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@@ -747,7 +757,7 @@ msgstr "Oportunitate"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Trimite email"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -762,7 +772,7 @@ msgstr "Februarie"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
 msgid "Email Address"
-msgstr "Adresă de e-mail"
+msgstr "Adresa de email"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -770,22 +780,22 @@ msgstr "Adresă de e-mail"
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,country_id:0
 msgid "Country"
-msgstr "Ţara"
+msgstr "Tara"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Antete mesaj"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Converteşte în oportunitate"
+msgstr "Transforma in Oportunitate"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc (blind carbon copy) (copie carbon invizibila)"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -801,7 +811,7 @@ msgstr "Aprilie"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Analiza Parteneriatului"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -811,12 +821,12 @@ msgstr "crm.pista"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr "În aşteptare"
+msgstr "In asteptare"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Analiza Partener alocat"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -826,12 +836,12 @@ msgstr "Raport pista MRC"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Referinte mesaj, cum ar fi identificatorii mesajelor precedente"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -841,38 +851,38 @@ msgstr "Informatii caz"
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr "Secvenţă"
+msgstr "Secventa"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "Raport Partener MRC"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr "Ridicat(ă)"
+msgstr "Ridicat(a)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
-msgstr "Echipa de vânzări"
+msgstr "Echipa de vanzari"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
-msgstr "Data creării"
+msgstr "Data Crearii"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtre"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -883,7 +893,7 @@ msgstr "An"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Adresa de raspuns preferata pentru mesaj"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Eroare ! Nu puteţi crea membri asociaţi recursiv."
@@ -940,3 +950,6 @@ msgstr ""
 
 #~ msgid "Send new email"
 #~ msgstr "Trimite un email nou"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index 1096f157f22..6acdfcb6fce 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -850,7 +850,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index 38cbbccd9cc..c1cd229505d 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index a72fb81fc48..9f7be0a17ea 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,7 +846,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index 05cacc6fb78..1cd19307b1e 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,22 +25,22 @@ msgstr "Skicka till"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Meddelandetyp"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Permanent radera e-post efter att de skickats"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Ledtid till avslut"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Mottagare"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -50,7 +50,7 @@ msgstr "Plannerade intäkter"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# Ärenden"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -61,27 +61,27 @@ msgstr "Gruppera på..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
-msgstr ""
+msgstr "Framåt"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Geoplacering"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Textversion av meddelandet"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -96,17 +96,17 @@ msgstr "Lead"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Stängledtid"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Företag"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
-msgstr ""
+msgstr "Hela historien"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -121,11 +121,13 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
+"Kunde inte kontakta geolokaliseringservrar, se till att du har en fungerande "
+"Internet-anslutning (%s)"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
-msgstr ""
+msgstr "Företagsdatum"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -135,7 +137,7 @@ msgstr "Högsta"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_text:0
 msgid "Text contents"
-msgstr ""
+msgstr "Textinnehåll"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -146,7 +148,7 @@ msgstr "Dag"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Meddelandets unika identifierare"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -157,7 +159,7 @@ msgstr "Senaste email"
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Geo-latitud"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -165,6 +167,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Lägg här alla bilagor i det aktuella dokumentet som du vill inkludera i e-"
+"postmeddelandet."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -174,12 +178,12 @@ msgstr "Avbruten"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
-msgstr ""
+msgstr "Geografisk tilldelning"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Avslutsdatum"
 
 #. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
@@ -187,21 +191,23 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
+"Ger sannolikheten för att tilldela ett kundämne till detta företag. (0 "
+"betyder ingen tilldelning)"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Utsmyckad text/HTML-version av meddelandet"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Autoradera"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Blindkopiemottagare"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -215,12 +221,12 @@ msgstr "Partner"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
-msgstr ""
+msgstr "Genomsnittlig sannorlikhet"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Föregående"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:36
@@ -239,7 +245,7 @@ msgstr "Från"
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Företagsgrad"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -250,7 +256,7 @@ msgstr "Sektion"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Skicka"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -267,12 +273,12 @@ msgstr "Prioritet"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr ""
+msgstr "Tillstånd"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Passerad tidsfrist"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -282,7 +288,7 @@ msgstr "Typ"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -295,16 +301,18 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Typ av meddelande, vanligtvis \"html\" eller \"vanligt\", används för att "
+"välja klartext eller utsmyckad text i överensstämmelse härmed"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Tilldelningsdatum"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Kundämnesanalys"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
@@ -314,7 +322,7 @@ msgstr "Skapad datum"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID relaterat dokument"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -324,12 +332,12 @@ msgstr "7 dagar"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
-msgstr ""
+msgstr "Företagstilldelning"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Typ är använd för att skilja kundämnen från affärsmöjligheter"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -340,12 +348,12 @@ msgstr "Juli"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Läge"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -356,13 +364,13 @@ msgstr "Vb"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Geografisk placering"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr ""
+msgstr "Affärsmöjlighetstilldelningsanalys"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -372,7 +380,7 @@ msgstr "Avbryt"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
-msgstr ""
+msgstr "Skicka historik"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -388,18 +396,18 @@ msgstr "Stäng"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Använd mall"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
-msgstr ""
+msgstr "Aff.möjlighetstilldelningsanalys"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Antal dagar att behandla ärendet"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -409,7 +417,7 @@ msgstr "Vikt"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Öppningsledtid"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -417,7 +425,7 @@ msgstr ""
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,grade_id:0
 msgid "Grade"
-msgstr ""
+msgstr "Betyg"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -433,7 +441,7 @@ msgstr "Månad"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Öppningsdatum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
@@ -455,17 +463,17 @@ msgstr "Kategori"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "# Affärsmöjligheter"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Lag"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Anvisat företag"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -486,23 +494,23 @@ msgstr "Stängd"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Massöverföring till företag"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr ""
+msgstr "Tilldela affärdmöjligheter"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Tilldelningsdatum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
-msgstr ""
+msgstr "Största sannorlikhet"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -522,17 +530,17 @@ msgstr "Eskalera"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
-msgstr ""
+msgstr "juni"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Antal dagar för att öppna ärendet"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Öppningsledtid"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
@@ -540,130 +548,130 @@ msgstr ""
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Geo-longitud"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# affärsmöjligheter"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr ""
+msgstr "Tilldela kundämne"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Tilldelning"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
-msgstr ""
+msgstr "januari"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Företag detta ärende har flyttats till."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Utsmyckat innehåll"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Planerade intäkter"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr ""
+msgstr "res.partner.grade"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Meddelande-id"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Kopia"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
-msgstr ""
+msgstr "september"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referenser"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Senaste 30 dagarna"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Gradnamn"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr ""
+msgstr "Sista dag det här ärendet överlämnades / tilldelats ett företag"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
-msgstr ""
+msgstr "Öppen"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Blindkopiemottagare"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -671,21 +679,23 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Fullständigt e-posthuvud, närmare bestämt SMTP-sessionens huvud (vanligtvis "
+"tillgängligt endast i inkommande meddelanden)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Geo platsdatum"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuellt"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Till"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
@@ -693,72 +703,74 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Avsändaren, tagen från användarens preferenser. Om den är tom är detta inte "
+"en e-post men ett meddelande."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "# företag"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
-msgstr ""
+msgstr "Vidarebefordra till företag"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Företagsnamn"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Förväntad intäkt"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Svara till"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr ""
+msgstr "Tilldelat företag"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adress"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr ""
+msgstr "Affärsmöjlighet"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Skicka e-post"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
 msgid "Email Address"
-msgstr ""
+msgstr "E-postadress"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -766,120 +778,120 @@ msgstr ""
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Meddelandehuvud"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konvertera till affärsmöjlighet"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Blindkopia"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Geo tilldelning"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Partnerskapsanalys"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Vilande"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Företagstilldeningsanalys"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "CRM kundämnesrapport"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Meddelandereferens, som identifierar tidigare meddelanden"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
-msgstr ""
+msgstr "Ärendeinformation"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "CRM företagsrapport"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hög"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Säljlag"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Registreringsdatum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Föredragen svarsadress för meddelandet"
 
 #~ msgid "HTML formatting?"
 #~ msgstr "HTML formatering"
@@ -889,3 +901,6 @@ msgstr ""
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Fel! Du kan inte skapa rekursivt kopplade medlemmar."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-post sammanställningsguide"
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index 799af955a52..a420a887587 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_partner_assign/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: 2012-02-09 07:06+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -849,7 +849,7 @@ msgstr ""
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index 83574e65193..a616725a704 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.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: 2012-02-18 04:59+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -846,8 +846,8 @@ msgstr "CRM业务伙伴报表"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -932,3 +932,6 @@ msgstr "本邮件推荐的回复地址"
 
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "错误！您不能创建递归的商会会员。"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index e1ad536f85f..c23636230f2 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -116,7 +116,7 @@ def _recompute_categ(self, cr, uid, pid, answers_ids):
     ok =  []
     cr.execute('''
         select r.category_id
-        from res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id)
+        from res_partner_res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id)
         where r.partner_id = %s and (s.exclusif = false or s.exclusif is null)
         ''', (pid,))
     for x in cr.fetchall():
@@ -249,7 +249,7 @@ class crm_segmentation(osv.osv):
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel where \
+                    cr.execute('delete from res_partner_res_partner_category_rel where \
                             category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
@@ -281,7 +281,7 @@ class crm_segmentation(osv.osv):
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
+                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
         return True
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index 0541782cd93..48a958674a6 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-19 05:58+0000\n"
+"PO-Revision-Date: 2012-06-28 04:08+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-06-21 05:16+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr "受注"
+msgstr "オーダー参照"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -41,18 +41,18 @@ msgstr "正味重量"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr "配送発注"
+msgstr "配達オーダー"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr "配送グリッド線"
+msgstr "配達グリッドライン"
 
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr "配送グリッド"
+msgstr "配達グリッド"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -64,37 +64,37 @@ msgstr "容積"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "グリッド線"
+msgstr "グリッドライン"
 
 #. module: delivery
 #: help:delivery.carrier,partner_id:0
 msgid "The partner that is doing the delivery service."
-msgstr "配送サービス・パートナ"
+msgstr "配達サービスを行うパートナです。"
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr "配送の注文"
+msgstr "配達オーダー"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "配送の特性"
+msgstr "配達の属性"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr "請求のための出庫"
+msgstr "請求のための集荷"
 
 #. module: delivery
 #: field:delivery.carrier,pricelist_ids:0
 msgid "Advanced Pricing"
-msgstr "事前確認価格"
+msgstr "前払価格"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "配送グリッド一覧の順序番号を指定します。"
+msgstr "配達グリッド一覧の順序番号を指定します。"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -106,7 +106,7 @@ msgstr "国"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr "配送発注"
+msgstr "配達オーダー："
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -121,8 +121,8 @@ msgid ""
 "can define several price lists for one delivery method, per country or a "
 "zone in a specific country defined by a postal code range."
 msgstr ""
-"製品の重量などの基準に基づいて配送の原価と請求額を計算するために配送料一覧を使います。１つの配送方式について、国別、郵便番号に応じた地域別といった複数の価"
-"格リストを定義することができます。"
+"製品の重量や他の基準に基づいて配送の原価と販売価格を計算するために配達価格リストを使います。１つの配達方法について、国別、郵便番号に応じた地域別といった複"
+"数の価格リストを定義することができます。"
 
 #. module: delivery
 #: field:delivery.carrier,amount:0
@@ -143,7 +143,7 @@ msgstr "固定"
 #: field:res.partner,property_delivery_carrier:0
 #: field:sale.order,carrier_id:0
 msgid "Delivery Method"
-msgstr "配送方式"
+msgstr "配達方法"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:213
@@ -159,7 +159,7 @@ msgstr "ストック移動"
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr "配送記録"
+msgstr "運搬会社追跡の参照"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
@@ -169,7 +169,7 @@ msgstr "正味重量"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "グリッド線"
+msgstr "グリッドライン"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -202,7 +202,7 @@ msgstr "受注"
 msgid ""
 "Define your delivery methods and their pricing. The delivery costs can be "
 "added on the sale order form or in the invoice, based on the delivery orders."
-msgstr "配送方式とその価格を定義して下さい。配送注文に応じて、配送料を受注伝票あるいは請求書の中に追加することができます。"
+msgstr "配達方法とその価格を定義して下さい。配達オーダーに応じて、配達料金は受注オーダーあるいは請求書の中に追加することができます。"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -217,13 +217,13 @@ msgstr "配送会社"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "配送グリッド"
+msgstr "配達グリッド"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:213
 #, python-format
 msgid "No line matched this product or order in the choosed delivery grid."
-msgstr "指定した配送グリッドの中に、このプロダクトあるいは発注に合致した線がありません。"
+msgstr "指定した配達グリッドの中に、この製品あるいはオーダーに合致したラインがありません。"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -233,17 +233,17 @@ msgstr "請求先"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr "出庫票"
+msgstr "集荷リスト"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "配送グリッド"
+msgstr "配達グリッド"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr "配送する"
+msgstr "配達する"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -260,7 +260,7 @@ msgstr "出発点の郵便番号"
 msgid ""
 "Amount of the order to benefit from a free shipping, expressed in the "
 "company currency"
-msgstr "配達無料、会社通貨による速達を適用する配送の金額"
+msgstr "配達無料、会社負担の速達の適用を受けるためのオーダー金額"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:89
@@ -278,7 +278,7 @@ msgstr "グリッド"
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
-msgstr "この項目を無しに設定すると、配送グリッドを消さずに、隠すことができます。"
+msgstr "このアクティブ項目を無しに設定すると、配達グリッドを削除することなく非表示にできます。"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -335,13 +335,13 @@ msgstr "重量"
 msgid ""
 "Check this box if you want to manage delivery prices that depends on the "
 "destination, the weight, the total of the order, etc."
-msgstr "目的地、重量、受注金額などに応じて配送料を決めるのであれば、このボックスをチェックします。"
+msgstr "到着地、重量、オーダー金額合計などに応じて配達料を管理したいのであれば、このボックスをチェックします。"
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
 msgid ""
 "Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr "目的地ごとに事前確認価格が決まっているのであれば、空白にします。"
+msgstr "到着地ごとに前払い価格が決まっているのであれば、空白にします。"
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -369,7 +369,7 @@ msgstr "発注が予定状態ではありません。"
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
 msgid "Choose Your Default Picking Policy"
-msgstr "デフォルトの出庫方策を選んで下さい。"
+msgstr "デフォルトの集荷方針を選んで下さい。"
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -390,7 +390,7 @@ msgstr "出荷日"
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "配送製品"
+msgstr "配達製品"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -416,7 +416,7 @@ msgstr "変数"
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
-msgstr "出庫の請求をするときに、この配送方式が使われます。"
+msgstr "集荷から請求をするときに、この配達方法が使われます。"
 
 #. module: delivery
 #: sql_constraint:stock.picking:0
@@ -437,25 +437,25 @@ msgstr "数量"
 #: view:delivery.define.delivery.steps.wizard:0
 #: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
 msgid "Setup Your Picking Policy"
-msgstr "出庫方策を定義します。"
+msgstr "集荷方針を定義します。"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
 msgid "Define Delivery Methods"
-msgstr "配送方式を定義します。"
+msgstr "配達方法の定義"
 
 #. module: delivery
 #: help:delivery.carrier,free_if_more_than:0
 msgid ""
 "If the order is more expensive than a certain amount, the customer can "
 "benefit from a free shipping"
-msgstr "受注額が特定の金額以上の場合には、顧客は配送無料の特典を受けることができます。"
+msgstr "オーダーが特定金額以上の場合は、顧客は配達無料の特典を受けることができます。"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
-msgstr "出庫量に応じて配送料を請求するのであれば、この項目を指定して下さい。"
+msgstr "集荷を基本として出荷を請求する予定ならば、この項目を完成させて下さい。"
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
@@ -479,7 +479,7 @@ msgid ""
 "Define the delivery methods you are using and their pricing in order to "
 "reinvoice the delivery costs when you are doing invoicing based on delivery "
 "orders"
-msgstr "配送方式と注文に応じて請求する配送料を定義します。"
+msgstr "配達オーダーを基本とする請求を行う場合は、あなたが使用している配達方法と、配達料を再請求するための価格を定義して下さい。"
 
 #. module: delivery
 #: view:res.partner:0
@@ -504,7 +504,7 @@ msgstr "これ以上であれば無料"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr "配送を手配する"
+msgstr "配達の作成"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -523,13 +523,13 @@ msgstr "詳細"
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
-msgstr "この項目を無しに設定すると、配送会社を取り除くことなく、隠すことができます。"
+msgstr "このアクティブ項目を無しに設定すると、運搬会社を削除することなく、非表示にできます。"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "配送価格表"
+msgstr "配達価格リスト"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -542,12 +542,12 @@ msgstr "価格"
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr "この配送会社の合致するグリッドがありません。"
+msgstr "この運搬会社に合致するグリッドがありません。"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "配送"
+msgstr "配達"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -564,7 +564,7 @@ msgstr "="
 #: code:addons/delivery/stock.py:90
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "配送会社 %s (ID: %d) の配送グリッドはありません。"
+msgstr "運搬会社 %s（ID：%d）の配達グリッドがありません。"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -588,7 +588,7 @@ msgstr "目的地ごとの事前確認価格"
 #: report:sale.shipping:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "配送会社"
+msgstr "運搬会社"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -605,7 +605,7 @@ msgstr "ID"
 #: code:addons/delivery/wizard/delivery_sale_order.py:73
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
-msgstr "配送行が決まるまでは、発注状態は「予定」でなければいけません。"
+msgstr "配達ラインがを追加するために、オーダー状態はドラフトである必要があります。"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -626,7 +626,7 @@ msgstr "販売価格"
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
 #: view:sale.order:0
 msgid "Delivery Costs"
-msgstr "配送コスト"
+msgstr "配達コスト"
 
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 64b480ee736..f24c033a7ec 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -22,7 +22,7 @@ import logging
 import os
 import tempfile
 from subprocess import Popen, PIPE
-
+_logger = logging.getLogger(__name__)
 class NhException(Exception):
     pass
 
@@ -116,7 +116,7 @@ def mime_match(mime, mdict):
     return (None, None)
 
 class contentIndex(object):
-    __logger = logging.getLogger('addons.document.content_index')
+    
     def __init__(self):
         self.mimes = {}
         self.exts = {}
@@ -132,7 +132,7 @@ class contentIndex(object):
             f = True
 
         if f:
-            self.__logger.debug('Register content indexer: %r', obj)
+            _logger.debug('Register content indexer: %r', obj)
         if not f:
             raise Exception("Your indexer should at least suport a mimetype or extension")
 
@@ -169,22 +169,22 @@ class contentIndex(object):
                 (result, _) = pop.communicate()
 
                 mime2 = result.split(';')[0]
-                self.__logger.debug('File gave us: %s', mime2)
+                _logger.debug('File gave us: %s', mime2)
                 # Note that the temporary file still exists now.
                 mime,fobj = mime_match(mime2, self.mimes)
                 if not mime:
                     mime = mime2
             except Exception:
-                self.__logger.exception('Cannot determine mime type')
+                _logger.exception('Cannot determine mime type')
 
         try:
             if fobj:
                 res = (mime, fobj.indexContent(content,filename,fname or realfname) )
             else:
-                self.__logger.debug("Have no object, return (%s, None)", mime)
+                _logger.debug("Have no object, return (%s, None)", mime)
                 res = (mime, None )
         except Exception:
-            self.__logger.exception("Could not index file %s (%s)",
+            _logger.exception("Could not index file %s (%s)",
                                     filename, fname or realfname)
             res = None
 
@@ -193,8 +193,7 @@ class contentIndex(object):
             try:
                 os.unlink(fname)
             except Exception:
-                self.__logger.exception("Could not unlink %s", fname)
-
+                _logger.exception("Could not unlink %s", fname)
         return res
 
 cntIndex = contentIndex()
diff --git a/addons/document/document.py b/addons/document/document.py
index 92ece063a47..fa65f8d9966 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -30,12 +30,15 @@ from tools.translate import _
 import nodes
 import logging
 
+_logger = logging.getLogger(__name__)
+
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['root_path'], 'filestore'))
 
 class document_file(osv.osv):
     _inherit = 'ir.attachment'
     _rec_name = 'datas_fname'
-
+   
+   
     def _attach_parent_id(self, cr, uid, ids=None, context=None):
         """Migrate ir.attachments to the document module.
 
@@ -54,7 +57,7 @@ class document_file(osv.osv):
 
         parent_id = self.pool.get('document.directory')._get_root_directory(cr,uid)
         if not parent_id:
-            logging.getLogger('document').warning("at _attach_parent_id(), still not able to set the parent!")
+            _logger.warning("at _attach_parent_id(), still not able to set the parent!")
             return False
 
         if ids is not None:
@@ -140,8 +143,8 @@ class document_file(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, ctx:uid,
+        'parent_id': __get_def_directory,
         'file_size': lambda self, cr, uid, ctx:0,
-        'parent_id': __get_def_directory
     }
     _sql_constraints = [
         # filename_uniq is not possible in pure SQL
@@ -336,7 +339,7 @@ class document_file(osv.osv):
                 if r:
                     unres.append(r)
             else:
-                logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
+                self.loggerdoc.warning("Unlinking attachment #%s %s that has no storage",
                                                 f.id, f.name)
         res = super(document_file, self).unlink(cr, uid, ids, context)
         stor.do_unlink(cr, uid, unres)
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index ac7a174b05f..a7bc98de6f3 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -104,6 +104,5 @@
     <!-- After we have setup the root directory, migrate the attachments
         to point to that. -->
     <function model="ir.attachment" name="_attach_parent_id"/>
-
 </data>
 </openerp>
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d09d2cc86d5..03b2dcc47bf 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -22,10 +22,10 @@
 
 from osv import osv, fields
 from osv.orm import except_orm
-
+import logging
 import nodes
 from tools.translate import _
-
+_logger = logging.getLogger(__name__)
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
@@ -78,9 +78,8 @@ class document_directory(osv.osv):
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
         except Exception, e:
-            import netsvc
-            logger = netsvc.Logger()
-            logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
+            
+            _logger.warning('Cannot set directory root:'+ str(e))
             return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index fe757e7876d..339b320e9a7 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -29,18 +29,15 @@ import logging
 import shutil
 from StringIO import StringIO
 import psycopg2
-
 from tools.misc import ustr
 from tools.translate import _
-
 from osv.orm import except_orm
-
 import random
 import string
 import pooler
 import nodes
 from content_index import cntIndex
-
+_logger = logging.getLogger(__name__)
 DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config.get('root_path'), 'filestore'))
 
 
@@ -130,7 +127,7 @@ class nodefd_file(nodes.node_descriptor):
                 mime, icont = cntIndex.doIndex(None, filename=filename,
                         content_type=None, realfname=fname)
             except Exception:
-                logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                _logger.debug('Cannot index file:', exc_info=True)
                 pass
 
             try:
@@ -150,7 +147,7 @@ class nodefd_file(nodes.node_descriptor):
                 cr.commit()
                 cr.close()
             except Exception:
-                logging.getLogger('document.storage').warning('Cannot save file indexed content:', exc_info=True)
+                _logger.warning('Cannot save file indexed content:', exc_info=True)
 
         elif self.mode in ('a', 'a+' ):
             try:
@@ -164,7 +161,7 @@ class nodefd_file(nodes.node_descriptor):
                 cr.commit()
                 cr.close()
             except Exception:
-                logging.getLogger('document.storage').warning('Cannot save file appended content:', exc_info=True)
+                _logger.warning('Cannot save file appended content:', exc_info=True)
 
 
 
@@ -191,7 +188,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -217,7 +214,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
                     mime, icont = cntIndex.doIndex(data, filename=filename,
                             content_type=None, realfname=None)
                 except Exception:
-                    logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                    _logger.debug('Cannot index file:', exc_info=True)
                     pass
 
                 try:
@@ -241,7 +238,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
                     (out, len(data), par.file_id))
             cr.commit()
         except Exception:
-            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            _logger.exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
             cr.close()
@@ -271,7 +268,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.storage').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -297,7 +294,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
                     mime, icont = cntIndex.doIndex(data, filename=filename,
                             content_type=None, realfname=None)
                 except Exception:
-                    logging.getLogger('document.storage').debug('Cannot index file:', exc_info=True)
+                    self.logger.debug('Cannot index file:', exc_info=True)
                     pass
 
                 try:
@@ -320,7 +317,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
                     (base64.encodestring(data), len(data), par.file_id))
             cr.commit()
         except Exception:
-            logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
+            _logger.exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
             cr.close()
@@ -339,7 +336,6 @@ class document_storage(osv.osv):
     """
     _name = 'document.storage'
     _description = 'Storage Media'
-    _doclog = logging.getLogger('document')
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
@@ -402,7 +398,7 @@ class document_storage(osv.osv):
         npath = filter(lambda x: x is not None, npath)
 
         # if self._debug:
-        #     self._doclog.debug('Npath: %s', npath)
+        #     self._logger.debug('Npath: %s', npath)
         for n in npath:
             if n == '..':
                 raise ValueError("Invalid '..' element in path")
@@ -413,7 +409,7 @@ class document_storage(osv.osv):
         dpath += npath[:-1]
         path = os.path.join(*dpath)
         if not os.path.isdir(path):
-            self._doclog.debug("Create dirs: %s", path)
+            _logger.debug("Create dirs: %s", path)
             os.makedirs(path)
         return path, npath
 
@@ -451,7 +447,7 @@ class document_storage(osv.osv):
                 # try to fix their directory.
                 if mode in ('r','r+'):
                     if ira.file_size:
-                        self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                        _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                     raise IOError(errno.ENOENT, 'No file can be located')
                 else:
                     store_fname = self.__get_random_fname(boo.path)
@@ -493,7 +489,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    self._doclog.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
+                    _logger.warning( "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
             return file(fpath, 'rb').read()
@@ -517,7 +513,7 @@ class document_storage(osv.osv):
                 # On a migrated db, some files may have the wrong storage type
                 # try to fix their directory.
                 if ira.file_size:
-                    self._doclog.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                    _logger.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
                 # sfname = ira.name
             fpath = os.path.join(boo.path,ira.store_fname or ira.name)
             if os.path.exists(fpath):
@@ -550,7 +546,7 @@ class document_storage(osv.osv):
         if boo.readonly:
             raise IOError(errno.EPERM, "Readonly medium")
 
-        self._doclog.debug( "Store data for ir.attachment #%d" % ira.id)
+        _logger.debug( "Store data for ir.attachment #%d" % ira.id)
         store_fname = None
         fname = None
         if boo.type == 'filestore':
@@ -563,13 +559,13 @@ class document_storage(osv.osv):
                     fp.write(data)
                 finally:    
                     fp.close()
-                self._doclog.debug( "Saved data to %s" % fname)
+                _logger.debug( "Saved data to %s" % fname)
                 filesize = len(data) # os.stat(fname).st_size
                 
                 # TODO Here, an old file would be left hanging.
 
             except Exception, e:
-                self._doclog.warning( "Couldn't save data to %s", path, exc_info=True)
+                _logger.warning( "Couldn't save data to %s", path, exc_info=True)
                 raise except_orm(_('Error!'), str(e))
         elif boo.type == 'db':
             filesize = len(data)
@@ -592,12 +588,12 @@ class document_storage(osv.osv):
                     fp.write(data)
                 finally:    
                     fp.close()
-                self._doclog.debug("Saved data to %s", fname)
+                _logger.debug("Saved data to %s", fname)
                 filesize = len(data) # os.stat(fname).st_size
                 store_fname = os.path.join(*npath)
                 # TODO Here, an old file would be left hanging.
             except Exception,e :
-                self._doclog.warning("Couldn't save data:", exc_info=True)
+                _logger.warning("Couldn't save data:", exc_info=True)
                 raise except_orm(_('Error!'), str(e))
 
         elif boo.type == 'virtual':
@@ -616,7 +612,7 @@ class document_storage(osv.osv):
                 mime, icont = cntIndex.doIndex(data, ira.datas_fname,
                 ira.file_type or None, fname)
             except Exception:
-                self._doclog.debug('Cannot index file:', exc_info=True)
+                _logger.debug('Cannot index file:', exc_info=True)
                 pass
 
             try:
@@ -633,7 +629,7 @@ class document_storage(osv.osv):
             file_node.content_type = mime
             return True
         except Exception, e :
-            self._doclog.warning("Couldn't save data:", exc_info=True)
+            self._logger.warning("Couldn't save data:", exc_info=True)
             # should we really rollback once we have written the actual data?
             # at the db case (only), that rollback would be safe
             raise except_orm(_('Error at doc write!'), str(e))
@@ -671,9 +667,9 @@ class document_storage(osv.osv):
                 try:
                     os.unlink(fname)
                 except Exception:
-                    self._doclog.warning("Could not remove file %s, please remove manually.", fname, exc_info=True)
+                    _logger.warning("Could not remove file %s, please remove manually.", fname, exc_info=True)
             else:
-                self._doclog.warning("Unknown unlink key %s" % ktype)
+                _logger.warning("Unknown unlink key %s" % ktype)
 
         return True
 
@@ -703,9 +699,9 @@ class document_storage(osv.osv):
             fname = ira.store_fname
 
             if not fname:
-                self._doclog.warning("Trying to rename a non-stored file")
+                _logger.warning("Trying to rename a non-stored file")
             if fname != os.path.join(*npath):
-                self._doclog.warning("inconsistency in realstore: %s != %s" , fname, repr(npath))
+                _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(npath))
 
             oldpath = os.path.join(path, npath[-1])
             newpath = os.path.join(path, new_name)
@@ -743,7 +739,7 @@ class document_storage(osv.osv):
                 break
             par = par.parent_id
         if file_node.storage_id != psto:
-            self._doclog.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name)
+            _logger.debug('Cannot move file %r from %r to %r', file_node, file_node.parent, ndir_bro.name)
             raise NotImplementedError('Cannot move files between storage media')
 
         if sbro.type in ('filestore', 'db', 'db64'):
@@ -756,9 +752,9 @@ class document_storage(osv.osv):
             fname = ira.store_fname
 
             if not fname:
-                self._doclog.warning("Trying to rename a non-stored file")
+                _logger.warning("Trying to rename a non-stored file")
             if fname != os.path.join(*opath):
-                self._doclog.warning("inconsistency in realstore: %s != %s" , fname, repr(opath))
+                _logger.warning("inconsistency in realstore: %s != %s" , fname, repr(opath))
 
             oldpath = os.path.join(path, opath[-1])
             
@@ -766,12 +762,12 @@ class document_storage(osv.osv):
             npath = filter(lambda x: x is not None, npath)
             newdir = os.path.join(*npath)
             if not os.path.isdir(newdir):
-                self._doclog.debug("Must create dir %s", newdir)
+                _logger.debug("Must create dir %s", newdir)
                 os.makedirs(newdir)
             npath.append(opath[-1])
             newpath = os.path.join(*npath)
             
-            self._doclog.debug("Going to move %s from %s to %s", opath[-1], oldpath, newpath)
+            _logger.debug("Going to move %s from %s to %s", opath[-1], oldpath, newpath)
             shutil.move(oldpath, newpath)
             
             store_path = npath[1:] + [opath[-1],]
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index ee89f3d4c6c..273be7effa4 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -41,8 +41,7 @@ from StringIO import StringIO
 #       file: objct = ir.attachement
 #   root: if we are at the first directory of a ressource
 #
-
-logger = logging.getLogger('doc2.nodes')
+_logger = logging.getLogger(__name__)
 
 def _str2time(cre):
     """ Convert a string with time representation (from db) into time (float)
@@ -328,7 +327,7 @@ class node_class(object):
         if self.DAV_M_NS.has_key(ns):
             prefix = self.DAV_M_NS[ns]
         else:
-            logger.debug('No namespace: %s ("%s")',ns, prop)
+            _logger.debug('No namespace: %s ("%s")',ns, prop)
             return None
 
         mname = prefix + "_" + prop.replace('-','_')
@@ -341,7 +340,7 @@ class node_class(object):
             r = m(cr)
             return r
         except AttributeError:
-            logger.debug('Property %s not supported' % prop, exc_info=True)
+            _logger.debug('Property %s not supported' % prop, exc_info=True)
         return None
 
     def get_dav_resourcetype(self, cr):
@@ -384,13 +383,13 @@ class node_class(object):
     def create_child(self, cr, path, data=None):
         """ Create a regular file under this node
         """
-        logger.warning("Attempted to create a file under %r, not possible.", self)
+        _logger.warning("Attempted to create a file under %r, not possible.", self)
         raise IOError(errno.EPERM, "Not allowed to create files here")
     
     def create_child_collection(self, cr, objname):
         """ Create a child collection (directory) under self
         """
-        logger.warning("Attempted to create a collection under %r, not possible.", self)
+        _logger.warning("Attempted to create a collection under %r, not possible.", self)
         raise IOError(errno.EPERM, "Not allowed to create folders here")
 
     def rm(self, cr):
@@ -725,7 +724,7 @@ class node_dir(node_database):
             assert self.parent
 
         if self.parent != ndir_node:
-            logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node)
+            _logger.debug('Cannot move dir %r from %r to %r', self, self.parent, ndir_node)
             raise NotImplementedError('Cannot move dir to another dir')
 
         ret = {}
@@ -998,7 +997,7 @@ class node_res_obj(node_class):
     def get_dav_eprop_DEPR(self, cr, ns, prop):
         # Deprecated!
         if ns != 'http://groupdav.org/' or prop != 'resourcetype':
-            logger.warning("Who asked for %s:%s?" % (ns, prop))
+            _logger.warning("Who asked for %s:%s?" % (ns, prop))
             return None
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         uid = self.context.uid
@@ -1328,7 +1327,7 @@ class node_file(node_class):
         ret = {}
         if ndir_node and self.parent != ndir_node:
             if not (isinstance(self.parent, node_dir) and isinstance(ndir_node, node_dir)):
-                logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node)
+                _logger.debug('Cannot move file %r from %r to %r', self, self.parent, ndir_node)
                 raise NotImplementedError('Cannot move files between dynamic folders')
 
             if not ndir_obj:
@@ -1452,6 +1451,7 @@ class node_content(node_class):
         return ''
 
 class nodefd_content(StringIO, node_descriptor):
+    
     """ A descriptor to content nodes
     """
     def __init__(self, parent, cr, mode, ctx):
@@ -1473,7 +1473,7 @@ class nodefd_content(StringIO, node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.content').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -1499,13 +1499,14 @@ class nodefd_content(StringIO, node_descriptor):
                 raise NotImplementedError
             cr.commit()
         except Exception:
-            logging.getLogger('document.content').exception('Cannot update db content #%d for close:', par.cnt_id)
+            _logger.exception('Cannot update db content #%d for close:', par.cnt_id)
             raise
         finally:
             cr.close()
         StringIO.close(self)
 
 class nodefd_static(StringIO, node_descriptor):
+    
     """ A descriptor to nodes with static data.
     """
     def __init__(self, parent, cr, mode, ctx=None):
@@ -1526,7 +1527,7 @@ class nodefd_static(StringIO, node_descriptor):
         elif mode == 'a':
             StringIO.__init__(self, None)
         else:
-            logging.getLogger('document.nodes').error("Incorrect mode %s specified", mode)
+            _logger.error("Incorrect mode %s specified", mode)
             raise IOError(errno.EINVAL, "Invalid file mode")
         self.mode = mode
 
@@ -1551,7 +1552,7 @@ class nodefd_static(StringIO, node_descriptor):
                 raise NotImplementedError
             cr.commit()
         except Exception:
-            logging.getLogger('document.nodes').exception('Cannot update db content #%d for close:', par.cnt_id)
+            _logger.exception('Cannot update db content #%d for close:', par.cnt_id)
             raise
         finally:
             cr.close()
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index e153d018bf0..49ac9a5c906 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -25,6 +25,7 @@ import StringIO
 import odt2txt
 import sys, zipfile, xml.dom.minidom
 import logging
+_logger = logging.getLogger(__name__)
 
 def _to_unicode(s):
     try:
@@ -101,9 +102,9 @@ class DocIndex(indexer):
             (data, _) = pop.communicate()
             return _to_unicode(data)
         except OSError:
-            logger = logging.getLogger('document.DocIndex')
-            logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
-            logger.debug("Trace of the failed file indexing attempt: ", exc_info=True)
+            
+            _logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
+            _logger.debug("Trace of the failed file indexing attempt: ", exc_info=True)
             return False
     
 cntIndex.register(DocIndex())
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 2e09a938a05..59aff85c633 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -23,9 +23,9 @@ import threading
 import ftpserver
 import authorizer
 import abstracted_fs
-import netsvc
+import logging
 from tools import config
-
+_logger = logging.getLogger(__name__)
 def start_server():
     HOST = config.get('ftp_server_host', '127.0.0.1')
     PORT = int(config.get('ftp_server_port', '8021'))
@@ -35,10 +35,7 @@ def start_server():
         PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
     class ftp_server(threading.Thread):
-        def log(self, level, message):
-            logger = netsvc.Logger()
-            logger.notifyChannel('FTP', level, message)
-
+        
         def run(self):
             autho = authorizer.authorizer()
             ftpserver.FTPHandler.authorizer = autho
@@ -48,17 +45,17 @@ def start_server():
             if PASSIVE_PORTS:
                 ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-            ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+            ftpserver.log = lambda msg: _logger.info(msg)
             ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+            ftpserver.logerror = lambda msg: _logger.error(msg)
 
             ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
             ftpd.serve_forever()
 
     if HOST.lower() == 'none':
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+        _logger.info("\n Server FTP Not Started\n")
     else:
-        netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
         ds = ftp_server()
         ds.daemon = True
         ds.start()
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 83cd1cde725..429016a2376 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -56,7 +56,7 @@ class abstracted_fs(object):
         self.cwd = '/'
         self.cwd_node = None
         self.rnfr = None
-        self._log = logging.getLogger('FTP.fs')
+        self._log = logging.getLogger(__name__)
 
     # Ok
     def db_list(self):
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index 7bc0883f9e8..31f462bcbbe 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -24,9 +24,9 @@ import logging
 import urlparse
 from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
 from service.http_server import HttpLogHandler
-
+_logger = logging.getLogger(__name__)
 class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
-    _logger = logging.getLogger('httpd.well-known')
+    
     _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD', 'PROPFIND'] }
     redirect_paths = {}
 
@@ -80,7 +80,7 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler
         self.send_header("Content-Length", 0)
         self.end_headers()
         # Do we need a Cache-content: header here?
-        self._logger.debug("redirecting %s to %s", self.path, redir_path)
+        _logger.debug("redirecting %s to %s", self.path, redir_path)
         return None
 
     def do_PROPFIND(self):
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 3c20cfed5b8..a4dda231bd8 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -43,7 +43,7 @@ from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
 
-log = logging.getLogger('http-client')
+_logger = logging.getLogger(__name__)
 
 class HTTP11(httplib.HTTP):
         _http_vsn = 11
@@ -62,7 +62,7 @@ class PersistentTransport(Transport):
         if not self._http.has_key(host):
                 host, extra_headers, x509 = self.get_host_info(host)
                 self._http[host] = HTTP11(host)
-                log.debug("New connection to %s", host)
+                _logger.debug("New connection to %s", host)
         return self._http[host]
 
     def get_host_info(self, host):
@@ -170,7 +170,7 @@ class SafePersistentTransport(PersistentTransport):
         if not self._http.has_key(host):
                 host, extra_headers, x509 = self.get_host_info(host)
                 self._http[host] = httplib.HTTPS(host, None, **(x509 or {}))
-                log.debug("New connection to %s", host)
+                _logger.debug("New connection to %s", host)
         return self._http[host]
 
 class AuthClient(object):
@@ -191,8 +191,8 @@ class BasicAuthClient(AuthClient):
             return super(BasicAuthClient,self).getAuth(atype, realm)
 
         if not self._realm_dict.has_key(realm):
-            log.debug("realm dict: %r", self._realm_dict)
-            log.debug("missing key: \"%s\"" % realm)
+            _logger.debug("realm dict: %r", self._realm_dict)
+            _logger.debug("missing key: \"%s\"" % realm)
             self.resolveFailedRealm(realm)
         return 'Basic '+ self._realm_dict[realm]
         
@@ -239,7 +239,7 @@ class addAuthTransport:
                 # This line will bork if self.setAuthClient has not
                 # been issued. That is a programming error, fix your code!
                 auths = self._auth_client.getAuth(atype, realm)
-                log.debug("sending authorization: %s", auths)
+                _logger.debug("sending authorization: %s", auths)
                 h.putheader('Authorization', auths)
             self.send_content(h, request_body)
 
@@ -255,8 +255,8 @@ class addAuthTransport:
                         log.warning("Why have data on a 401 auth. message?")
                     if realm.startswith('realm="') and realm.endswith('"'):
                         realm = realm[7:-1]
-                    log.debug("Resp: %r %r", resp.version,resp.isclosed(), resp.will_close)
-                    log.debug("Want to do auth %s for realm %s", atype, realm)
+                    _logger.debug("Resp: %r %r", resp.version,resp.isclosed(), resp.will_close)
+                    _logger.debug("Want to do auth %s for realm %s", atype, realm)
                     if atype != 'Basic':
                         raise ProtocolError(host+handler, 403, 
                                         "Unknown authentication method: %s" % atype, resp.msg)
@@ -315,7 +315,7 @@ class HTTPSConnection(httplib.HTTPSConnection):
                         lf = (len(ssl.PEM_FOOTER)+1)
                         if cert[0-lf] != '\n':
                                 cert = cert[:0-lf]+'\n'+cert[0-lf:]
-                        log.debug("len-footer: %s cert: %r", lf, cert[0-lf])
+                        _logger.debug("len-footer: %s cert: %r", lf, cert[0-lf])
                 
                 return cert
 
@@ -390,7 +390,7 @@ class DAVClient(object):
         import base64
         dbg = self.dbg
         hdrs.update(self.hdrs)
-        log.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
+        _logger.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
         conn = httplib.HTTPConnection(self.host, port=self.port, timeout=self.timeout)
         conn.set_debuglevel(dbg)
         if not path:
@@ -409,8 +409,8 @@ class DAVClient(object):
                         data1 = r1.read()
                         if not self.user:
                                 raise Exception('Must auth, have no user/pass!')
-                        log.debug("Ver: %s, closed: %s, will close: %s", r1.version,r1.isclosed(), r1.will_close)
-                        log.debug("Want to do auth %s for realm %s", atype, realm)
+                        _logger.debug("Ver: %s, closed: %s, will close: %s", r1.version,r1.isclosed(), r1.will_close)
+                        _logger.debug("Want to do auth %s for realm %s", atype, realm)
                         if atype == 'Basic' :
                                 auths = base64.encodestring(self.user + ':' + self.passwd)
                                 if auths[-1] == "\n":
@@ -422,22 +422,22 @@ class DAVClient(object):
                         else:
                                 raise Exception("Unknown auth type %s" %atype)
                 else:
-                        log.warning("Got 401, cannot auth")
+                        _logger.warning("Got 401, cannot auth")
                         raise Exception('No auth')
 
-        log.debug("Reponse: %s %s",r1.status, r1.reason)
+        _logger.debug("Reponse: %s %s",r1.status, r1.reason)
         data1 = r1.read()
         if method != 'GET':
-            log.debug("Body:\n%s\nEnd of body", data1)
+            _logger.debug("Body:\n%s\nEnd of body", data1)
             try:
                 ctype = r1.msg.getheader('content-type')
                 if ctype and ';' in ctype:
                     ctype, encoding = ctype.split(';',1)
                 if ctype == 'text/xml':
                     doc = xml.dom.minidom.parseString(data1)
-                    log.debug("XML Body:\n %s", doc.toprettyxml(indent="\t"))
+                    _logger.debug("XML Body:\n %s", doc.toprettyxml(indent="\t"))
             except Exception:
-                log.warning("could not print xml", exc_info=True)
+                _logger.warning("could not print xml", exc_info=True)
                 pass
         conn.close()
         return r1.status, r1.msg, data1
@@ -474,7 +474,7 @@ class DAVClient(object):
         s, m, d = self._http_request(path, method='OPTIONS', hdrs=hdrs)
         assert s == 200, "Status: %r" % s
         assert 'OPTIONS' in m.getheader('Allow')
-        log.debug('Options: %r', m.getheader('Allow'))
+        _logger.debug('Options: %r', m.getheader('Allow'))
         
         if expect:
             self._assert_headers(expect, m)
@@ -493,10 +493,10 @@ class DAVClient(object):
             for cnod in node.childNodes:
                 if cnod.nodeType != node.ELEMENT_NODE:
                     if strict:
-                        log.debug("Found %r inside <%s>", cnod, node.tagName)
+                        _logger.debug("Found %r inside <%s>", cnod, node.tagName)
                     continue
                 if namespaces and (cnod.namespaceURI not in namespaces):
-                    log.debug("Ignoring <%s> in <%s>", cnod.tagName, node.localName)
+                    _logger.debug("Ignoring <%s> in <%s>", cnod.tagName, node.localName)
                     continue
                 yield cnod
 
@@ -533,10 +533,10 @@ class DAVClient(object):
                             assert htver == 'HTTP/1.1'
                             rstatus = int(sta)
                         else:
-                            log.debug("What is <%s> inside a <propstat>?", pno.tagName)
+                            _logger.debug("What is <%s> inside a <propstat>?", pno.tagName)
                     
                 else:
-                    log.debug("Unknown node: %s", cno.tagName)
+                    _logger.debug("Unknown node: %s", cno.tagName)
                 
             res.setdefault(href,[]).append((status, res_nss))
 
@@ -637,7 +637,7 @@ class DAVClient(object):
                         if lsp[1] in davprops:
                             lsline[lsp[0]] = lsp[2]
                 else:
-                    log.debug("Strange status: %s", st)
+                    _logger.debug("Strange status: %s", st)
             
             res.append(lsline)
             
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index ae75d0b80fc..65ebb49ff5f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -54,7 +54,7 @@ from DAV.propfind import PROPFIND
 # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
 from xml.dom import minidom
 from redirect import RedirectHTTPHandler
-
+_logger = logging.getLogger(__name__)
 khtml_re = re.compile(r' KHTML/([0-9\.]+) ')
 
 def OpenDAVConfig(**kw):
@@ -73,7 +73,7 @@ def OpenDAVConfig(**kw):
 
 class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
     verbose = False
-    _logger = logging.getLogger('webdav')
+   
     protocol_version = 'HTTP/1.1'
     _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
                     'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
@@ -127,10 +127,10 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
         return self.davpath
 
     def log_message(self, format, *args):
-        self._logger.debug(format % args)
+        _logger.debug(format % args)
 
     def log_error(self, format, *args):
-        self._logger.warning(format % args)
+        _logger.warning(format % args)
 
     def _prep_OPTIONS(self, opts):
         ret = opts
@@ -477,7 +477,7 @@ class dummy_dav_interface(object):
         uri2 = uri.split('/')
         if len(uri2) < 3:
             return True
-        logging.getLogger('webdav').debug("Requested uri: %s", uri)
+        _logger.debug("Requested uri: %s", uri)
         return None # no
 
     def is_collection(self, uri):
@@ -487,6 +487,7 @@ class dummy_dav_interface(object):
 class DAVStaticHandler(http_server.StaticHTTPHandler):
     """ A variant of the Static handler, which will serve dummy DAV requests
     """
+    
     verbose = False
     protocol_version = 'HTTP/1.1'
     _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
@@ -573,7 +574,7 @@ try:
         conf = OpenDAVConfig(**_dc)
         handler._config = conf
         reg_http_service(directory, DAVHandler, DAVAuthProvider)
-        logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory)
+        _logger.info("WebDAV service registered at path: %s/ "% directory)
         
         if not (config.get_misc('webdav', 'no_root_hack', False)):
             # Now, replace the static http handler with the dav-enabled one.
@@ -595,7 +596,7 @@ try:
             reg_http_service('/', DAVStaticHandler)
 
 except Exception, e:
-    logging.getLogger('webdav').error('Cannot launch webdav: %s' % e)
+    _logger.error('Cannot launch webdav: %s' % e)
 
 
 def init_well_known():
@@ -616,6 +617,8 @@ def init_well_known():
 init_well_known()
 
 class PrincipalsRedirect(RedirectHTTPHandler):
+    
+    
     redirect_paths = {}
     
     def _find_redirect(self):
@@ -639,7 +642,7 @@ def init_principals_redirect():
     if dbname:
         PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname
         reg_http_service('/principals', PrincipalsRedirect)
-        logging.getLogger("web-services").info(
+        _logger.info(
                 "Registered HTTP redirect handler for /principals to the %s db.",
                 dbname)
 
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 404e60588e3..44af9f2af3a 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -78,7 +78,7 @@
         <field name="inherit_id" ref="document.view_document_directory_form" />
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <page string="Dynamic context" position="after" version="7.0">
+        <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
         <page string="WebDAV properties">
             <label string="These properties will be added to WebDAV requests" colspan="4" />
 
@@ -98,7 +98,7 @@
                 </form>
             </field>
         </page>
-        </page>
+        </xpath>
     </field>
     </record>
 
diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py
index b4a80c0f1dd..46fabbc2fd0 100644
--- a/addons/edi/__init__.py
+++ b/addons/edi/__init__.py
@@ -23,12 +23,13 @@ import logging
 import models
 import edi_service
 from models.edi import EDIMixin, edi_document
+_logger = logging.getLogger(__name__)
 
 # web
 try:
     import controllers
 except ImportError:
-    logging.getLogger('init.load').warn(
+    _logger.warn(
         """Could not load openerp-web section of EDI, EDI will not behave correctly
 
 To fix, launch openerp-web in embedded mode""")
diff --git a/addons/edi/edi_service.py b/addons/edi/edi_service.py
index 074720a03e9..f48cc60950a 100644
--- a/addons/edi/edi_service.py
+++ b/addons/edi/edi_service.py
@@ -23,7 +23,7 @@ import logging
 import netsvc
 import openerp
 
-_logger = logging.getLogger('edi.service')
+_logger = logging.getLogger(__name__)
 
 class edi(netsvc.ExportService):
 
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 589922ff178..383d8c7aaba 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -35,6 +35,7 @@ import pooler
 from osv import osv,fields,orm
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
+_logger = logging.getLogger(__name__)
 
 EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
 EDI_VIEW_WEB_URL = '%s/edi/view?db=%s&token=%s'
@@ -72,7 +73,6 @@ def last_update_for(record):
         return record_log.get('write_date') or record_log.get('create_date') or False
     return False
 
-_logger = logging.getLogger('edi')
 
 class edi_document(osv.osv):
     _name = 'edi.document'
diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py
index 357fdec061b..86d8c81b790 100644
--- a/addons/edi/models/res_partner.py
+++ b/addons/edi/models/res_partner.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 from edi import EDIMixin
 from openerp import SUPERUSER_ID
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 RES_PARTNER_EDI_STRUCT = {
     'name': True,
@@ -63,7 +64,7 @@ class res_partner(osv.osv, EDIMixin):
         code, label = 'edi_generic', 'Generic Bank Type (auto-created for EDI)'
         bank_code_ids = res_partner_bank_type.search(cr, uid, [('code','=',code)], context=context)
         if not bank_code_ids:
-            logging.getLogger('edi.res_partner').info('Normal bank account type is missing, creating '
+            _logger.info('Normal bank account type is missing, creating '
                                                       'a generic bank account type for EDI.')
             self.res_partner_bank_type.create(cr, SUPERUSER_ID, {'name': label,
                                                                  'code': label})
@@ -84,7 +85,7 @@ class res_partner(osv.osv, EDIMixin):
                                              bank_name, ext_bank_id, context=import_ctx)
                 except osv.except_osv:
                     # failed to import it, try again with unrestricted default type
-                    logging.getLogger('edi.res_partner').warning('Failed to import bank account using'
+                    _logger.warning('Failed to import bank account using'
                                                                  'bank type: %s, ignoring', import_ctx['default_state'],
                                                                  exc_info=True)
         return contact_id
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index dbe53b3d547..c426e3ae746 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    "name" : "E-Mail Templates",
+    "name" : "Email Templates",
     "version" : "1.1",
     "author" : "OpenERP,OpenLabs",
     "website" : "http://openerp.com",
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index fff9bdc0f1a..c4ed2eedb85 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -29,11 +29,12 @@ from osv import fields
 import tools
 from tools.translate import _
 from urllib import quote as quote
+_logger = logging.getLogger(__name__)
 
 try:
     from mako.template import Template as MakoTemplate
 except ImportError:
-    logging.getLogger('init').warning("email_template: mako templates not available, templating features will not work!")
+    _logger.warning("email_template: mako templates not available, templating features will not work!")
 
 class email_template(osv.osv):
     "Templates for sending email"
@@ -75,7 +76,7 @@ class email_template(osv.osv):
                 result = u''
             return result
         except Exception:
-            logging.exception("failed to render mako template value %r", template)
+            _logger.exception("failed to render mako template value %r", template)
             return u""
 
     def get_email_template(self, cr, uid, template_id=False, record_id=None, context=None):
diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po
index 18d561e2679..90deb09511d 100644
--- a/addons/email_template/i18n/ar.po
+++ b/addons/email_template/i18n/ar.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "نوع الرسالة"
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index e10d3224c00..f0f3d046f93 100644
--- a/addons/email_template/i18n/bg.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index aa1bc5ac755..36d6b3db975 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po
index 1ad04c65729..1f9ae4b61ab 100644
--- a/addons/email_template/i18n/da.po
+++ b/addons/email_template/i18n/da.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 966ebb3d770..ac31e737c95 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -185,8 +185,8 @@ msgstr "Auswahl des Typs der Nachricht, 'HTML' oder 'Text'."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1447,6 +1447,9 @@ msgstr ""
 #~ "Abläufe können angepasst werden, Informationen mit Partnerbezug könnten "
 #~ "dabei automatisch eingetragen werden."
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
+
 #~ msgid "Text contents"
 #~ msgstr "Text Inhalt"
 
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index ba3e4c1386f..0990a940397 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -173,7 +173,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index d6c672cb2f9..9ccaad4a037 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
index 8082654a2df..fb670442336 100644
--- a/addons/email_template/i18n/es_CL.po
+++ b/addons/email_template/i18n/es_CL.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: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -182,8 +182,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -687,3 +687,6 @@ msgstr ""
 
 #~ msgid "Sidebar button"
 #~ msgstr "Botón barra lateral"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po
index 2326072156c..af3f045fe9d 100644
--- a/addons/email_template/i18n/es_CR.po
+++ b/addons/email_template/i18n/es_CR.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: email_template
@@ -192,8 +192,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1478,6 +1478,9 @@ msgstr ""
 #~ msgid "Sidebar button"
 #~ msgstr "Botón de barra lateral"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
+
 #~ msgid "Related Document model"
 #~ msgstr "Modelo de documento relacionado"
 
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index dd8cbb255bd..d00c8539ce4 100644
--- a/addons/email_template/i18n/es_EC.po
+++ b/addons/email_template/i18n/es_EC.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
index dc38ed8bbf2..8fdda1ea29b 100644
--- a/addons/email_template/i18n/et.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index 50ca809fae7..45e0c0d6754 100644
--- a/addons/email_template/i18n/fi.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -182,8 +182,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Sähköpostin luonti velho"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1367,6 +1367,9 @@ msgstr "Rich-text/HTML versio viestistä (voit käyttä täytettä)"
 #~ "palvelimelle\n"
 #~ "Virhe: %s"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Sähköpostin luonti velho"
+
 #~ msgid "Related Document model"
 #~ msgstr "Liittyvä dokumenttimalli"
 
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index d06835e6e40..3f830f7993e 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -190,8 +190,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistant pour la rédaction de courriels"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1480,3 +1480,6 @@ msgstr ""
 
 #~ msgid "Permanently delete emails after sending"
 #~ msgstr "Supprimer définitivement les courriels après envoi"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant pour la rédaction de courriels"
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
index 8f92becc20d..0d686dfafee 100644
--- a/addons/email_template/i18n/hr.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index 87b2671730e..89b810e73fb 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index a7a59048cc9..98b901977b4 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index 60b491ad0c2..b9fc44a311b 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.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: 2012-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -182,8 +182,8 @@ msgstr "メッセージのタイプ。通常はテキストあるいはリッチ
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ツール"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -697,6 +697,9 @@ msgstr "メッセージのリッチテキスト / HTML 版"
 #~ msgid "Sidebar button"
 #~ msgstr "サイドバーボタン"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ツール"
+
 #~ msgid "Related Document model"
 #~ msgstr "関連する文書モデル"
 
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index a3579007636..67059433f23 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/i18n/mn.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Зурвасын төрөл"
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -32,23 +32,23 @@ msgstr "Файлын нэр"
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP сервер"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
-msgstr ""
+msgstr "Холбогдох баримтын одоо харгадаж байгаа хажуугийн багажуудыг арилгах"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Хажуугийн багажийн үйлдэл"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Шинэ үлгэрээр хадгалах"
 
 #. module: email_template
 #: help:email.template,subject:0
@@ -66,7 +66,7 @@ msgstr ""
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Хүлээн авсан"
 
 #. module: email_template
 #: view:email.template:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
@@ -1229,3 +1229,6 @@ msgstr ""
 #, python-format
 #~ msgid "No Description"
 #~ msgstr "Тайлбаргүй"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Хажуугийн даруул"
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index 0dbaa299758..91821f6bb9d 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/i18n/nb.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 75ce6985e25..43d4396600c 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -191,8 +191,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-mail opmaak wizard"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1461,6 +1461,9 @@ msgstr ""
 #~ "klant profiel velden, zodat een relatienaam of andere relatie informatie "
 #~ "automatisch kan worden ingevoegd."
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
+
 #~ msgid "Rich-text contents"
 #~ msgstr "Rich-tekst inhoud"
 
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index c7cf7855dcf..3e5285121b9 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/i18n/pl.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -183,7 +183,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index 1b9bfe6f725..83496c62cda 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/i18n/pt.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -190,8 +190,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistente de composição de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1463,6 +1463,9 @@ msgstr ""
 #~ msgid "Sidebar button"
 #~ msgstr "Botão barra lateral"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de e-mail"
+
 #~ msgid "Related Document model"
 #~ msgstr "Modelo de documento relacionado"
 
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index b80e8e26adc..bf947a41163 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index 03aa71047a5..eff630ade9a 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/i18n/ro.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tip de mesaj"
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -32,41 +32,42 @@ msgstr "Raport nume fisier"
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "Server SMTP"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
 msgstr ""
+"Sterge butonul barei laterale afisat pentru moment in documentele asociate"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Actiune bara laterala"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Salveaza ca sablon nou"
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Subiect (aici puteti folosi inlocuitori)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Destinatari cc (copie carbon) (aici puteti folosi inlocuitori)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Primit"
 
 #. module: email_template
 #: view:email.template:0
@@ -82,45 +83,48 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Numele care va fi folosit pentru fisierul raportului generat (poate sa "
+"contina inlocuitori)\n"
+"Extensia poate sa fie omisa, iar atunci va reiesi din tipul raportului."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach existing files"
-msgstr ""
+msgstr "Ataseaza fisiere existente"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content"
-msgstr ""
+msgstr "Continut E-mail"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulat(a)"
 
 #. module: email_template
 #: field:email.template,reply_to:0
 #: field:email_template.preview,reply_to:0
 msgid "Reply-To"
-msgstr "Răspunde către:"
+msgstr "Raspunde"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
 #: field:email_template.preview,auto_delete:0
 msgid "Auto Delete"
-msgstr "Auto stergere"
+msgstr "Sterge Automat"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Warning"
-msgstr "Atenție"
+msgstr "Atentionare"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: email_template
 #: field:email.template,subject:0
@@ -137,19 +141,19 @@ msgstr "De la"
 #. module: email_template
 #: field:mail.compose.message,template_id:0
 msgid "Template"
-msgstr "Șablon"
+msgstr "Sablon"
 
 #. module: email_template
 #: field:email.template,partner_id:0
 #: field:email_template.preview,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Partener asociat"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Sub-fisier"
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +161,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Afiseaza un buton in bara laterala a documentelor asociate pentru a deschide "
+"un wizard de compozitie cu acest sablon"
 
 #. module: email_template
 #: field:email.template,state:0
@@ -177,27 +183,29 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipul de mesaj, de obicei 'html' sau 'simplu', folosit pentru a selecta ca "
+"atare cuprinsul textului simplu sau textului imbogatit"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Values Builder"
-msgstr ""
+msgstr "Creator Valori Dinamice"
 
 #. module: email_template
 #: field:email.template,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID Document Asociat"
 
 #. module: email_template
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr ""
+msgstr "Selectare limba"
 
 #. module: email_template
 #: view:email.template:0
@@ -208,7 +216,7 @@ msgstr "Avansat"
 #: field:email.template,email_to:0
 #: field:email_template.preview,email_to:0
 msgid "To"
-msgstr "Către"
+msgstr "Catre"
 
 #. module: email_template
 #: field:email.template,model:0
@@ -224,17 +232,20 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Selectati campul tinta din modelul documentului asociat.\n"
+"Daca este un camp de relatie, veti putea sa selectati un camp tinta la "
+"destinatia relatiei."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr "Previzualizare şablon"
+msgstr "Previzualizare Sablon"
 
 #. module: email_template
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Null value"
-msgstr ""
+msgstr "Valoare nula"
 
 #. module: email_template
 #: field:email.template,sub_object:0
@@ -251,37 +262,37 @@ msgid ""
 "resource record. This is useful for CRM leads for example"
 msgstr ""
 "Activati daca doriti sa includeti un marcator special de urmarire in email-"
-"urile de iesire, astfel ca puteti identifica raspunsuri si le puteti lega de "
-"inregistrarea resursa corespunzatoare. Aceasta este utila de exemplu pentru "
-"piste MRC."
+"urile de iesire, astfel incat sa puteti identifica raspunsuri si sa le "
+"puteti lega de inregistrarea resursei corespunzatoare. Aceasta este utila de "
+"exemplu pentru piste MRC."
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Foloseste Sablonul"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 #: field:email_template.preview,attachment_ids:0
 msgid "Files to attach"
-msgstr ""
+msgstr "Fisiere care vor fi atasate"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Options"
-msgstr "Opțiuni"
+msgstr "Optiuni"
 
 #. module: email_template
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Related document model"
-msgstr ""
+msgstr "Model document asociat"
 
 #. module: email_template
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Adresa expeditorului (aici pot fi folositi inlocuitori)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -289,51 +300,53 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Daca bifati, acest partener nu va primi nicio notificare automata prin e-"
+"mail, cum ar fi disponibilitatea facturilor."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr "Nota: Acesta este un HTML gol."
+msgstr "Nota: Acesta este un HTML brut."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr "Grupat după..."
+msgstr "Grupeaza dupa..."
 
 #. module: email_template
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Adauga Semnatura"
 
 #. module: email_template
 #: help:email.template,body_text:0
 #: help:email_template.preview,body_text:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Versiunea simpla a mesajului (aici pot fi folositi inlocuitori)"
 
 #. module: email_template
 #: help:email.template,original:0
 #: help:email_template.preview,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Versiunea originala a mesajului, asa cum a fost trimisa pe internet"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:230
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copie)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Outgoing"
-msgstr "Ieșiri"
+msgstr "Iesire"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use a message template"
-msgstr ""
+msgstr "Folositi un mesaj sablon"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -342,12 +355,14 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Daca bifati, semnatura utilizatorului va fi adaugata la versiunea text a "
+"mesajului"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Rich/HTML)"
-msgstr ""
+msgstr "Corp (Imbogatit/HTML)"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -356,44 +371,46 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"Atunci cand un camp de relatie este selectat ca prim camp, acest camp arata "
+"modelul documentului la care se refera relatia."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates"
-msgstr "Şabloane e-mail"
+msgstr "Sabloane e-mail"
 
 #. module: email_template
 #: field:email.template,date:0
 #: field:email_template.preview,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr "Previzualizare şablon"
+msgstr "Previzualizare Sablon"
 
 #. module: email_template
 #: field:email.template,message_id:0
 #: field:email_template.preview,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id-Mesaj"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add sidebar button"
-msgstr ""
+msgstr "Adauga buton bara laterala"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Text)"
-msgstr "Corp (text)"
+msgstr "Corp (Text)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr "Opțiuni avansate"
+msgstr "Optiuni Avansate"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:183
@@ -417,7 +434,7 @@ msgstr "Expresie"
 #: field:email.template,original:0
 #: field:email_template.preview,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: email_template
 #: view:email.template:0
@@ -431,22 +448,23 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Exprsie inlocuitoare finala, care va fi copiata in campul sablon dorit."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attachments"
-msgstr "Atașamente"
+msgstr "Atasamente"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "Detalii e-mail"
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc (copie carbon)"
 
 #. module: email_template
 #: field:email.template,body_text:0
@@ -459,23 +477,24 @@ msgstr ""
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Sterge definitiv acest mesaj dupa ce il trimite, pentru a economisi spatiu"
 
 #. module: email_template
 #: field:email.template,references:0
 #: field:email_template.preview,references:0
 msgid "References"
-msgstr ""
+msgstr "Referinte"
 
 #. module: email_template
 #: field:email.template,display_text:0
 #: field:email_template.preview,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Afiseaza Text"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Close"
-msgstr "Închide"
+msgstr "Inchide"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -484,6 +503,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Puteti atasa fisiere la acest sablon, pentru a fi anexate tuturor e-mail-"
+"urilor create din acest sablon"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -492,12 +513,14 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Antete mesaje complete, de exemplu antetele sesiunii SMTP (de obicei "
+"disponibile doar pentru mesajele primite)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Server Iesire E-mail-uri"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -506,25 +529,27 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Bara laterala de actiune pentru a face ca acest sablon sa fie disponibil in "
+"inregistrarile modelului documentului asociat"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 #: field:email_template.preview,model_object_field:0
 msgid "Field"
-msgstr "Câmp"
+msgstr "Camp"
 
 #. module: email_template
 #: field:email.template,user_id:0
 #: field:email_template.preview,user_id:0
 msgid "Related user"
-msgstr ""
+msgstr "Utilizator asociat"
 
 #. module: email_template
 #: view:email.template:0
 #: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
 #: model:ir.ui.menu,name:email_template.menu_email_templates
 msgid "Templates"
-msgstr "Șabloane"
+msgstr "Sabloane"
 
 #. module: email_template
 #: field:res.partner,opt_out:0
@@ -536,6 +561,7 @@ msgstr ""
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
 msgstr ""
+"Destinatari bcc (copie carbon invizibila) (aici se pot folosi inlocuitori)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -546,17 +572,23 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Limba optionala de traducere (cod ISO) care va fi selectata atunci cand "
+"trimiteti un e-mail. Daca nu este setata, va fi folosita versiunea in limba "
+"engleza. Aceasta ar trebui de obicei sa fie o expresie inlocuitoare care "
+"furnizeaza codul limbii corespunzatoare, de exemplu "
+"${obiect.partener_id.cod.limba}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Document esantion"
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
+"Adrese destinatari despartite prin virgula (aici pot fi folositi inlocuitori)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -590,35 +622,42 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Antetul SMTP ID-mesaj care va fi folosit in mesajele trimise pe baza acetui "
+"sablon. Va rugam sa observati faptul ca acesta anuleaza optiunea 'Urmarire "
+"Resursa', astfel ca daca aveti nevoie sa urmariti raspunsurile la e-mail-"
+"urile trimise, activati in schimb aceasta optiune.\n"
+"Aici trebuie folositi inlocuitori, deoarece aceasta valoare trebuie sa fie "
+"intotdeauna unica!"
 
 #. module: email_template
 #: field:email.template,headers:0
 #: field:email_template.preview,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Antete mesaj"
 
 #. module: email_template
 #: field:email.template,email_bcc:0
 #: field:email_template.preview,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc (blind carbon copy) (copie carbon invizibila)"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Adresa de raspuns preferata (aici pot fi folositi inlocuitori)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove sidebar button"
-msgstr ""
+msgstr "Sterge butonul barei laterale"
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
 msgstr ""
+"Valoarea optionala care va fi folosita in cazul in care campul tinta este gol"
 
 #. module: email_template
 #: view:email.template:0
@@ -629,24 +668,24 @@ msgstr "Model"
 #: help:email.template,references:0
 #: help:email_template.preview,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Referinte mesaj, cum ar fi identificatorii mesajelor precedente"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Buton bara laterala pentru a deschide actiunea barei laterale"
 
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Stergerea inregistrarii actiunii a esuat."
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -655,12 +694,14 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Server optional preferat pentru trimiterea e-mail-urilor. Daca nu este "
+"setat, va fi folosit cel cu prioritatea cea mai mare."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Livrarea a esuat"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -669,23 +710,27 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"Atunci cand un camp de relatie este selectat drept primul camp, acest camp "
+"va permite sa selectati campul tinta din cadrul modelului documentului "
+"destinatie (sub-model)."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach Report"
-msgstr ""
+msgstr "Ataseaza Raport"
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Raport optional care va fi printat si atasat"
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Versiunea rich-text?HTML a mesajului (aici pot fi folositi inlocuitori)"
 
 #~ msgid ""
 #~ "Select the field from the model you want to use.\n"
@@ -1406,3 +1451,21 @@ msgstr ""
 #~ "Email-ul din contul %s nu a reusit conectarea. Motiv probabil: Nu s-a putut "
 #~ "face conectarea la server\n"
 #~ "Eroare: %s"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Buton bara laterala"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
+
+#~ msgid "Related Document model"
+#~ msgstr "Model Document asociat"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Continuturi rich-text (text imbogatit)"
+
+#~ msgid "Text contents"
+#~ msgstr "Cuprins text"
+
+#~ msgid "Opt-out"
+#~ msgstr "Nu participa"
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 1f0e26ef791..d466181524d 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index e6f2be8aac2..86f5ec44931 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index fca9baf9d67..444b20757e9 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -180,7 +180,7 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index c2e89402313..17fcfa854b7 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -14,59 +14,60 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Meddelandetyp"
 
 #. module: email_template
 #: field:email.template,report_name:0
 #: field:email_template.preview,report_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "Rapportfilnamn"
 
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP-server"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
 msgstr ""
+"Tar bort knappen i sidramen som just nu visas för relaterade dokument"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Åtgärd i sidramen"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Spara som en ny mall"
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Ämnesrad (platshållare kan användas här)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Kopiemottagare (platshållare kan användas här)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Mottaget"
 
 #. module: email_template
 #: view:email.template:0
@@ -82,22 +83,25 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Namn att använda för den genererade rapportfilen (kan innehålla "
+"platshållare)\n"
+"Tillägget kan utelämnas och hämtas då istället från rapporttypen."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach existing files"
-msgstr ""
+msgstr "Bilägg existerande filer"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content"
-msgstr ""
+msgstr "E-postinnehåll"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -109,7 +113,7 @@ msgstr "Svara till"
 #: field:email.template,auto_delete:0
 #: field:email_template.preview,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Autoradera"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
@@ -120,13 +124,13 @@ msgstr "Varning"
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: email_template
 #: field:email.template,subject:0
 #: field:email_template.preview,subject:0
 msgid "Subject"
-msgstr "Rubrik"
+msgstr "Ämne"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -143,13 +147,13 @@ msgstr "Mall"
 #: field:email.template,partner_id:0
 #: field:email_template.preview,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Relaterat företag"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Underfält"
 
 #. module: email_template
 #: view:email.template:0
@@ -157,12 +161,14 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Visa en knapp i sidoramen med relaterade dokument för att öppna tillsammans "
+"med denna mall"
 
 #. module: email_template
 #: field:email.template,state:0
 #: field:email_template.preview,state:0
 msgid "State"
-msgstr ""
+msgstr "Tillstånd"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -177,27 +183,29 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Typ av meddelande, vanligtvis \"html\" eller \"vanligt\", används för att "
+"välja klartext eller utsmyckad text i överensstämmelse härmed"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Values Builder"
-msgstr ""
+msgstr "Bygg från variabler"
 
 #. module: email_template
 #: field:email.template,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID relaterat dokument"
 
 #. module: email_template
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr ""
+msgstr "Språkval"
 
 #. module: email_template
 #: view:email.template:0
@@ -224,23 +232,26 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Välj målfält från det relaterade dokumentets modell.\n"
+"Om det är ett relationsfält som kan du välja fält från det relaterade "
+"objektet"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "Förhandsgranskning av mallen"
 
 #. module: email_template
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Null value"
-msgstr ""
+msgstr "Nollvärde"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 #: field:email_template.preview,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Under-modell"
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -250,17 +261,20 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
+"Aktivera detta när du vill införa en särskild uppföljningsmarkör i utgående "
+"e-post så att du kan identifiera svar och länka dem tillbaka till "
+"motsvarande resursposten. Detta är användbart för exempelvis CRM kundämnen."
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Använd mall"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 #: field:email_template.preview,attachment_ids:0
 msgid "Files to attach"
-msgstr ""
+msgstr "Filer att bifoga"
 
 #. module: email_template
 #: view:email.template:0
@@ -271,13 +285,13 @@ msgstr "Alternativ"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Related document model"
-msgstr ""
+msgstr "Relaterad dokumentmodell"
 
 #. module: email_template
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Avsändare (platshållare kan användas här)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -285,11 +299,13 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Om markerad, kommer detta företag inte att få några automatiska e-"
+"postmeddelanden, till exempel fakturor."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Notera: Detta är ren HTML"
 
 #. module: email_template
 #: view:email.template:0
@@ -300,25 +316,25 @@ msgstr "Gruppera på..."
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Lägg till signatur"
 
 #. module: email_template
 #: help:email.template,body_text:0
 #: help:email_template.preview,body_text:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Ren textversion av meddelandet (platshållare kan användas här)"
 
 #. module: email_template
 #: help:email.template,original:0
 #: help:email_template.preview,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Originalversion av meddelandet, som det var sänt på nätverket"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:230
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(kopia)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -329,7 +345,7 @@ msgstr "Utgående"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use a message template"
-msgstr ""
+msgstr "Använd meddelandemall"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -338,12 +354,14 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Om markerad, kommer användaren signatur fogas till textversionen av "
+"meddelandet"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Rich/HTML)"
-msgstr ""
+msgstr "Brödtext (Utsmyckad/HTML)"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -352,39 +370,41 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"När en relaterad term är markerad som första område, visar det här fältet "
+"förlagan relationen går till."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "E-postmallar"
 
 #. module: email_template
 #: field:email.template,date:0
 #: field:email_template.preview,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "Förhandsgranska mall"
 
 #. module: email_template
 #: field:email.template,message_id:0
 #: field:email_template.preview,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Meddelande-id"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add sidebar button"
-msgstr ""
+msgstr "Lägg till knapp i sidoramen"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "Brödtext (Text)"
 
 #. module: email_template
 #: view:email.template:0
@@ -407,18 +427,18 @@ msgstr ""
 #: field:email.template,copyvalue:0
 #: field:email_template.preview,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Uttryck"
 
 #. module: email_template
 #: field:email.template,original:0
 #: field:email_template.preview,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adresser"
 
 #. module: email_template
 #: help:email.template,copyvalue:0
@@ -426,7 +446,7 @@ msgstr ""
 msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
-msgstr ""
+msgstr "Slutlig platshållare uttryck, att kopieras till önskad mallfält."
 
 #. module: email_template
 #: view:email.template:0
@@ -436,13 +456,13 @@ msgstr "Bilagor"
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "E-postdetaljer"
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Kopia"
 
 #. module: email_template
 #: field:email.template,body_text:0
@@ -455,18 +475,19 @@ msgstr ""
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Permanent radering av detta meddelande efter leverans, för att spara plats"
 
 #. module: email_template
 #: field:email.template,references:0
 #: field:email_template.preview,references:0
 msgid "References"
-msgstr ""
+msgstr "Referenser"
 
 #. module: email_template
 #: field:email.template,display_text:0
 #: field:email_template.preview,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Visa text"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -480,6 +501,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Du kan bilägga filer till denna mall, dessa läggs då till all e-post som "
+"skapas från denna förlaga"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -488,12 +511,14 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Fullständigt e-posthuvud, närmare bestämt SMTP-sessionens huvud (vanligtvis "
+"tillgängligt endast i inkommande meddelanden)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Utgående e-postserver"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -502,6 +527,8 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Funktioner i sidorutan som gör denna mall tillgänglig för all postser av "
+"denna objekttyp"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -513,7 +540,7 @@ msgstr "Fält"
 #: field:email.template,user_id:0
 #: field:email_template.preview,user_id:0
 msgid "Related user"
-msgstr ""
+msgstr "Relaterad användare"
 
 #. module: email_template
 #: view:email.template:0
@@ -531,7 +558,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Blindkopiemottagarae (platshållare kan användas här)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -542,17 +569,20 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Tillval översättningsspråk (ISO-kod) att välja när du skickar ut ett mail. "
+"Om inte inställt, kommer den engelska versionen användas. Detta bör "
+"vanligtvis vara en platshållaruttryck som ger"
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Exempeldokument"
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
-msgstr ""
+msgstr "Komma-separerade mottagaradresser (platshållare kan användad)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -564,17 +594,17 @@ msgstr "Namn"
 #: field:email.template,track_campaign_item:0
 #: field:email_template.preview,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Resursuppföljning"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Förhandsgranska e-postmall"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Förhandsgranskning e-post"
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -586,63 +616,69 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Message-ID SMTP huvudet att använda i utgående meddelanden baserat på "
+"mallen. Observera att detta åsidosätter \"Resource Tracking alternativet\", "
+"så om du bara behöver hålla reda på svar på utgående e-post, aktivera det "
+"alternativet istället.\n"
+"Platshållare måste användas här, eftersom detta värde alltid måste vara "
+"unikt!"
 
 #. module: email_template
 #: field:email.template,headers:0
 #: field:email_template.preview,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Meddelandehuvud"
 
 #. module: email_template
 #: field:email.template,email_bcc:0
 #: field:email_template.preview,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Blindkopia"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Föredragen svarsadress (platshållare kan användas)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove sidebar button"
-msgstr ""
+msgstr "Tag bort sidoramsknappar"
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Tillvalsvärde att använda då målfältet är tomt"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: email_template
 #: help:email.template,references:0
 #: help:email_template.preview,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Meddelandereference, t ex identifieraren på föregående e-post"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Sidorutans knapp för att öppna sidorutans åtgärder"
 
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Radering av åtgärdsposten misslyckades."
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -651,12 +687,14 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Tillvad föredragen server för utgående e-post. Om inte satt, väljs servern "
+"med högst prioritet."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Leverans misslyckades"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -665,23 +703,25 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"När relationsfältet är första fältet, så låter dig detta fält välja målfält "
+"i destinationsobjetet (sub-model)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach Report"
-msgstr ""
+msgstr "Bilägg rapport"
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Tillvald rapport för utskrift och bilaga"
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Utsmyckad/HTMÖ-version av meddelandet (platshållare kan användas)"
 
 #~ msgid "Permanently delete emails after sending"
 #~ msgstr "Permanent radera e-post efter att de skickats"
@@ -851,3 +891,21 @@ msgstr ""
 
 #~ msgid "Null Value"
 #~ msgstr "Nollvärde"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Knapp i sidoramen"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-post editor"
+
+#~ msgid "Related Document model"
+#~ msgstr "Modell för relaterade dokument"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Utsmyckat innehåll"
+
+#~ msgid "Text contents"
+#~ msgstr "Textinnehåll"
+
+#~ msgid "Opt-out"
+#~ msgstr "Valt bort"
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 412abfad314..fac9d5fab0b 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -182,8 +182,8 @@ msgstr ""
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-posta oluşturma sihirbazı"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1380,6 +1380,9 @@ msgstr ""
 #~ "Kimden Epostasında beliritlmemişse, açıklama Epostadan alındığı gibi "
 #~ "Gönderen Adı olarak kullanılır. Örneğin: John Doe <john@doe.com>"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-posta oluşturma sihirbazı"
+
 #~ msgid "Related Document model"
 #~ msgstr "İlgili Döküman Modeli"
 
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 53b306cfd27..ff558b35113 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/i18n/zh_CN.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -182,8 +182,8 @@ msgstr "内容类型，一般是“html”或“纯文本”，用于对应地
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: email_template
 #: view:email.template:0
@@ -1358,6 +1358,9 @@ msgstr "消息的富文本/HTML版本（这里可以使用占位符）"
 #~ msgid "Sidebar button"
 #~ msgstr "边栏按钮"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
+
 #~ msgid "Related Document model"
 #~ msgstr "相关单据模型"
 
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0d6497c45f2..9e65a034544 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -78,7 +78,6 @@ class sale_order_line(osv.osv):
                 dic = {
                     'name': order_line.order_id.partner_invoice_id.name,
                     'partner_id': order_line.order_id.partner_id.id,
-                    'contact_id': order_line.order_id.partner_invoice_id.id,
                     'nb_register': int(order_line.product_uom_qty),
                     'email': order_line.order_id.partner_id.email,
                     'phone': order_line.order_id.partner_id.phone,
@@ -89,5 +88,5 @@ class sale_order_line(osv.osv):
                 }
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
-                registration_obj.log(cr, uid, registration_id, message)
+                registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 93ebd063051..cddcf642dc4 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -39,7 +39,7 @@ from osv import osv, fields
 import tools
 from tools.translate import _
 
-logger = logging.getLogger('fetchmail')
+_logger = logging.getLogger(__name__)
 
 class fetchmail_server(osv.osv):
     """Incoming POP/IMAP mail server account"""
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
index f7dade6ae33..6655b95ac0e 100644
--- a/addons/fetchmail/res_config.py
+++ b/addons/fetchmail/res_config.py
@@ -32,7 +32,7 @@ class fetchmail_config_settings(osv.osv_memory):
                 _inherit = ['res.config.settings', 'fetchmail.config.settings']
 
                 _columns = {
-                    'fetchmail_stuff': fields.boolean(..., readonly=True,
+                    'fetchmail_stuff': fields.boolean(...,
                         fetchmail_model='my.stuff', fetchmail_name='Incoming Stuff'),
                 }
 
@@ -67,6 +67,18 @@ class fetchmail_config_settings(osv.osv_memory):
             res[f] = bool(server_ids)
         return res
 
+    def set_fetchmail(self, cr, uid, ids, context=None):
+        """ deactivate fetchmail servers for all fields like 'fetchmail_XXX' that are False """
+        config = self.browse(cr, uid, ids[0], context)
+        fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
+        # determine which models should not have active fetchmail servers, and
+        # deactivate all active servers for those models
+        models = [self._columns[f].fetchmail_model for f in fetchmail_fields if not config[f]]
+        if models:
+            fetchmail_server = self.pool.get('fetchmail.server')
+            server_ids = fetchmail_server.search(cr, uid, [('object_id.model', 'in', models), ('state', '=', 'done')])
+            fetchmail_server.set_draft(cr, uid, server_ids, context)
+
     def configure_fetchmail(self, cr, uid, field, context=None):
         """ open the form view of the fetchmail.server to configure """
         action = {
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 1df94f34221..8cc5671e08a 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -30,6 +30,7 @@
     'web': True,
     'js': ['static/src/js/gdocs.js'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
     'depends': ['google_base_account'],
diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
new file mode 100644
index 00000000000..9393d586fb8
--- /dev/null
+++ b/addons/google_docs/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_google_docs,google.docs.config,model_google_docs_config,,1,0,0,0
+access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2bca73a72e..59e28a28a4b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,6 +25,7 @@ import logging
 from osv import fields, osv
 from PIL import Image
 import StringIO
+_logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
 
@@ -190,7 +191,7 @@ class hr_employee(osv.osv):
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
         'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
-        'work_email': fields.char('Work E-mail', size=240),
+        'work_email': fields.char('Work Email', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager'),
@@ -304,7 +305,7 @@ class res_users(osv.osv):
                                             'user_id': user_id}, context=context)
             except:
                 # Tolerate a missing shortcut. See product/product.py for similar code.
-                logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
+                _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
 
         return user_id
 
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index c30c9fd33fb..f9f313646b9 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -67,14 +67,14 @@
           <field name="name">Francois</field>
           <field name="login">fpi</field>
           <field name="password">fpi</field>
-          <field name="photo_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
       </record>
 
       <record id="base.user_jth" model="res.users">
           <field name="name">Julien</field>
           <field name="login">jth</field>
           <field name="password">jth</field>
-          <field name="photo_big">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
+          <field name="avatar_big">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
       </record>
 
       <record id="base.user_ngh" model="res.users">
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 382d8ca7a6d..6e1745f609e 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -240,8 +240,8 @@ msgstr "معلومات أخرى"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "بريد العمل الإلكتروني"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -724,6 +724,9 @@ msgstr ""
 #~ msgstr ""
 #~ "التعقب ومساعدة الموظفين للترميز والتحقق من صحة الجداول الزمنية والحضور."
 
+#~ msgid "Work E-mail"
+#~ msgstr "بريد العمل الإلكتروني"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "عدد الموظفين لذلك العمل"
 
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index ac02c9d428f..1d4ce8adcce 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,7 +231,7 @@ msgstr "Друга информация"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr "Служебен имейл"
 
 #. module: hr
@@ -705,9 +705,6 @@ msgstr ""
 #~ msgid "Employee Marital Status"
 #~ msgstr "Семейно положение на служител"
 
-#~ msgid "Work Email"
-#~ msgstr "Служебен имейл"
-
 #~ msgid "Sunday"
 #~ msgstr "Неделя"
 
@@ -756,6 +753,9 @@ msgstr ""
 #~ msgid "Timesheets"
 #~ msgstr "Графици"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Служебен имейл"
+
 #~ msgid "Image"
 #~ msgstr "Изображение"
 
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 40cd0d4d9af..5f0abcae2a4 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 09ca4e73941..c7a0e577ff5 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Poslovni e-mail"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -701,9 +701,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Kontakt uposlenika"
 
-#~ msgid "Work Email"
-#~ msgstr "Poslovni e-mail"
-
 #~ msgid "Employee Hierarchy"
 #~ msgstr "Hijerarhija uposlenika"
 
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 847d0cf7fc8..cbe508640cf 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -243,8 +243,8 @@ msgstr "Altra informació"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Email de treball"
+msgid "Work Email"
+msgstr "Adreça electrònica feina"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -722,9 +722,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contacte de l'empleat"
 
-#~ msgid "Work Email"
-#~ msgstr "Adreça electrònica feina"
-
 #~ msgid "Group name"
 #~ msgstr "Nom grup"
 
@@ -889,6 +886,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Nº de empleat"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Email de treball"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Nombre d'empleats amb aquesta feina."
 
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index a32263a9edb..a4e076b49bc 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -243,8 +243,8 @@ msgstr "Jiné informace"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Pracovní E-mail"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -746,6 +746,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Počet zaměstnanců s tímto zaměstnáním."
 
+#~ msgid "Work E-mail"
+#~ msgstr "Pracovní E-mail"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index ba68ff24a13..e7e20daba02 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index deffd2e4c50..87dd4d69aff 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -251,8 +251,8 @@ msgstr "Weitere Informationen"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-Mail Arbeit"
+msgid "Work Email"
+msgstr "Betriebliche Email"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -737,9 +737,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Kontakt Adresse des Mitarbeiters"
 
-#~ msgid "Work Email"
-#~ msgstr "Betriebliche Email"
-
 #~ msgid "Group name"
 #~ msgstr "Gruppe Bezeichnung"
 
@@ -854,6 +851,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-Mail Arbeit"
+
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr ""
 #~ "Vereinfacht das Management von Mitarbeiter Anwesenheit , sowie "
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index d1451554a1c..00a867b2959 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -234,8 +234,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Email εργασίας"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -698,9 +698,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Επαφή του εργαζομένου"
 
-#~ msgid "Work Email"
-#~ msgstr "Email εργασίας"
-
 #~ msgid "Group name"
 #~ msgstr "Όνομα ομάδας"
 
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index ec8215f8368..606bd1136bd 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index e764d663582..aaf27e105a4 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -244,8 +244,8 @@ msgstr "Other information"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Work E-mail"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -755,6 +755,9 @@ msgstr ""
 #~ msgid "Timesheets"
 #~ msgstr "Timesheets"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Work E-mail"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Number of employee with that job."
 
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 73ecd398fe1..da760f58f19 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Otra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Email de trabajo"
+msgid "Work Email"
+msgstr "Correo-e del trabajo"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -731,9 +731,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contacto del empleado"
 
-#~ msgid "Work Email"
-#~ msgstr "Correo-e del trabajo"
-
 #~ msgid "Group name"
 #~ msgstr "Nombre Grupo"
 
@@ -1008,6 +1005,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de la configuración"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Email de trabajo"
+
 #~ msgid "Current"
 #~ msgstr "Presente"
 
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index c01a58a1a54..75fa6d0a0cb 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Correo electrónico del trabajo"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -791,9 +791,6 @@ msgstr ""
 #~ msgid "Parents"
 #~ msgstr "Padres"
 
-#~ msgid "Work Email"
-#~ msgstr "Correo electrónico del trabajo"
-
 #~ msgid "Employee's timesheet group"
 #~ msgstr "Grupo de hojas de tareas del empleado"
 
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 650adcc375b..fbf2d8f7f20 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -243,8 +243,8 @@ msgstr "Otra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail del trabajo"
+msgid "Work Email"
+msgstr "Correo-e del trabajo"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -770,6 +770,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Número de empleados con ese trabajo."
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail del trabajo"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -892,9 +895,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contacto del empleado"
 
-#~ msgid "Work Email"
-#~ msgstr "Correo-e del trabajo"
-
 #~ msgid "Group name"
 #~ msgstr "Nombre Grupo"
 
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 5618e4ac2b6..c2a15b3ecb2 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: \n"
 
 #. module: hr
@@ -248,8 +248,8 @@ msgstr "Otra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Email de trabajo"
+msgid "Work Email"
+msgstr "Correo-e del trabajo"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -723,6 +723,9 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
+#~ msgid "Work E-mail"
+#~ msgstr "Email de trabajo"
+
 #~ msgid "Expected Employees"
 #~ msgstr "Empleados previstos"
 
@@ -741,9 +744,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contacto del empleado"
 
-#~ msgid "Work Email"
-#~ msgstr "Correo-e del trabajo"
-
 #~ msgid "Group name"
 #~ msgstr "Nombre Grupo"
 
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 09f4d872ce3..f13de2179ea 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -249,8 +249,8 @@ msgstr "Otra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Email de trabajo"
+msgid "Work Email"
+msgstr "E-mail de Trabajo"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -722,9 +722,6 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
-#~ msgid "Work Email"
-#~ msgstr "E-mail de Trabajo"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorías de Horarios de Trabajo"
 
@@ -851,6 +848,9 @@ msgstr ""
 #~ msgid "Required number of employees in total for that job."
 #~ msgstr "Número de empleados requeridos en total para este puesto"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Email de trabajo"
+
 #~ msgid "Expected Employees"
 #~ msgstr "Empleados previstos"
 
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 29b346688a3..49bd02f1527 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Töö e-post"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -695,9 +695,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Töötaja kontakt"
 
-#~ msgid "Work Email"
-#~ msgstr "Töö e-post"
-
 #~ msgid "Group name"
 #~ msgstr "Grupinimi"
 
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 672e7146bb9..17945172e97 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -239,8 +239,8 @@ msgstr "Muut tiedot"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Työpaikan sähköposti"
+msgid "Work Email"
+msgstr "Työsähköposti"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -700,9 +700,6 @@ msgstr ""
 #~ msgid "Unmaried"
 #~ msgstr "Naimaton"
 
-#~ msgid "Work Email"
-#~ msgstr "Työsähköposti"
-
 #~ msgid "Workgroup manager"
 #~ msgstr "Työryhmän johtaja"
 
@@ -837,6 +834,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Työntekijänumero"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Työpaikan sähköposti"
+
 #~ msgid "Image"
 #~ msgstr "Kuva"
 
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 85741cfffcd..f22f7a00577 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Autre information"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Courriel professionnel"
+msgid "Work Email"
+msgstr "Adresse électronique professionnelle"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -730,9 +730,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contact du salarié"
 
-#~ msgid "Work Email"
-#~ msgstr "Adresse électronique professionnelle"
-
 #~ msgid "Group name"
 #~ msgstr "Nom du groupe"
 
@@ -1003,6 +1000,9 @@ msgstr ""
 #~ msgid "Employee Marital Status"
 #~ msgstr "État civil de l'employé"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Courriel professionnel"
+
 #~ msgid "Required number of employees in total for that job."
 #~ msgstr "Nombre requis d'employés total pour ce poste"
 
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index 1396e2f0486..ecb9b29e00a 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index ec1ad07181f..466aa2f0dec 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -244,8 +244,8 @@ msgstr "Outra información"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail de traballo"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -766,6 +766,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Nº de empregado"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail de traballo"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Número de empregados con ese traballo."
 
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 5238ff8e571..446de8902bd 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr "અન્ય માહિતી"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
@@ -344,7 +344,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "વર્ગ"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -384,7 +384,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "સંપર્ક જાણકારી"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -399,7 +399,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "સ્થિતિ"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -410,7 +410,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "અજાણ્યુ"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
@@ -453,7 +453,7 @@ msgstr ""
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "કંપનીઓ"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -470,12 +470,12 @@ msgstr ""
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "જુનું"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "બે વપરાશકર્તાઓ પાસે  એક જ લોગીન ન હોઈ શકે!"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,state:0
@@ -690,6 +690,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "અપેક્ષિત કર્મચારીઓ"
 
+#~ msgid "Recruitment Process"
+#~ msgstr "ભરતી પ્રક્રિયા"
+
 #~ msgid "Attendances"
 #~ msgstr "હાજરી"
 
@@ -725,3 +728,9 @@ msgstr ""
 
 #~ msgid "Image"
 #~ msgstr "ચિત્ર"
+
+#~ msgid "Configure"
+#~ msgstr "રૂપરેખાંકન"
+
+#~ msgid "Status Description"
+#~ msgstr "સ્થિતિનું  વર્ણન"
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index 0675a5ffc46..ec857959d64 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "कार्यालय ई-मेल"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -699,9 +699,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "कर्मचारी के संपर्क"
 
-#~ msgid "Work Email"
-#~ msgstr "कार्यालय ई-मेल"
-
 #~ msgid "Group name"
 #~ msgstr "समूह का नाम"
 
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 67416a5bcd6..6cd24c07cbb 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -248,8 +248,8 @@ msgstr "Ostali podaci"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Poslovna el. pošta"
+msgid "Work Email"
+msgstr "Poslovni Email"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -744,9 +744,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Kontakt Djelatnika"
 
-#~ msgid "Work Email"
-#~ msgstr "Poslovni Email"
-
 #~ msgid "Group name"
 #~ msgstr "Ime Grupe"
 
@@ -840,6 +837,9 @@ msgstr ""
 #~ msgid "New Employee"
 #~ msgstr "Novi Djelatnik"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Poslovna el. pošta"
+
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Pojednostavljuje upravljanje podacima prisustva djelatnika"
 
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 42effb62e6e..f2b1b363204 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -249,7 +249,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index aef8ced876c..99bfe11b586 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -238,8 +238,8 @@ msgstr "Egyéb információ"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Munkahelyi e-mailcím"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -720,6 +720,9 @@ msgstr ""
 #~ msgid "Timesheets"
 #~ msgstr "Munkaidő-kimutatások"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Munkahelyi e-mailcím"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Alkalmazottak száma ezzel a munkakörrel"
 
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 83e9e5b5001..7a36fdc934f 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Informasi Lain"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-Mail Kantor"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -765,6 +765,9 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Evaluasi berkala"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-Mail Kantor"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Jumlah pegawai dengan pekerjaan itu."
 
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 54ea44b5d83..586e1ab4714 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -244,8 +244,8 @@ msgstr "Altre informazioni"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail ufficio"
+msgid "Work Email"
+msgstr "Email Ufficio"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -723,9 +723,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contatto del dipendente"
 
-#~ msgid "Work Email"
-#~ msgstr "Email Ufficio"
-
 #~ msgid "Group name"
 #~ msgstr "Nome Gruppo"
 
@@ -840,6 +837,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "E' collegato al manager del dipartimento"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail ufficio"
+
 #~ msgid "Recruitment Process"
 #~ msgstr "Processo di assunzione"
 
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index 3e4c2799d92..6af4d2d9634 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -236,8 +236,8 @@ msgstr "その他の情報"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "勤務先のEメール"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -697,6 +697,9 @@ msgstr ""
 #~ msgid "Required number of employees in total for that job."
 #~ msgstr "この職種に必要な従業員の数"
 
+#~ msgid "Work E-mail"
+#~ msgstr "勤務先のEメール"
+
 #~ msgid "Expected Employees"
 #~ msgstr "従業員候補"
 
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 741facadde0..243c3f059aa 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "이메일"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -687,9 +687,6 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
-#~ msgid "Work Email"
-#~ msgstr "이메일"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "근로시간 카테고리"
 
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index 1f9674891d4..4489db866ba 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 66ba2ea0d5d..23f67de97b8 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Darbo el. paštas"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -743,9 +743,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Darbuotojo kontaktai"
 
-#~ msgid "Work Email"
-#~ msgstr "Darbo el. paštas"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Darbo laiko kategorijos"
 
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index dac8d1c37a3..e047f29eaaa 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -243,7 +243,7 @@ msgstr "Cita Informācija"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr "Darba e-pasts"
 
 #. module: hr
@@ -709,9 +709,6 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
-#~ msgid "Work Email"
-#~ msgstr "Darba e-pasts"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Darba Laika Kategorijas"
 
@@ -878,6 +875,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Darbinieka Nr."
 
+#~ msgid "Work E-mail"
+#~ msgstr "Darba e-pasts"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 2ed59e21d52..cea945988ae 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -248,8 +248,8 @@ msgstr "Останати информации"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Службен Е-Маил"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -770,6 +770,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Моментален Број"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Службен Е-Маил"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Број на вработени на одреденото работно место/позиција."
 
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 44151d80e15..fdc1e4ecd83 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -153,6 +153,9 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Энэ тохиолдол руу хандуулахыг хүсж байгаа бол ажилчны форм болон холбоосыг "
+"үүсгэдэг. Ангилал нь нэг ангилалын ажилчид дээр масс үйлдэл хийх боломжийг "
+"олгодог. Жишээлбэл: амралт хуваарилах"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -161,6 +164,9 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Танай компаний хэлтсийн бүтэц нь ажилчидтай холбоотой бүх баримтыг хэлтсээр "
+"ангилан зохион байгуулахад хэрэглэгддэг: зардал болон цагийн хуваарь, амралт "
+"болон чөлөө, ажилтан авалт, гм."
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -246,8 +252,8 @@ msgstr "Бусад мэдээлэл"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Ажлын Э-мэйл"
+msgid "Work Email"
+msgstr "Ажлын и-мэйл"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -467,6 +473,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Танай хэлтсийн бүтэц нь ажилчидтай холбоотой бүх баримтыг хэлтсээр ангилан "
+"зохион байгуулахад хэрэглэгддэг: зардал болон цагийн хуваарь, амралт болон "
+"чөлөө, ажилтан авалт, гм."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -713,9 +722,6 @@ msgstr ""
 #~ msgid "Sunday"
 #~ msgstr "Ням"
 
-#~ msgid "Work Email"
-#~ msgstr "Ажлын и-мэйл"
-
 #~ msgid "Friday"
 #~ msgstr "Баасан"
 
@@ -833,6 +839,9 @@ msgstr ""
 #~ msgid "Fill up employee's contact information"
 #~ msgstr "Ажилтны гэрээний мэдээллийг бөглөх"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Ажлын Э-мэйл"
+
 #~ msgid "Holidays"
 #~ msgstr "Амралт, чөлөө"
 
@@ -994,3 +1003,6 @@ msgstr ""
 
 #~ msgid "Number of Employees"
 #~ msgstr "Ажиллагсдын тоо"
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Мөчирийг Удирдах"
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index 7dd1c1ef719..28e00aad1f3 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr "Annen informasjon"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-postaddresse arbeid"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -705,6 +705,9 @@ msgstr ""
 #~ msgid "Timesheets"
 #~ msgstr "Timelister"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-postaddresse arbeid"
+
 #~ msgid "Recruitment Process"
 #~ msgstr "Rekurtteringsprosess"
 
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index e3db2b1ca20..c68496ca09c 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -246,8 +246,8 @@ msgstr "Overige informatie"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Werk email"
+msgid "Work Email"
+msgstr "E-mail werk"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -720,9 +720,6 @@ msgstr ""
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
 
-#~ msgid "Work Email"
-#~ msgstr "E-mail werk"
-
 #~ msgid "Group name"
 #~ msgstr "Groepsnaam"
 
@@ -842,6 +839,9 @@ msgstr ""
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Werk email"
+
 #~ msgid "title"
 #~ msgstr "titel"
 
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 44ee0fd59df..7f79ca9c7b5 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,7 +231,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 380b6daec22..33b6ac684a9 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -235,8 +235,8 @@ msgstr "Inne informacje"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Służbowy e-mail"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -714,9 +714,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Kontakt do pracownika"
 
-#~ msgid "Work Email"
-#~ msgstr "Służbowy e-mail"
-
 #~ msgid "Unmaried"
 #~ msgstr "Wolny(a)"
 
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 11dcdca4c9b..7b8306837e7 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Outra Informação"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail Trabalho"
+msgid "Work Email"
+msgstr "Email Profissional"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -724,9 +724,6 @@ msgstr ""
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
 
-#~ msgid "Work Email"
-#~ msgstr "Email Profissional"
-
 #~ msgid "Friday"
 #~ msgstr "Sexta-feira"
 
@@ -775,6 +772,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de módulo inválido na definição da acção"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail Trabalho"
+
 #~ msgid "Holidays"
 #~ msgstr "Férias"
 
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 10b29cc27a2..3ea1f750fe4 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -235,8 +235,8 @@ msgstr "Outra Informação"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail de Trabalho"
+msgid "Work Email"
+msgstr "E-mail profissional"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -753,9 +753,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Contato do Colaborador"
 
-#~ msgid "Work Email"
-#~ msgstr "E-mail profissional"
-
 #~ msgid "Employee Hierarchy"
 #~ msgstr "Hierarquia Funcional"
 
@@ -822,6 +819,9 @@ msgstr ""
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail de Trabalho"
+
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Simplifica a gestão do atendimento de funcionários"
 
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index 4dadb4f94eb..7ed6e4b9f01 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -248,8 +248,8 @@ msgstr "Alte informatii"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-mail serviciu"
+msgid "Work Email"
+msgstr "Email serviciu"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -720,9 +720,6 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
-#~ msgid "Work Email"
-#~ msgstr "Email serviciu"
-
 #~ msgid "Sunday"
 #~ msgstr "Duminică"
 
@@ -919,6 +916,9 @@ msgstr ""
 #~ "Urmărește şi îi ajută pe angajaţi sa codifice și sa valideze foile de pontaj "
 #~ "şi prezenta."
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail serviciu"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Numarul de angajati cu acel loc de munca."
 
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 5dbf20102a4..53da22e909c 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Прочая информация"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Рабочий электронный адрес"
+msgid "Work Email"
+msgstr "Рабочая эл. почта"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -725,9 +725,6 @@ msgstr ""
 #~ msgid "Sunday"
 #~ msgstr "Воскресенье"
 
-#~ msgid "Work Email"
-#~ msgstr "Рабочая эл. почта"
-
 #~ msgid "Group name"
 #~ msgstr "Название группы"
 
@@ -912,6 +909,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Количество сотрудников на этой должности"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Рабочий электронный адрес"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 19eebe1c02d..8e0ebfadade 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Pracovný E-mail"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -705,9 +705,6 @@ msgstr ""
 #~ msgid "Work from"
 #~ msgstr "Pracuje od"
 
-#~ msgid "Work Email"
-#~ msgstr "Pracovný E-mail"
-
 #~ msgid "Employee Hierarchy"
 #~ msgstr "Hierarchia zamestnancov"
 
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index d174d2aa48a..63b7890fd5d 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr ""
+msgid "Work Email"
+msgstr "Službena e-pošta"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -689,9 +689,6 @@ msgstr ""
 #~ msgid "Sunday"
 #~ msgstr "nedelja"
 
-#~ msgid "Work Email"
-#~ msgstr "Službena e-pošta"
-
 #~ msgid "Group name"
 #~ msgstr "Ime skupine"
 
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index 99d054946a4..ddef56e871d 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/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: 2012-06-22 04:46+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,7 +232,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index ab929ddae13..aed247add7e 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -236,8 +236,8 @@ msgstr "Ostale Informacije"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Poslovni Email"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -696,6 +696,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime u definiciji akcije."
 
+#~ msgid "Work E-mail"
+#~ msgstr "Poslovni Email"
+
 #~ msgid "Holidays"
 #~ msgstr "Praznici"
 
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index f32af555d5a..d5ecede369e 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -243,8 +243,8 @@ msgstr "Ostale Informacije"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Poslovni Email"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -710,6 +710,9 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
+#~ msgid "Work E-mail"
+#~ msgstr "Poslovni Email"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime u definiciji akcije."
 
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index ab2b55d9874..f633fd0747e 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -247,8 +247,8 @@ msgstr "Annan information"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "E-post arbetet"
+msgid "Work Email"
+msgstr "E-post arbete"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -717,9 +717,6 @@ msgstr ""
 msgid "Number of new employees you expect to recruit."
 msgstr ""
 
-#~ msgid "Work Email"
-#~ msgstr "E-post arbete"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Arbetstidskategorier"
 
@@ -845,6 +842,9 @@ msgstr ""
 #~ msgid "Number of Employees"
 #~ msgstr "Antal anställda"
 
+#~ msgid "Work E-mail"
+#~ msgstr "E-post arbetet"
+
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "Personalchefens infopanel"
 
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 5ffd98ff445..271f81e3f89 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr "ข้อมูลอื่นๆ"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "อีเมล์"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -724,6 +724,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "จำนวนพนักงาน"
 
+#~ msgid "Work E-mail"
+#~ msgstr "อีเมล์"
+
 #~ msgid "Expected Employees"
 #~ msgstr "พนักงานที่คาดหวัง"
 
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 9631280228f..9a6e79205ad 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,7 +231,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 911913a4b01..bcec97af786 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -243,8 +243,8 @@ msgstr "Diğer Bilgiler"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "İş E-postası"
+msgid "Work Email"
+msgstr "İş Eposta"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -814,9 +814,6 @@ msgstr ""
 #~ msgid "Parents"
 #~ msgstr "Üst Öge"
 
-#~ msgid "Work Email"
-#~ msgstr "İş Eposta"
-
 #~ msgid "Friday"
 #~ msgstr "Cuma"
 
@@ -853,6 +850,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Personel No"
 
+#~ msgid "Work E-mail"
+#~ msgstr "İş E-postası"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "O işteki personel sayısı"
 
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 0f669e827c3..f2694fe4064 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,7 +231,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
+msgid "Work Email"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index bd8a5eca23b..57abff2b936 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -248,8 +248,8 @@ msgstr "Thông tin khác"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "Địa chỉ thư điện tử công việc"
+msgid "Work Email"
+msgstr "Email công việc"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -788,6 +788,9 @@ msgstr ""
 #~ msgid "title"
 #~ msgstr "cách xưng hô"
 
+#~ msgid "Work E-mail"
+#~ msgstr "Địa chỉ thư điện tử công việc"
+
 #~ msgid "Holidays"
 #~ msgstr "Nghỉ lễ"
 
@@ -815,9 +818,6 @@ msgstr ""
 #~ msgid "Contact  of employee"
 #~ msgstr "Thông tin liên hệ của nhân viên"
 
-#~ msgid "Work Email"
-#~ msgstr "Email công việc"
-
 #~ msgid "Friday"
 #~ msgstr "Thứ sáu"
 
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index c9cdba0e65c..085e0b339a6 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -232,8 +232,8 @@ msgstr "其它信息"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "工作电邮"
+msgid "Work Email"
+msgstr "工作Email"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -810,12 +810,12 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义中使用了无效的模快名。"
 
-#~ msgid "Work Email"
-#~ msgstr "工作Email"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件!"
 
+#~ msgid "Work E-mail"
+#~ msgstr "工作电邮"
+
 #~ msgid "Holidays"
 #~ msgstr "假期"
 
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 3c81422ce28..5a9ac14f474 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -231,8 +231,8 @@ msgstr "其他資料"
 
 #. module: hr
 #: field:hr.employee,work_email:0
-msgid "Work E-mail"
-msgstr "辦公電郵"
+msgid "Work Email"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -710,6 +710,9 @@ msgstr ""
 #~ msgid "Employee Marital Status"
 #~ msgstr "僱員婚姻狀況"
 
+#~ msgid "Work E-mail"
+#~ msgstr "辦公電郵"
+
 #~ msgid "Current"
 #~ msgstr "當前"
 
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index fb48f020f24..c9e5b7a8628 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -31,7 +31,7 @@ class hr_config_settings(osv.osv_memory):
         'module_hr_attendance': fields.boolean('Track Attendances',
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('Manage Timesheets',
-            help ="""This installs the module hr_timesheet."""),                                
+            help ="""This installs the module hr_timesheet."""),
         'module_hr_holidays': fields.boolean('Leaves & Holidays',
             help ="""This installs the module hr_holidays."""),
         'module_hr_expense': fields.boolean('Expenses',
@@ -46,4 +46,16 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_payroll."""),
     }
 
+    def onchange_hr_timesheet(self, cr, uid, ids, timesheet, context=None):
+        """ module_hr_timesheet implies module_hr_attendance """
+        if timesheet:
+            return {'value': {'module_hr_attendance': True}}
+        return {}
+
+    def onchange_hr_attendance(self, cr, uid, ids, attendance, context=None):
+        """ module_hr_timesheet implies module_hr_attendance """
+        if not attendance:
+            return {'value': {'module_hr_timesheet': False}}
+        return {}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index d78e3a4e5d1..f96f4a80ab2 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -16,28 +16,37 @@
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <separator string="Additional Features" colspan="4"/>
-                        <field name="module_hr_expense"/>
-                        <field name="module_hr_recruitment"/>
-                        <field name="module_hr_evaluation"/>
-                        <field name="module_hr_contract"/>
-                        <field name="module_hr_holidays"/>
-                        <newline/>
-                        <field name="module_hr_payroll"/>
-                        <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                            string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
-
-                        <separator string="Timesheets" colspan="4"/>
-                        <field name="module_hr_attendance"/>
-                        <field name="module_hr_timesheet"/>
-                        <field name="module_hr_timesheet_sheet"/>
-
-                        <group name="config_recruitment" colspan="4"/>
-                     </group>
+                    <sheet>
+                        <group string="Additional Features">
+                            <group>
+                                <field name="module_hr_expense"/>
+                                <field name="module_hr_evaluation"/>
+                                <field name="module_hr_holidays"/>
+                            </group>
+                            <group>
+                                <field name="module_hr_recruitment"/>
+                                <field name="module_hr_contract"/>
+                                <label for="module_hr_payroll"/>
+                                <div>
+                                    <field name="module_hr_payroll"/>
+                                    <button name="%(open_payroll_modules)d" type="action"
+                                        string="Install Country-Specific Payroll" icon="gtk-go-forward"
+                                        attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                                </div>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Timesheets">
+                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
+                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
+                                <field name="module_hr_timesheet_sheet"/>
+                            </group>
+                            <group name="config_recruitment"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/i18n/ar.po b/addons/hr_evaluation/i18n/ar.po
index e869e3c0aff..fcdae14f144 100644
--- a/addons/hr_evaluation/i18n/ar.po
+++ b/addons/hr_evaluation/i18n/ar.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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -293,7 +293,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
@@ -508,7 +508,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Print Survey"
-msgstr ""
+msgstr "طباعة الإستفتاء"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index 9435d87a293..db3dc306861 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -291,7 +291,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index 6c65d0de5bb..876d75618ad 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -309,7 +309,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/da.po b/addons/hr_evaluation/i18n/da.po
index af2ac29acd3..a10f5b742e5 100644
--- a/addons/hr_evaluation/i18n/da.po
+++ b/addons/hr_evaluation/i18n/da.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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index ef752c80547..794e8b7da55 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -315,8 +315,8 @@ msgstr "Beurteilungen im letzten Monat"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1234,3 +1234,6 @@ msgstr "Nächstes Beurteilungsdatum"
 #~ "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 "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 9234736cb7f..097ee66186e 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -309,7 +309,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es_CR.po b/addons/hr_evaluation/i18n/es_CR.po
index 75defc64d8b..eaa9b86485b 100644
--- a/addons/hr_evaluation/i18n/es_CR.po
+++ b/addons/hr_evaluation/i18n/es_CR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-15 22:49+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:06+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: hr_evaluation
@@ -315,8 +315,8 @@ msgstr "Evaluación realizada en el mes pasado"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1065,7 +1065,7 @@ msgstr "Fecha de próxima evaluación"
 #~ msgid "Evaluation Summary"
 #~ msgstr "Resumen de evaluación"
 
-#~ msgid "Send Evaluation Reminder"
+#~ msgid "Send evaluation reminder"
 #~ msgstr "Enviar recordatorio de evaluación"
 
 #~ msgid "Evaluation Deadline"
@@ -1206,3 +1206,6 @@ msgstr "Fecha de próxima evaluación"
 #~ "empleados\n"
 #~ "          se puede ver en un tablero de Mis evaluaciones actuales.\n"
 #~ "         "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index 53bc87beaa2..41ea0255859 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -290,7 +290,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index 4f79c3bb4b7..aeaf9e62854 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index 9f813866aef..b342e0d7bfe 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -307,8 +307,8 @@ msgstr "Arvostelu tehty viime kuussa"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Ohjattu sähköpostin luomistoiminto"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -960,3 +960,6 @@ msgstr "Seuraavan arvioinnin päivämäärä"
 
 #~ msgid "Search Evaluation Plan"
 #~ msgstr "Etsi arviointisuunnitelma"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Ohjattu sähköpostin luomistoiminto"
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 332df6b6666..bfd8d2d94e4 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -316,8 +316,8 @@ msgstr "Evaluations réalisées le mois passé"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistant de composition de message"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1122,3 +1122,6 @@ msgstr "Date de prochaine évaluation"
 #~ msgstr ""
 #~ "La date de la prochaine évaluation est calculée d'après les dates du plan "
 #~ "d'évaluation (première évaluation + périodicité)."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant de composition de message"
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index 3b8189eddca..7b0fed69eb7 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -299,7 +299,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 84c0e41a081..fc9cf1046dc 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index 7c0cac507ad..83d186f48c3 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -307,7 +307,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 88570f515ec..d594597d11b 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index fe0a401df2d..22a3d960d06 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -294,7 +294,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 2b3702fd658..7f1fb551eba 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index 200edd824c3..51cfa2747af 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/i18n/ja.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: 2012-04-24 04:53+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -304,8 +304,8 @@ msgstr "評価は先月、終了"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ツール"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -906,3 +906,6 @@ msgstr "査定要約"
 #: field:hr.employee,evaluation_date:0
 msgid "Next Appraisal Date"
 msgstr "次の査定日"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ツール"
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index af0e8156f7f..f4590c7a51e 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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -24,7 +24,7 @@ msgstr "Илгээгч нь үл мэдэгдэх товчоог менежер
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr "үнэлгээг эхлэх"
+msgstr "Үнэлгээг эхлэх"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
@@ -306,7 +306,7 @@ msgstr "Сүүлийн сард хийгдсэн үнэлгээ"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index 29110fdf86e..9d0ca66b3f4 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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -315,8 +315,8 @@ msgstr "Beoordelingen gedaan in aflelopen maand"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-mail opmaak wizard"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1230,3 +1230,6 @@ msgstr "Volgende beoordelingsdatum"
 #~ msgstr ""
 #~ "De datum van de volgende beoordeling wordt berekend door de beoordelingsplan "
 #~ "data (eerste beoordeling en periodiciteit)."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index b9cf7adf031..8c008a4fc17 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -315,8 +315,8 @@ msgstr "Avaliação efetuada no mês passado"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistente de composição de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -863,7 +863,7 @@ msgstr "É avaliavél?"
 #: code:addons/hr_evaluation/hr_evaluation.py:317
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr ""
+msgstr "Não pode arrancar uma avaliação sem Validação"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1128,3 +1128,6 @@ msgstr "Data da Próxima Avaliação"
 #~ msgstr ""
 #~ "A data da próxima avaliação é calculada por datas do plano de avaliação da "
 #~ "(primeira avaliação + periodicidade)."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de e-mail"
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index 8b90e71aa30..1548425b721 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: 2012-02-14 05:45+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -309,7 +309,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/ro.po b/addons/hr_evaluation/i18n/ro.po
index 74eda090f33..af22de89429 100644
--- a/addons/hr_evaluation/i18n/ro.po
+++ b/addons/hr_evaluation/i18n/ro.po
@@ -14,29 +14,29 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr "Trimite un rezumat anonim managerului"
+msgstr "Trimiteti un rezumat anonim managerului"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr ""
+msgstr "Incepeti Evaluarea"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that overpassed the deadline"
-msgstr ""
+msgstr "Evaluari care au depasit termenul limita"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
@@ -63,7 +63,7 @@ msgstr "Intarziere la incepere"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in waiting appreciation state"
-msgstr ""
+msgstr "Evaluari care se afla in starea de asteptare a aprecierii"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:244
@@ -76,13 +76,13 @@ msgstr "Avertisment !"
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr "Formular de apreciere"
+msgstr "Formular de evaluare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,day:0
@@ -92,7 +92,7 @@ msgstr "Zi"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,phase_ids:0
 msgid "Appraisal Phases"
-msgstr ""
+msgstr "Etapele Evaluarii"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -111,7 +111,7 @@ msgstr "Note"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Appraisal Name"
-msgstr ""
+msgstr "(nume_eval)s: Numele Evaluarii"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -122,27 +122,33 @@ msgid ""
 "manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
 "final evaluation by the manager."
 msgstr ""
+"Fiecarui angajat i se poate atribui un Plan de Evaluare. Un asemenea plan "
+"defineste frecventa si modul in care gestionati evaluarea periodica a "
+"personalului dumneavoastra. Veti putea sa definiti pasii si sa atasati "
+"interviuri fiecarui pas. OpenERP gestioneaza toate tipurile de evaluari: de "
+"jos in sus, de sus in jos, auto-evaluare si evaluarea finala de catre "
+"director."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr "Corp email"
+msgstr "Cuprins e-mail"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr "Asteapta Etapele Anterioare"
+msgstr "Asteptati Etapele Anterioare"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Appraisal"
-msgstr ""
+msgstr "Evaluarea Angajatului"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -161,12 +167,12 @@ msgstr "Apreciere"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr "Trimite managerilor"
+msgstr "Trimiteti directorilor"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr "Data de sfârşit"
+msgstr "Data de sfarsit"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
@@ -220,17 +226,17 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in Plan In Progress state"
-msgstr ""
+msgstr "Evaluari care sunt in Plan in starea In desfasurare"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Resetare ca Ciorna"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr "Data scadenta"
+msgstr "Termen limita"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -240,12 +246,12 @@ msgstr " Luna "
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In progress Evaluations"
-msgstr ""
+msgstr "Evaluari in desfasurare"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr "survey.request (cerere.sondaj)"
+msgstr "cerere.sondaj"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -281,12 +287,12 @@ msgstr "Angajat"
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "New"
-msgstr ""
+msgstr "Nou(a)"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr "Email"
+msgstr "E-Mail"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -305,22 +311,22 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in last month"
-msgstr ""
+msgstr "Evaluari efectuate in ultima luna"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data crearii"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr "Trimite toate raspunsurile managerului"
+msgstr "Trimiteti toate raspunsurile managerului"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -336,7 +342,7 @@ msgstr "Note publice"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Reminder Email"
-msgstr ""
+msgstr "Trimiteti Memento prin e-mail"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr_evaluation.evaluation,rating:0
@@ -346,17 +352,17 @@ msgstr "Apreciere"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr "Tipareste interviul"
+msgstr "Tipariti Interviul"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Pending"
-msgstr ""
+msgstr "In asteptare"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr "închis"
+msgstr "inchis"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -377,7 +383,7 @@ msgstr "Iulie"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr ""
+msgstr "Revedeti Planurile de Evaluare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -397,17 +403,17 @@ msgstr "Plan de actiune"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr ""
+msgstr "Evaluare Periodica"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal to close within the next 7 days"
-msgstr ""
+msgstr "Evaluarile vor fi inchise in urmatoarele 7 zile"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr "Rezumat sfarsit"
+msgstr "Sfarsit Rezumat"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -422,16 +428,19 @@ msgid ""
 "employee's Appraisal Plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
 msgstr ""
+"Cererile pentru Interviu sunt generate automat de OpenERP in functie de "
+"Planul de Evaluare al angajatului. Fiecare utilizator primeste automat e-"
+"mail-uri si cereri pentru a-si evalua colegii periodic."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr "În desfășurare"
+msgstr "In desfasurare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr "Cereri de interviu"
+msgstr "Cereri pentru Interviu"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
@@ -452,7 +461,7 @@ msgstr "Decembrie"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current year"
-msgstr ""
+msgstr "Evaluari efectuate in anul curent"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,month:0
@@ -462,7 +471,7 @@ msgstr "Luna"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -472,7 +481,7 @@ msgstr "Setari email"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr ""
+msgstr "Memento-uri Evaluari"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
@@ -491,17 +500,17 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr "Legendă"
+msgstr "Legenda"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Appraisal in (months)"
-msgstr ""
+msgstr "Prima Evaluare in (luni)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
@@ -519,12 +528,12 @@ msgstr "7 Zile"
 #: field:hr_evaluation.plan,name:0 field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Appraisal Plan"
-msgstr ""
+msgstr "Plan de Evaluare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Print Survey"
-msgstr ""
+msgstr "Tipariti Sondajul"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -545,7 +554,7 @@ msgstr "Semnificativ sub asteptari"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr " (employee_name)s: Nume partener"
+msgstr " (nume_angajat)s: Nume partener"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,plan_id:0
@@ -556,7 +565,7 @@ msgstr "Plan"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -566,7 +575,7 @@ msgstr "Noiembrie"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
@@ -576,7 +585,7 @@ msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Appraisal Plan Phase"
-msgstr ""
+msgstr "Etapa Plan de Evaluare"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -586,12 +595,12 @@ msgstr "Ianuarie"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Appraisal Interviews"
-msgstr ""
+msgstr "Interviuri de evaluare"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Date"
-msgstr "Dată"
+msgstr "Data"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -606,12 +615,12 @@ msgstr "Aceasta este aprecierea care rezuma evaluarea"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr "Acţiune"
+msgstr "Actiune"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr "Validare finală"
+msgstr "Validare finala"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -623,17 +632,17 @@ msgstr "In asteptarea aprecierii"
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Appraisal Analysis"
-msgstr ""
+msgstr "Analiza Evaluarilor"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Appraisal Deadline"
-msgstr ""
+msgstr "Termen limita Evaluari"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr "Rating(Evaluare) global(ă)"
+msgstr "Rating global"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
@@ -653,7 +662,7 @@ msgstr "Statistica evaluari"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr "Data scadentei"
+msgstr "Data termenului limita"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:45
@@ -665,11 +674,16 @@ msgid ""
 "\n"
 " Thanks,"
 msgstr ""
+"Buna ziua %s, \n"
+"\n"
+" Va rugam sa afisati raspunsul dumneavoastra pentru '%s' sondaj interviu. \n"
+"\n"
+"Va multumim,"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr "Cereri aprecieri de sus in jos"
+msgstr "Cereri de evaluare de sus in jos"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
@@ -679,6 +693,10 @@ msgid ""
 "OpenERP can automatically generate interview requests to managers and/or "
 "subordinates."
 msgstr ""
+"Puteti defini planurile de evaluare (de ex. primele interviuri dupa 6 luni, "
+"chiar in fiecare an). Apoi, fiecare angajat poate fi legat de un plan de "
+"evaluare astfel incat OpenERP sa poata genera automat cereri pentru interviu "
+"directorilor si/sau subordonatilor."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -688,12 +706,12 @@ msgstr "General"
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr "Trimite toate raspunsurile catre angajati"
+msgstr "Trimiteti toate raspunsurile angajatilor"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal Data"
-msgstr ""
+msgstr "Data Evaluarii"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
@@ -705,28 +723,28 @@ msgstr "Efectuat"
 #: 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 "Appraisal Plans"
-msgstr ""
+msgstr "Planuri de evaluare"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Appraisal Interview"
-msgstr ""
+msgstr "Interviu evaluare"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:49
 #, python-format
 msgid "Reminder to fill up Survey"
-msgstr ""
+msgstr "Memento pentru completarea Sondajului"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr "În desfasurare"
+msgstr "In curs de desfasurare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -736,17 +754,17 @@ msgstr "De efectuat"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Final Validation Evaluations"
-msgstr ""
+msgstr "Validare finala Evaluari"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr "Trimite mail pentru aceasta etapă"
+msgstr "Trimiteti e-mail pentru aceasta etapa"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr "Târziu"
+msgstr "Tarziu"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -759,6 +777,8 @@ msgid ""
 "The date of the next appraisal is computed by the appraisal plan's dates "
 "(first appraisal + periodicity)."
 msgstr ""
+"Data urmatoarei evaluari este calculata de datele planului de evaluare "
+"(prima evaluare + periodicitate)."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
@@ -777,17 +797,17 @@ msgstr ""
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Appraisal (months)"
-msgstr ""
+msgstr "Periodicitatea Evaluarii (luni)"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr "Cereri de auto evaluare"
+msgstr "Cereri de Auto evaluare"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr "Formulare de apreciere (evaluare)"
+msgstr "Formulare de evaluare"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -807,12 +827,12 @@ msgstr "Interviul final"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr "Cereri de apreciere (evaluare) de jos in sus"
+msgstr "Cereri de evaluare de jos in sus"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:244
@@ -832,28 +852,28 @@ msgstr "Februarie"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr ""
+msgstr "Interviu Evaluare"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Appraisal?"
-msgstr ""
+msgstr "Este Evaluare?"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:317
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr ""
+msgstr "Nu puteti incepe evaluarea fara Apreciere."
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current month"
-msgstr ""
+msgstr "Evaluari efectuate in luna curenta"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr "Angajat de intervievat"
+msgstr "Angajatul care va fi intervievat"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -863,27 +883,27 @@ msgstr "Aprilie"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Appraisal Plan Phases"
-msgstr ""
+msgstr "Etapele Planului de Apreciere"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Appraisal"
-msgstr ""
+msgstr "Validati Aprecierea"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Search Appraisal"
-msgstr ""
+msgstr "Cautati Aprecierea"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr "(user_signature)s: Nume utilizator"
+msgstr "(semnatura_utilizator)s: Nume utilizator"
 
 #. module: hr_evaluation
 #: view:board.board:0
@@ -891,12 +911,12 @@ msgstr "(user_signature)s: Nume utilizator"
 #: 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 "Cereri interviu"
+msgstr "Cereri pentru interviu"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr "Creează data"
+msgstr "Data Crearii"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,year:0
@@ -906,12 +926,12 @@ msgstr "An"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Appraisal Summary"
-msgstr ""
+msgstr "Rezumat Apreciere"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Appraisal Date"
-msgstr ""
+msgstr "Data Urmatoarei Aprecieri"
 
 #~ msgid "My Evaluation Remaining"
 #~ msgstr "Evaluarea mea ramasa"
@@ -1090,3 +1110,6 @@ msgstr ""
 
 #~ msgid "Evaluation"
 #~ msgstr "Evaluare"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 121e8eb0f03..521fe1fe251 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -309,7 +309,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index d02e8980dcc..3d637cff993 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 5200065d63a..05337d70126 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index deb54bf3348..bbf03f20dc0 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -48,7 +48,7 @@ msgstr ""
 #: field:hr.evaluation.report,progress_bar:0
 #: field:hr_evaluation.evaluation,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Förlopp"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -70,13 +70,13 @@ msgstr ""
 #: code:addons/hr_evaluation/hr_evaluation.py:317
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. 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 "Bolag"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
@@ -87,7 +87,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,phase_ids:0
@@ -104,7 +104,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.employee:0
 msgid "Notes"
-msgstr ""
+msgstr "Anteckningar"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -140,7 +140,7 @@ msgstr ""
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index d6655899948..2bd1180ca30 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: 2012-02-09 06:52+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -289,7 +289,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index bac71204f3a..d05c1919bf2 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.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: 2012-05-11 05:07+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -303,8 +303,8 @@ msgstr "上个月完成的评估"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -1181,3 +1181,6 @@ msgstr "下一个评估日期"
 
 #~ msgid "Evaluation Send Mail"
 #~ msgstr "发送邮件"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 6df675552b0..703060e792e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -14,7 +14,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount" sum="Total"/>
@@ -97,7 +97,7 @@
                                     </group>
                                     <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
                                         <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
+                                        <field domain="[('type','in',['normal','contract'])]" name="analytic_account"/>
                                     </group>
                                     <group colspan="2" col="2">
                                         <separator string="References" colspan="2"/>
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index 23ae902148b..d1e33173f77 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -25,5 +25,5 @@ class human_resources_configuration(osv.osv_memory):
     _inherit = 'hr.config.settings'
     _columns = {
         'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
-            help ="""This installs the module hr_payroll_account."""),
+            help ="""Create Journal Entries from Payslips"""),
     }
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c2f760d8864..051c720667b 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,9 +7,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_holidays" position="after">
+                <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
+                <xpath expr="//field[@name='module_hr_payroll']/.." position="after">
                     <field name="module_hr_payroll_account"/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 6fe0a7b88dd..4818d280879 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -28,9 +28,9 @@ class hr_applicant_settings(osv.osv_memory):
     _columns = {
         'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
-                This installs the module document_ftp."""),
-        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
-            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',                                            
+                This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
+        'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails',
+            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
             help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
                 and create automatically application documents in the system."""),
     }
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 659aa586d56..011e3816c2c 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,12 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="config_recruitment" position="after">
-                    <separator  string="Recruitment" colspan="4"/>
-                    <field name="module_document_ftp"/>
-                    <newline/>
-                    <field name="fetchmail_applicants"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
+                <group name="config_recruitment" position="replace">
+                    <group name="config_recruitment" string="Recruitment">
+                        <field name="module_document_ftp"/>
+                        <label for="fetchmail_applicants"/>
+                        <div>
+                            <field name="fetchmail_applicants"/>
+                            <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                                attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 12fbbcdedef..66911f25ff5 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -190,4 +190,15 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
+class account_analytic_account(osv.osv):
+
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    
+    _columns = {
+        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
+    }
+
+account_analytic_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index 3ec7664bcb7..077aaf6179c 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -12,6 +12,18 @@
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
+        <record id="account.analytic_administratif" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+         <record id="account.analytic_partners" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="account.analytic_consultancy" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
+        <record id="account.analytic_super_product_trainings" model="account.analytic.account">
+            <field name="use_timesheets">True</field>
+        </record>
 
         <record id="working_hours_requirements" model="hr.analytic.timesheet">
             <field name="name">Requirements analysis and specification</field>
@@ -20,7 +32,7 @@
             <field eval="2.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -33,7 +45,7 @@
             <field eval="1.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -46,7 +58,7 @@
             <field eval="03.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -59,7 +71,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
@@ -72,7 +84,7 @@
             <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
-            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 53def628bfe..a8a361ed633 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -12,7 +12,7 @@
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
@@ -78,6 +78,21 @@
             </field>
 
         </record>
+        
+        <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_timesheets"/>
+                </xpath>
+            </field>
+        </record>
 
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Timesheet Lines</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 0a58efb782b..f1138d7b246 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,39 +63,58 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'pricelist_id': fields.many2one('product.pricelist', 'Customer Pricelist',
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
             help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price',
             help="Keep empty if this contract is not limited to a total fixed price."),
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoice on Timesheet & Costs',
-            help="Fill this field if you plan to automatically generate invoices based " \
-            "on the costs in this analytic account: timesheets, expenses, ..." \
-            "You can configure an automatic invoice rate on analytic accounts."),
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
+            help="This field allows you to define the rate in case you plan to reinvoice " \
+            "the costs in this analytic account: timesheets, expenses, ..."),
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
-        res={}
-        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+
+    def on_change_use_timesheets(self, cr, uid, ids, use_timesheets, context=None):
+        res = {'value': {}}
+        if use_timesheets:
+            ir_model_obj = self.pool.get('ir.model.data')
+            res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
+        return res
+
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
+        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:
-            res['pricelist_id'] = pricelist
-        return {'value': res}
+            res['value']['pricelist_id'] = pricelist
+        return res
 
     def set_close(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+        self.write(cr, uid, ids, {'state':'close'}, context=context)
+        message = _("Contract has been <b>closed</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        message = _("Contract has been <b>cancelled</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_open(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        message = _("Contract has been <b>opened</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
     def set_pending(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        message = _("Contract has been set as <b>pending</b>.")
+        self.message_append_note(cr, uid, ids, body=message, context=context)
+        return True
 
 account_analytic_account()
 
@@ -107,10 +126,6 @@ class account_analytic_line(osv.osv):
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
     }
 
-    def unlink(self, cursor, user, ids, context=None):
-        return super(account_analytic_line,self).unlink(cursor, user, ids,
-                context=context)
-
     def write(self, cr, uid, ids, vals, context=None):
         self._check_inv(cr, uid, ids, vals)
         return super(account_analytic_line,self).write(cr, uid, ids, vals,
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 51743733cd5..64e0ef592b7 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -5,28 +5,23 @@
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="priority">30</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="on_change_partner_id(partner_id, context)"/>
-                </field>
-                <group name="contract" position="after">
-                    <group name="invoice_data">
-                        <separator colspan="2" string="Invoicing Data"/>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <group string="Invoice on Timesheets Options" name="invoice_on_timesheets" col="4">
+                        <field name="pricelist_id" />
                         <field name="to_invoice" widget="selection"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
-                        <field name="amount_max"/>
                     </group>
-                    <group name="invoice_stats">
-                        <separator colspan="4" string="Invoicing Statistics"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </group>
+                 </xpath>
+                <xpath expr="//field[@name='use_timesheets']" position="replace">
+                    <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
+                </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
                         <button name="set_pending" string="Pending" type="object" states="open"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending" class="oe_highlight"/>
+                        <button name="set_open" string="Re-open Project" type="object" states="draft,cancelled,close,pending" class="oe_highlight"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
@@ -57,7 +52,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -80,9 +75,8 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
-
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 0167d4b959e..3462f6603c5 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -387,7 +387,7 @@
         src_model="res.users"/>
 
         <act_window
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}"
             id="act_account_analytic_account_2_report_timehsheet_account"
             name="Timesheets"
             res_model="hr.analytic.timesheet"
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index f545edcb899..89d8fa1857e 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -133,10 +133,10 @@
         </record>
 
         <act_window
-        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-        context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
+        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False), ('journal_id.type', '=', 'general')]"
+        context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
         id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
-        name="Lines to Invoice"
+        name="Timesheet Lines to Invoice"
         res_model="account.analytic.line"
         src_model="account.analytic.account"/>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 663fc9b58de..4c8915c558c 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -14,6 +14,7 @@
                 </header>
                 <notebook>
                     <page string="Billing Data">
+                       <group>
                        <group string="Do you want to show details of work in invoice?">
                            <field name="date"/>
                            <field name="time"/>
@@ -23,6 +24,11 @@
                        <group  string="Force to use a specific product">
                            <field name="product"/>
                        </group>
+                       <group colspan="4">
+                          <button special="cancel" string="Cancel" icon='gtk-cancel' colspan="1"/>
+                          <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
+                       </group>
+                       </group>
                     </page>
                 </notebook>
             </form>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f62016fb026..835b447592f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -99,7 +99,7 @@
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
                                     <field invisible="1" name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice" widget="selection"/>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 6d8c998eec7..61ebee2412b 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -8,9 +8,8 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_timesheet_sheet" position="after">
-                    <newline/>
-                    <field name="timesheet_range" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                    <field name="timesheet_max_difference" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
                 </field>
             </field>
         </record>
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
index 44243aa952c..8bcda79c64e 100644
--- a/addons/import_base/import_framework.py
+++ b/addons/import_base/import_framework.py
@@ -30,7 +30,7 @@ import logging
 import StringIO
 import traceback
 pp = pprint.PrettyPrinter(indent=4)
-
+_logger = logging.getLogger(__name__)
 
 
 
@@ -60,7 +60,6 @@ class import_framework(Thread):
         self.context = context or {}
         self.email = email_to_notify
         self.table_list = []
-        self.logger = logging.getLogger(module_name)
         self.initialize()
 
     """
@@ -165,7 +164,7 @@ class import_framework(Thread):
                 data_i is a map external field_name => value
                 and each data_i have a external id => in data_id['id']
         """
-        self.logger.info(' Importing %s into %s' % (table, model))
+        _logger.info(' Importing %s into %s' % (table, model))
         if not datas:
             return (0, 'No data found')
         mapping['id'] = 'id_new'
@@ -188,7 +187,7 @@ class import_framework(Thread):
         model_obj = self.obj.pool.get(model)
         if not model_obj:
             raise ValueError(_("%s is not a valid model name") % model)
-        self.logger.debug(_(" fields imported : ") + str(fields))
+        _logger.debug(_(" fields imported : ") + str(fields))
         (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
         for (field, field_name) in self_dependencies:
             self._import_self_dependencies(model_obj, field, datas)
@@ -431,9 +430,9 @@ class import_framework(Thread):
             'auto_delete' : True})
         email_obj.send(self.cr, self.uid, [email_id])
         if error:
-            self.logger.error(_("Import failed due to an unexpected error"))
+            _logger.error(_("Import failed due to an unexpected error"))
         else:
-            self.logger.info(_("Import finished, notification email sended"))
+            _logger.info(_("Import finished, notification email sended"))
 
     def get_email_subject(self, result, error=False):
         """
diff --git a/addons/import_google/i18n/sv.po b/addons/import_google/i18n/sv.po
new file mode 100644
index 00000000000..73506190503
--- /dev/null
+++ b/addons/import_google/i18n/sv.po
@@ -0,0 +1,219 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-27 11:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-28 04:41+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Leverantör"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Importalternativ"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Gruppnamn"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Ärendekategori"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importera Googlekontakter"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Importera Google-data"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Mötestyp"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vänligen installera gdata-python-client från http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Google-kontakt"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Kund"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "synchronize.google.import"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Fel"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Varning !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Alternativ"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontaktimportfel!"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Kalendernamn"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr ""
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py
index 35103a41173..df2aa386992 100644
--- a/addons/import_sugarcrm/sugar.py
+++ b/addons/import_sugarcrm/sugar.py
@@ -33,7 +33,7 @@ import import_sugarcrm
 import logging
 
 import sys
-
+_logger = logging.getLogger(__name__)
 
 debug = False
 
@@ -119,7 +119,7 @@ def get_contact_by_email(portType, username, password, email_address=None):
                 email_list.append(list.Email_address)
         return email_list
     except Exception,e:
-        logging.getLogger('sugarcrm_soap').error('Exception: %s\n' % (tools.ustr(e)))
+        _logger.error('Exception: %s\n' % (tools.ustr(e)))
         return False
 
 def get_document_revision_search(portType, sessionid, module_id=None):
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 23d3d9d0f6c..80d13e6283a 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,21 +8,22 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <newline/>
-                    <separator string="Wiki" colspan="4"/>
-                    <field name="module_wiki_faq"/>
-                    <newline/>
-                    <field name="module_wiki_quality_manual"/>
-
-                    <separator string="Documents" colspan="4"/>
-                    <field name="module_document"/>
-                    <newline/>
-                    <field name="module_document_ftp"/>
-                    <newline/>
-                    <field name="module_document_webdav"/>
+                    <sheet>
+                        <group>
+                            <group string="Wiki">
+                                <field name="module_wiki_faq"/>
+                                <field name="module_wiki_quality_manual"/>
+                            </group>
+                            <group string="Documents">
+                                <field name="module_document"/>
+                                <field name="module_document_ftp"/>
+                                <field name="module_document_webdav"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 997036c0cec..4cdbca84c0a 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -23,8 +23,8 @@
 import re, time, random
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 """
 account.invoice object:
@@ -41,7 +41,7 @@ class account_invoice(osv.osv):
                 context=context)
         res[[i for i,x in enumerate(res) if x[0] == 'none'][0]] = ('none', 'Free Communication')
         res.append(('bba', 'BBA Structured Communication'))
-        #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'reference_type =  %s' %res ) 
+        #l_logger.warning('reference_type =  %s' %res ) 
         return res
 
     def check_bbacomm(self, val):
@@ -68,7 +68,7 @@ class account_invoice(osv.osv):
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
-#        logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'partner_id %s' % partner_id)
+#        _logger.warning('partner_id %s' % partner_id)
         reference = False
         reference_type = 'none'
         if partner_id:        
@@ -215,5 +215,5 @@ class account_invoice(osv.osv):
         ]
 
 account_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 04a51c3a6ab..8951be5dfa2 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -24,8 +24,6 @@
 from osv import fields, osv
 import time
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
 
 class res_partner(osv.osv):  
     """ add field to indicate default 'Communication Type' on customer invoices """
diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako
index 96d94bedc6e..b3412032cba 100644
--- a/addons/l10n_ch/report/bvr.mako
+++ b/addons/l10n_ch/report/bvr.mako
@@ -116,7 +116,7 @@
                <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
                %endif
                %if inv.partner_id.email :
-               <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
+               <tr><td>${_("Email") |entity}: ${inv.partner_id.email|entity}</td></tr>
                %endif
                %if inv.partner_id.vat :
                <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako
index 369799c0d44..cd6e2df6c26 100644
--- a/addons/l10n_ch/report/report_webkit_html.mako
+++ b/addons/l10n_ch/report/report_webkit_html.mako
@@ -23,7 +23,7 @@
            <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
            %endif
            %if inv.partner_id.email :
-           <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
+           <tr><td>${_("Email") |entity}: ${inv.partner_id.email|entity}</td></tr>
            %endif
            %if inv.partner_id.vat :
            <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
diff --git a/addons/l10n_ch/report/report_webkit_html_view.xml b/addons/l10n_ch/report/report_webkit_html_view.xml
index 19f73715f98..936837348e4 100644
--- a/addons/l10n_ch/report/report_webkit_html_view.xml
+++ b/addons/l10n_ch/report/report_webkit_html_view.xml
@@ -42,7 +42,7 @@
                             <td>${company.partner_id and company.partner_id.street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id and company.partner_id.fax or ''|entity} </td><td></td>
                         </tr>
                         <tr>
-                            <td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td>
+                            <td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('email')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td>
                         </tr>
                         <tr>
                             <td>${company.partner_id and company.partner_id.country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index c4130f2761d..c4c6be74e4b 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -22,8 +22,8 @@
 from osv import fields, osv
 import os
 from tools.translate import _
-import netsvc
-logger=netsvc.Logger()
+import logging
+_logger = logging.getLogger(__name__)
 
 class wizard_multi_charts_accounts(osv.osv_memory):
     """
@@ -80,8 +80,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         if context.get('lang') == lang:
                             self.pool.get(out_obj._name).write(cr, uid, out_ids[j], {in_field: value[in_id]})
                 else:
-                    logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING,
-                             'Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
+                    _logger.info('Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
         return True
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/lunch/i18n/sv.po b/addons/lunch/i18n/sv.po
new file mode 100644
index 00000000000..573459469b5
--- /dev/null
+++ b/addons/lunch/i18n/sv.po
@@ -0,0 +1,552 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-27 11:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current year"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "Lunchorder"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "Bekräfta order"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 Dagar    "
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0
+msgid "Today"
+msgstr "Idag"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "March"
+msgstr "mars"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Totalt :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0 view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "Avbryt order"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_create_cashbox
+msgid ""
+"You can create on cashbox by employee if you want to keep track of the "
+"amount due by employee according to what have been ordered."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Belopp"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0
+msgid "Products"
+msgstr "Produkter"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Månad   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0 selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "New"
+msgstr "Ny"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Totalt belopp"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Registeringsdatum"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in last month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0 view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "Bekräfta order"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
+msgid "Box"
+msgstr "Låda"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 dagar  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Månad-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Registreringsdatum"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 365 days"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "April"
+msgstr "april"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "September"
+msgstr "september"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "December"
+msgstr "december"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0 view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr "Ja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0
+#: view:lunch.order:0 field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Produktkategorier"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0
+msgid "No"
+msgstr "Nej"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
+msgid ""
+"Define all products that the employees can order for the lunch time. If you "
+"order lunch at several places, you can use the product categories to split "
+"by supplier. It will be easier for the lunch manager to filter lunch orders "
+"by categories."
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "August"
+msgstr "augusti"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Lunchorderanalys"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "June"
+msgstr "juni"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "Användarnamn"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Försäljningsanalys"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "Lunch"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.order:0
+msgid "User"
+msgstr "Användare"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "November"
+msgstr "november"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "October"
+msgstr "oktober"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "January"
+msgstr "januari"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0 field:lunch.product,active:0
+msgid "Active"
+msgstr "Aktiva"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "General Information"
+msgstr "Allmän information"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " Kassalådor "
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "Styckpris"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "May"
+msgstr "maj"
+
+#. module: lunch
+#: field:lunch.order,price:0 field:lunch.product,price:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "February"
+msgstr "februari"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0 field:lunch.category,name:0
+#: field:lunch.product,name:0 field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Totalt belopp"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 30 days"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category Related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "Kassalådor"
+
+#. module: lunch
+#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
+msgid "Order"
+msgstr "Order"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Lunchorder"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
+msgid "Define Your Lunch Products"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks during last 7 days"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Chef"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 dagar   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0 view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_create_cashbox
+msgid "Create Lunch Cash Boxes"
+msgstr ""
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index 82b7c93a426..484e83e503a 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 23bddbb9115..52fb512fa19 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index cd92c07776f..482051e0fa5 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 95822b49591..73ac9cbaa61 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 305018c660f..ba2116c982a 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,8 +193,8 @@ msgstr "Empfänger"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -521,6 +521,9 @@ msgstr "Bevorzugte Antwortadresse für diese Nachricht"
 #~ msgid "Text contents"
 #~ msgstr "Text Inhalt"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
+
 #~ msgid "Related Document model"
 #~ msgstr "zugehöriges Dokumenten-Modell"
 
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index ccd7d594a3b..35d8b2de735 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Destinatarios"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -521,6 +521,9 @@ msgstr ""
 #~ msgid "Related Document model"
 #~ msgstr "Model de documento relacionado"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
+
 #~ msgid "Related user"
 #~ msgstr "Usuario relacionado"
 
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index ad9653a47a2..68c60c7f3b4 100644
--- a/addons/mail/i18n/es_CR.po
+++ b/addons/mail/i18n/es_CR.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: mail
@@ -196,8 +196,8 @@ msgstr "Destinatarios"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -526,6 +526,9 @@ msgstr "Dirección de respuesta preferida para el mensaje"
 #~ msgid "Text contents"
 #~ msgstr "Contenido del Texto"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
+
 #~ msgid "Related Document model"
 #~ msgstr "Modelo de documento relacionado"
 
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index a27788c0236..c64b3e79ee5 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index f2f5a65d1f7..5a983c5c7c8 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Vastaanottajat"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Ohjattu sähköpostin luomistoiminto"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -534,3 +534,6 @@ msgstr "Ehdotettu vastausosoite viestille"
 
 #~ msgid "Text contents"
 #~ msgstr "Tekstisisältö"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Ohjattu sähköpostin luomistoiminto"
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 0912a3e8762..96dd222a369 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/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: 2012-06-23 05:02+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -196,8 +196,8 @@ msgstr "Destinataires"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistant de composition de courriels"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -531,6 +531,9 @@ msgstr "Adresse de réponse préférée pour le message"
 #~ msgid "Message type"
 #~ msgstr "Type de message"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant de composition de courriels"
+
 #~ msgid "Related user"
 #~ msgstr "Utilisateur associé"
 
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index 7c4d8f75506..69c7f8ea660 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 21c5ecbc73e..2a5bee0ebe2 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 377fb4c457d..e07bfae3ef0 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 8eb74992412..039faf5f96a 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 479c783ca64..59a9fc26af1 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.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: 2012-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,8 +193,8 @@ msgstr "宛先"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ウィザード"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -509,3 +509,6 @@ msgstr "メール添付"
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
 msgstr "メッセージの優先返信アドレス"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ウィザード"
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 27e2947ad94..1a2cbe75aee 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index c1d3ca7c86e..b35f42dda85 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index d7095324a88..946da6dd6b6 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -194,7 +194,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index eafd5835b9f..1ca91c71fbf 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.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: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 21b4603e769..29cf349d0a8 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Ontvangers"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-mail opmaak wizard"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -528,6 +528,9 @@ msgstr "Voorkeur antwoordadres voor het bericht"
 #~ msgid "Related Document model"
 #~ msgstr "Gerelateerde Document model"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
+
 #~ msgid "Rich-text contents"
 #~ msgstr "Rich-tekst inhoud"
 
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 581728c2bca..6fdfeee06f1 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr "Odbiorcy"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 5b0761309e2..29e652ae11f 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Destinatários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistente de composição de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -524,6 +524,9 @@ msgstr "Endereço de resposta preferido para a mensagem"
 #~ msgid "Text contents"
 #~ msgstr "Conteúdos do texto"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de e-mail"
+
 #~ msgid "Related Document model"
 #~ msgstr "Modelo de documento relacionado"
 
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 30e99849841..b53bc7eb6d0 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index 30d672f9cbf..311e58a449e 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Destinatari"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistent compunere e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -328,7 +328,7 @@ msgstr " in data de "
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
-"Sterge definitiv acest mesaj dupa de il trimite, pentru a economisi spatiu"
+"Sterge definitiv acest mesaj dupa ce il trimite, pentru a economisi spatiu"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -526,6 +526,9 @@ msgstr "Adresa de raspuns preferata pentru mesaj"
 #~ msgid "Related Document model"
 #~ msgstr "Model Document asociat"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
+
 #~ msgid "Rich-text contents"
 #~ msgstr "Continuturi rich-text (text imbogatit)"
 
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 09df03bad68..49d9fd4fb86 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index e0cb4f4a43f..5457aa3537f 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index d47daaa5940..81b828239b8 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,7 +193,7 @@ msgstr ""
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index ded9b21fd93..aa8781d7966 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,12 +26,12 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Permanent radera e-post efter att de skickats"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Öppna relaterade dokument"
 
 #. module: mail
 #: view:mail.message:0
@@ -41,12 +41,12 @@ msgstr "Öppna bifogade filer"
 #. module: mail
 #: view:mail.message:0
 msgid "Message Details"
-msgstr ""
+msgstr "Meddelandedetaljer"
 
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Kommunikationshitoria"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,24 +57,24 @@ msgstr "Gruppera på..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Skriv e-post"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Textversion av meddelandet"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Mottagare"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
@@ -85,45 +85,45 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Mottaget"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Tråd"
 
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Utgående mailserver"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Svar till"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Utsmyckad text/HTML-version av meddelandet"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Autoradera"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Blindkopiemottagare"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -140,7 +140,7 @@ msgstr "Ämne"
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Vid %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "Från"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "E-postmeddelande"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Skicka"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Misslyckades"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Tillstånd"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Besvara"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Skickat"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,33 +185,35 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Typ av meddelande, vanligtvis \"html\" eller \"vanligt\", används för att "
+"välja klartext eller utsmyckad text i överensstämmelse härmed"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Mottagare"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID relaterat dokument"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avancerat"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -227,12 +229,12 @@ msgstr "Månad"
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr ""
+msgstr "Sök e-post"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Originalversion av meddelandet, som det var sänt på nätverket"
 
 #. module: mail
 #: view:mail.message:0
@@ -242,27 +244,27 @@ msgstr "Partner namn"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Försök igen"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Utgående"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Skicka nu"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Relaterat företag"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,13 +275,13 @@ msgstr "Datum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s skrev:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
@@ -290,7 +292,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Ursprunglig"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -302,19 +304,19 @@ msgstr "Historik"
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Meddelande-id"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
 #: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #. module: mail
 #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
 #: field:mail.message.common,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Kopia"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:159
@@ -326,12 +328,13 @@ msgstr " på "
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Radera detta meddelande permanent efter avsändandet för att spara plats"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
 #: field:mail.message.common,references:0
 msgid "References"
-msgstr ""
+msgstr "Referenser"
 
 #. module: mail
 #: field:mail.message,display_text:0
@@ -341,18 +344,18 @@ msgstr "Visa text"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
@@ -366,11 +369,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Fullständiga meddelanderubriker, t ex SMTP-sessionsrubriker (vanligtvis "
+"endast förekommande på inkommande meddelanden)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Månad skapad"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +392,7 @@ msgstr "Detaljer"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "E-posttrådar"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +401,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Avsändaren, tagen från användarens preferenser. Om den är tom är detta inte "
+"en e-post men ett meddelande."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Brödtext (textversion)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Du"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Meddelandets unika identifierare"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Brödtext (utsmyckad)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +434,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s skrev på %s: \n"
+" Ämne: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -451,58 +461,79 @@ msgstr ""
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Blindkopia"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Meddelandereferens, som identifierar tidigare meddelanden"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Blindkopiemottagare"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Leverans misslyckades"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "E-postmeddelande"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "E-posttråd"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "E-postbilaga"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Föredragen svarsadress för meddelandet"
+
+#~ msgid "Message type"
+#~ msgstr "Meddelandetyp"
+
+#~ msgid "Text contents"
+#~ msgstr "Textinnehåll"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-post editor"
+
+#~ msgid "Related Document model"
+#~ msgstr "Modell för relaterade dokument"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Innehåll med utsmyckad text"
+
+#~ msgid "Related user"
+#~ msgstr "Relaterad användare"
+
+#~ msgid "Message headers"
+#~ msgstr "Meddelanderubriker"
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 23017beedcc..7a4bb1e9787 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -195,8 +195,8 @@ msgstr "Alıcılar"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-posta oluşturma sihirbazı"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -516,6 +516,9 @@ msgstr "Posta Eki"
 msgid "Preferred response address for the message"
 msgstr "Mesaj için tercih edilen cevap adresi"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-posta oluşturma sihirbazı"
+
 #~ msgid "Rich-text contents"
 #~ msgstr "Zengin-metin İçerik"
 
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 488b0a3672a..f5ce2add8e3 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -193,8 +193,8 @@ msgstr "收件人"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -519,6 +519,9 @@ msgstr "本邮件推荐的回复地址"
 #~ msgid "Related Document model"
 #~ msgstr "相关单据模型"
 
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
+
 #~ msgid "Rich-text contents"
 #~ msgstr "富文本内容"
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f86ae29c80f..1c1e980e3ed 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -36,7 +36,7 @@ from osv import fields
 from tools.translate import _
 from openerp import SUPERUSER_ID
 
-_logger = logging.getLogger('mail')
+_logger = logging.getLogger(__name__)
 
 def format_date_tz(date, tz=None):
     if not date:
@@ -202,10 +202,10 @@ class mail_message(osv.osv):
     
     _columns = {
         'type': fields.selection([
-                        ('email', 'e-mail'),
+                        ('email', 'email'),
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
-                        ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
+                        ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related User', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -228,7 +228,7 @@ class mail_message(osv.osv):
     }
     
     #------------------------------------------------------
-    # E-Mail api
+    # Email api
     #------------------------------------------------------
     
     def init(self, cr):
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 52b72127b78..7dbaea098dc 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -10,7 +10,7 @@
             <field name="name">mail.subscription.tree</field>
             <field name="model">mail.subscription</field>
             <field name="type">tree</field>
-            <field name="sequence">10</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="res_model"/>
@@ -28,7 +28,7 @@
             <field name="name">mail.notification.tree</field>
             <field name="model">mail.notification</field>
             <field name="type">tree</field>
-            <field name="sequence">10</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="user_id"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 0f404155f42..e0f2bfaf455 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,9 +68,14 @@ class mail_thread(osv.osv):
             res[id] = self.message_load_ids(cr, uid, [id], context=context)
         return res
 
+    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
+        msg_obj = self.pool.get('mail.message')
+        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
+        return [('id', 'in', msg_ids)]
+
     # OpenChatter: message_ids is a dummy field that should not be used
     _columns = {
-        'message_ids': fields.function(_get_message_ids, method=True,
+        'message_ids': fields.function(_get_message_ids, method=True, fnct_search=_search_message_ids,
                         type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
     }
 
@@ -294,7 +299,7 @@ class mail_thread(osv.osv):
                 }
                 to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
 
-            partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
+            partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
             if not partner_id and thread._name == 'res.partner':
                 partner_id = thread.id
             data = {
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 2223d9e162a..f62e29fb44d 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -36,7 +36,7 @@ class res_users(osv.osv):
                         ('comments', 'Only comments'),
                         ('to_me', 'Only when sent directly to me'),
                         ('none', 'Never')
-                        ], 'Receive Feeds by E-mail', required=True,
+                        ], 'Receive Feeds by Email', required=True,
                         help="Choose in which case you want to receive an email when you receive new feeds."),
     }
     
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index dd07cbce9b2..cb2ed1eec19 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -34,7 +34,7 @@ from ..mail_message import to_email
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
 class mail_compose_message(osv.osv_memory):
-    """Generic E-mail composition wizard. This wizard is meant to be inherited
+    """Generic Email composition wizard. This wizard is meant to be inherited
        at model and view level to provide specific wizard features.
 
        The behavior of the wizard can be modified through the use of context
@@ -58,7 +58,7 @@ class mail_compose_message(osv.osv_memory):
     """
     _name = 'mail.compose.message'
     _inherit = 'mail.message.common'
-    _description = 'E-mail composition wizard'
+    _description = 'Email composition wizard'
 
     def default_get(self, cr, uid, fields, context=None):
         """Overridden to provide specific defaults depending on the context
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index acbfc4ad9ba..83053afe614 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -8,10 +8,10 @@
             <field name="arch" type="xml">
                 <form string="Configure Marketing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4" string="Campaigns">
+                    <group string="Campaigns">
                         <field name="module_marketing_campaign"/>
                         <field name="module_marketing_campaign_crm_demo"/>
                         <field name="module_crm_profiling"/>
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 973a716351f..a1c06f6037d 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -491,7 +491,7 @@ msgstr ""
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
-msgid "The e-mail to send when this activity is activated"
+msgid "The email to send when this activity is activated"
 msgstr ""
 
 #. module: marketing_campaign
@@ -837,7 +837,7 @@ msgstr ""
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: marketing_campaign
@@ -957,7 +957,7 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
-msgid "Campaign Followup"
+msgid "Campaign Follow-up"
 msgstr ""
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 1e87925bdf3..a6294182301 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -392,7 +392,7 @@ class marketing_campaign_activity(osv.osv):
     _description = "Campaign Activity"
 
     _action_types = [
-        ('email', 'E-mail'),
+        ('email', 'Email'),
         ('report', 'Report'),
         ('action', 'Custom Action'),
         # TODO implement the subcampaigns.
@@ -423,7 +423,7 @@ class marketing_campaign_activity(osv.osv):
    - Report: print an existing Report defined on the resource item and save it into a specific directory
    - Custom Action: execute a predefined action, e.g. to modify the fields of the resource record
   """),
-        'email_template_id': fields.many2one('email.template', "Email Template", help='The e-mail to send when this activity is activated'),
+        'email_template_id': fields.many2one('email.template', "Email Template", help='The email to send when this activity is activated'),
         'report_id': fields.many2one('ir.actions.report.xml', "Report", help='The report to generate when this activity is activated', ),
         'report_directory_id': fields.many2one('document.directory','Directory',
                                 help="This folder is used to store the generated reports"),
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index aa8ea08217e..b10c57e4169 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -421,7 +421,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Followup</field>
+        <field name="name">Campaign Follow-up</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>
@@ -442,7 +442,7 @@
         context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
     />
 
-    <!-- Campaign Followups -->
+    <!-- Campaign Follow-ups -->
     <act_window
         context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
         id="act_marketing_campaing_followup"
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 1b7a7fa2ae3..4151fa44457 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -42,37 +42,37 @@
     record = self.browse(cr, uid, ids[0])
     assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
 -
-  I check followup detail of first activity.
+  I check follow-up detail of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
     ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
-    assert ids, 'Followup item is not created for first activity.'
+    assert ids, 'Follow-up item is not created for first activity.'
     work_item_id = self.browse(cr ,uid ,ids[0] ,context)
     assert work_item_id.res_name, 'Resource Name is not defined.'
 -
-  I process followup of first activity.
+  I process follow-up of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
     ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
     self.process(cr, uid, ids)
     record = self.browse(cr, uid, ids)[0]
-    assert record.state == "done", "Followup item should be closed after process."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
-  I check followup detail of second activity after process of first activity.
+  I check follow-up detail of second activity after process of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
     ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
-    assert ids, 'Followup item is not created for second activity.'
+    assert ids, 'Follow-up item is not created for second activity.'
 -
   Now I increase credit limit of customer
 -
   !python {model: res.partner}: |
     self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':41000}, context=context)
 -
-  I process followup of second activity after set draft.
+  I process follow-up of second activity after set draft.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -80,21 +80,21 @@
     self.button_draft(cr, uid, ids, context=context)
     self.process(cr, uid, ids, context=context)
     record = self.browse(cr, uid, ids[0], context=context)
-    assert record.state == "done", "Followup item should be closed after process."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
-  I check followup detail of third activity after process of second activity.
+  I check follow-up detail of third activity after process of second activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
     ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
-    assert ids, 'Followup item is not created for third activity.'
+    assert ids, 'Follow-up item is not created for third activity.'
 -
   Now I increase credit limit of customer
 -
   !python {model: res.partner}: |
     self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':151000}, context=context)
 -
-  I process followup of third activity after set draft.
+  I process follow-up of third activity after set draft.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -102,7 +102,7 @@
     self.button_draft(cr, uid, ids, context=context)
     self.process(cr, uid, ids, context=context)
     record = self.browse(cr, uid, ids[0], context=context)
-    assert record.state == "done", "Followup item should be closed after process."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
   I print workitem report.
 -
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3214cad5a5c..22d493a7d48 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -454,7 +454,7 @@ class mrp_production(osv.osv):
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True),
 
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
@@ -466,13 +466,13 @@ class mrp_production(osv.osv):
 
         'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
         'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
-        'date_planned': fields.datetime('Scheduled date', required=True, select=1),
+        'date_planned': fields.datetime('Scheduled Date', required=True, select=1),
         'date_start': fields.datetime('Start Date', select=True),
         'date_finished': fields.datetime('End Date', select=True),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
+        'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
             help="This is the Internal Picking List that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -1094,8 +1094,8 @@ class mrp_production_workcenter_line(osv.osv):
     _columns = {
         'name': fields.char('Work Order', size=64, required=True),
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
-        'cycle': fields.float('Nbr of cycles', digits=(16,2)),
-        'hour': fields.float('Nbr of hours', digits=(16,2)),
+        'cycle': fields.float('Number of Cycles', digits=(16,2)),
+        'hour': fields.float('Number of Hours', digits=(16,2)),
         'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of work orders."),
         'production_id': fields.many2one('mrp.production', 'Production Order', select=True, ondelete='cascade', required=True),
     }
@@ -1112,7 +1112,7 @@ class mrp_production_product_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9b1079dc34e..47c70636eef 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -37,7 +37,9 @@
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Define specific property groups that can be assigned to the properties of your bill of materials.</field>
+            <field name="help">
+                Define specific property groups that can be assigned to the properties of your bill of materials.
+            </field>
         </record>
         <menuitem
             id="menu_mrp_configuration"
@@ -103,7 +105,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_property_search"/>
-            <field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the needs.</field>
+            <field name="help">
+                The Properties in OpenERP are used to select the right bill of materials for manufacturing
+                a product when you have different ways of building the same product.
+                You can assign several properties to each bill of materials.
+                When a salesperson creates a sale order, they can relate it to several properties
+                and OpenERP will automatically select the BoM to use according the needs.
+            </field>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -307,7 +315,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
             <field name="search_view_id" ref="mrp_routing_search_view"/>
-            <field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
+            <field name="help">
+                Routings allow you to create and manage the manufacturing operations that should be
+                followed within your work centers in order to produce a product.
+                They are attached to bills of materials that will define the required raw materials.
+            </field>
         </record>
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="mrp.group_mrp_routings" sequence="15"/>
 
@@ -321,65 +333,65 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                	<sheet>
-	                    <label for="product_id" class="oe_edit_only"/>
-	                    <h1>
-	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
-	                        <field name="product_qty" class="oe_inline"/>
-	                        <field name="product_uom" class="oe_inline"/>
-	                    </h1>
-	                    <label for="routing_id" class="oe_edit_only"/>
-	                    <h2>
-	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-	                    </h2>
-	                    <group>
-	                        <group>
-	                            <field name="name"/>
-	                            <field name="code" string="Reference"/>
-	                        </group>
-	                        <group>
-	                            <field name="type"/>
-	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <field name="product_uos_qty" groups="product.group_uos" />
-	                            <field name="product_uos"  groups="product.group_uos"/>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Components">
-	                            <field name="bom_lines" widget="one2many_list">
-	                                <tree string="Components" editable="bottom">
-	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-	                                    <field name="product_qty"/>
-	                                    <field name="product_uom"/>
-	                                    <field name="name" invisible="1"/>
-	                                    <field name="date_start"/>
-	                                    <field name="date_stop"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-	                            <field name="revision_ids"/>
-	                        </page>
-	                        <page string="Properties" groups="product.group_mrp_properties">
-	                            <group>
-                                        <group>
-                                            <field name="position"/>
-                                            <field name="bom_id"/>
-                                            <field name="sequence"/>
-                                            <field name="active"/>
-                                        </group>
-                                        <group>
-                                            <field name="date_start"/>
-                                            <field name="date_stop"/>
-                                            <field name="product_rounding"/>
-                                            <field name="product_efficiency"/>
-                                        </group>
-	                            </group>
-	                            <separator string="Properties"/>
-	                            <field name="property_ids" widget="many2many_tags" />
-	                        </page>
-	                    </notebook>
-	                    <newline/>
+                    <sheet>
+                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
+                        <h1>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                        </h1>
+                        <div groups="mrp.group_mrp_routings">
+                            <label for="routing_id" class="oe_edit_only"/>
+                            <h2><field name="routing_id" class="oe_inline"/></h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="code" string="Reference"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="product_uos_qty" groups="product.group_uos" />
+                                <field name="product_uos"  groups="product.group_uos"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Components">
+                                <field name="bom_lines" widget="one2many_list">
+                                    <tree string="Components" editable="bottom">
+                                        <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                        <field name="product_qty"/>
+                                        <field name="product_uom" groups="product.group_uom"/>
+                                        <field name="name" invisible="1"/>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+                                <field name="revision_ids"/>
+                            </page>
+                            <page string="Properties" groups="product.group_mrp_properties">
+                                <group>
+                                    <group>
+                                        <field name="position"/>
+                                        <field name="bom_id"/>
+                                        <field name="sequence"/>
+                                        <field name="active"/>
+                                    </group>
+                                    <group>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                        <field name="product_rounding"/>
+                                        <field name="product_efficiency"/>
+                                    </group>
+                                </group>
+                                <separator string="Properties"/>
+                                <field name="property_ids" widget="many2many_tags" />
+                            </page>
+                        </notebook>
+                        <newline/>
                     </sheet>
                 </form>
             </field>
@@ -423,7 +435,7 @@
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -445,7 +457,7 @@
                     <field name="product_id" string="Component Product"/>
                     <field name="bom_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -461,7 +473,13 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
-            <field name="help">Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials.</field>
+            <field name="help">
+                Master Bills of Materials allow you to create and manage the list of necessary
+                raw materials used to make a finished product.
+                OpenERP uses these BoMs to automatically propose manufacturing orders according to product needs.
+                You can either create a bill of materials to define specific production steps,
+                or define a single multi-level bill of materials.
+            </field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -470,7 +488,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
             <field name="domain">[('bom_id','!=',False)]</field>
-            <field name="help">Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used.</field>
+            <field name="help">
+                Bills of materials components are components and sub-products used to create master bills of materials.
+                Use this menu to search in which BoM a specific component is used.
+            </field>
         </record>
 
         <!-- BOM menus -->
@@ -541,13 +562,13 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state not in ('done','cancel');gray:state in ('done','cancel')" string="Manufacturing Orders">
                     <field name="needaction_pending" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="hour_total" sum="Total Hours"/>
                     <field name="cycle_total" sum="Total Cycles"/>
@@ -603,9 +624,9 @@
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Confirm Production"/>
-                    <button name="button_produce" states="ready" string="Start Production"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
+                    <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
+                    <button name="button_produce" states="ready" string="Start Production" class="oe_highlight"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_highlight"/>
                     <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
@@ -613,20 +634,22 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+" class="oe_inline"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" />
-                    </h1>
-                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_edit_only"/>
-                    <h2>
-                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    </h2>
+                    <div class="oe_button_box oe_right">
+                        <button name="%(mrp.action_change_production_qty)d" type="action" states="ready,confirmed"
+                            string="Change Quantity" icon="terp-accessories-archiver+"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
+                        <h1>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>:
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                        </h1>
+                        <div groups="mrp.group_mrp_routings">
+                            <label for="routing_id" class="oe_edit_only"/>
+                            <h2><field name="routing_id" class="oe_inline"/></h2>
+                        </div>
+                    </div>
                     <group>
                         <group>
                             <field name="name"/>
@@ -641,20 +664,22 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group col="4">
-                                <group>
+                            <group>
+                                <group groups="stock.group_locations">
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
                                 <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
+                            </group>
+                            <group>
                                 <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                     <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
-                                        <field name="product_id" />
-                                        <field name="product_qty"  string="Qty"/>
-                                        <field name="product_uom"  string="Unit of Measure"/>
-                                        <field name="location_id"  string="Source Loc."/>
+                                        <field name="product_id"/>
+                                        <field name="product_qty"/>
+                                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                        <field name="location_id" string="Source Loc." groups="stock.group_locations"/>
                                         <field name="state" invisible="1"/>
                                         <button name="%(stock.move_consume)d"
                                             string="Consume Products" type="action"
@@ -674,8 +699,8 @@
                                 <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                       <field name="product_qty" readonly="1"/>
+                                       <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
@@ -692,9 +717,9 @@
                             <group>
                             <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="Unit of Measure"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom"  string="Unit of Measure" groups="product.group_uom"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move_server)d"
                                         string="Partial"
@@ -709,9 +734,9 @@
                             <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
                                 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                     <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1" string="Qty"/>
-                                    <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                    <field name="product_qty" readonly="1"/>
+                                    <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
                                     <field name="prodlot_id" context="{'product_id': product_id}"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="state" invisible="1"/>
@@ -754,13 +779,17 @@
                             <field name="product_lines"/>
                         </page>
                         <page string="Extra Information">
-                            <group col="4">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="priority"/>
-                                <field name="date_start"/>
-                                <field name="date_finished"/>
-                                <field name="picking_id"/>
-                                <field name="move_prod_id"/>
+                            <group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="priority"/>
+                                    <field name="picking_id"/>
+                                    <field name="move_prod_id" groups="stock.group_locations"/>
+                                </group>
+                                <group>
+                                    <field name="date_start"/>
+                                    <field name="date_finished"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -819,7 +848,12 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{}</field>
-            <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
+            <field name="help">
+                Click here to create a new Manufacturing Order.
+                &lt;p&gt;
+                To process the production, do not forget to create a Bill of Material.
+                Manufacturing orders can be automatically generated based on procurement rules specified on the product.
+            </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
             parent="menu_mrp_manufacturing" sequence="1"/>
@@ -831,7 +865,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">calendar,tree,form,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
-            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
+            <field name="help">
+                Manufacturing Orders describe the operations that need to be carried out,
+                and the raw materials usage for each production stage.
+                You use specifications (bills of materials or BoM) to work out the raw material requirements
+                and the manufacturing orders needed for the finished products.
+                Once the bills of materials have been defined, OpenERP is capable of automatically deciding
+                on the manufacturing route depending on the needs of the company.
+            </field>
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
@@ -877,7 +918,7 @@
                         <field name="name"/>
                         <field name="product_id"/>
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" groups="product.group_uom"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
                     </group>
@@ -892,7 +933,7 @@
                 <tree string="Scheduled Products">
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="product_uos" groups="product.group_uos"/>
                 </tree>
@@ -929,10 +970,19 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <separator string="Bill of Materials" colspan="4"/>
-                    <field name="bom_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
-                </group>
+                <page string="Procurement &amp; Locations" position="inside">
+                    <separator string="Bill of Materials"/>
+                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+                        <tree string="Bill of Materials">
+                             <field name="name" string="Component Name"/>
+                            <field name="bom_id"/>
+                            <field name="product_qty" string="Quantity of Product"/>
+                            <field name="type"/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
+                        </tree>
+                    </field>
+                </page>
             </field>
         </record>
 
@@ -965,7 +1015,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
-            <field name="help">Work Centers allow you to create and manage manufacturing units.  They consist of workers and/or machines, which are considered as units for capacity and planning forecast.  Keep in mind that the working time and resource leave are not taken into account in the time computation of the work center.</field>
+            <field name="help">
+                Work Centers allow you to create and manage manufacturing units.
+                They consist of workers and/or machines, which are considered as units for capacity and planning forecast.
+                Keep in mind that the working time and resource leave are not taken into account in the time computation
+                of the work center.
+            </field>
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index 68487527966..b98c5d3e40f 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -30,8 +30,8 @@ class report_workcenter_load(osv.osv):
     _columns = {
         'name': fields.char('Week', size=64, required=True),
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
-        'cycle': fields.float('Nbr of cycle'),
-        'hour': fields.float('Nbr of hour'),
+        'cycle': fields.float('Number of Cycles'),
+        'hour': fields.float('Number of Hours'),
     }
 
     def init(self, cr):
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 1b2aa1c2732..cbee02cb4a8 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,7 +28,7 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Master Manufacturing Order Schedule',
+        'module_stock_planning': fields.boolean('Master Production Schedule',
             help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
                 which works automatically based on minimum stock rules.
                 This installs the module stock_planning."""),
@@ -68,6 +68,13 @@ class mrp_config_settings(osv.osv_memory):
         'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
+        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+            help="""This allows you to define the following for a product:
+                    * Manufacturer
+                    * Manufacturer Product Name
+                    * Manufacturer Product Code
+                    * Product Attributes.
+                This installs the module product_manufacturer."""),        
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index a00bf797318..da1243452b1 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,24 +8,28 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <newline/>
-                    <group col="4" string="Manufacturing Order">
-                        <field name="module_mrp_operations"/>
-                        <field name="module_stock_planning"/>
-                        <field name="module_mrp_subproduct"/>
-                        <field name="module_mrp_repair"/>
-                    </group>
-                    <group string="Logistics" col="4">
-                        <field name="module_mrp_jit"/>
-                        <field name="module_stock_no_autopicking"/>
-                    </group>
-                    <group string="Bill Of Material" col="4">
-                        <field name="group_mrp_routings"/>
-                        <field name="group_mrp_properties"/>
-                    </group>
+                    <sheet>
+                        <group string="Manufacturing Order">
+                            <field name="module_mrp_operations"/>
+                            <field name="module_stock_planning"/>
+                            <field name="module_mrp_subproduct"/>
+                            <field name="module_mrp_repair"/>
+                        </group>
+                        <group string="Logistics">
+                            <field name="module_mrp_jit"/>
+                            <field name="module_stock_no_autopicking"/>
+                        </group>
+                        <group string="Bill Of Material">
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
+                        </group>
+                        <group string="Products">
+                            <field name="module_product_manufacturer"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 814e4e46391..42f9c7b4060 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -12,13 +12,13 @@
                      <field name="sub_products">
                          <tree string="sub products"  editable="top">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom"/>
+                             <field name="product_uom" groups="product.group_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
                          <form string="Sub Products">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom"/>
+                             <field name="product_uom" groups="product.group_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </form>
diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 676540dc63a..4fc1f391fab 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -22,29 +22,21 @@
 from osv import fields
 from osv import osv
 import addons
-
 import base64
 
 class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
-        'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'description':fields.text('Description', readonly=True)
+        'plugin32': fields.char('Outlook Plug-in 32bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
+        'plugin64': fields.char('Outlook Plug-in 64bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
     }
 
-    _defaults = {
-        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
-        'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
-        'description' : """
-Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
-
-System requirements:
-    1.  MS Outlook 2005 or above.
-    2.  MS .Net Framework 3.5 or above.
-"""
-        }
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(outlook_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+        res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c4791ee153c..13c1e6f32c4 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,14 +19,18 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-                   <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
-                            <field name="name" widget="url" colspan="4"/>
-                            <field name="name2" widget="url" colspan="4"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                    <xpath expr="//separator[@string='title']" position="after" version="7.0">
+                        <group>
+                            <field name="plugin32" widget="url"/>
+                            <field name="plugin64" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
+                        <p>System requirements:</p>
+                        <ul>
+                            <li>1. MS Outlook 2005 or above.</li>
+                            <li>2. MS .Net Framework 3.5 or above.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
@@ -50,13 +54,15 @@
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" position="after">
-                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <button name="%(action_outlook_installer)d" type="action"
-                            string="Configure Outlook Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_outlook" version="7.0" position="replace">
+                    <label for="module_plugin_outlook"/>
+                    <div>
+                        <field name="module_plugin_outlook"/>
+                        <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/i18n/ar.po b/addons/plugin_thunderbird/i18n/ar.po
index f3cad417526..53317e3b528 100644
--- a/addons/plugin_thunderbird/i18n/ar.po
+++ b/addons/plugin_thunderbird/i18n/ar.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/bg.po b/addons/plugin_thunderbird/i18n/bg.po
index 037d6586d23..8bf248f5831 100644
--- a/addons/plugin_thunderbird/i18n/bg.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr "Добавка за Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/ca.po b/addons/plugin_thunderbird/i18n/ca.po
index 1739f413416..a5232bdbde9 100644
--- a/addons/plugin_thunderbird/i18n/ca.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Connector Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Aquest connector permet vincular el vostre correu electrònic amb documents "
-"OpenERP. Podeu adjuntar amb qualsevol element en OpenERP o crear un de nou."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -102,3 +100,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Aquest connector permet vincular el vostre correu electrònic amb documents "
+#~ "OpenERP. Podeu adjuntar amb qualsevol element en OpenERP o crear un de nou."
diff --git a/addons/plugin_thunderbird/i18n/cs.po b/addons/plugin_thunderbird/i18n/cs.po
index 8918a097082..5973586bc3a 100644
--- a/addons/plugin_thunderbird/i18n/cs.po
+++ b/addons/plugin_thunderbird/i18n/cs.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: 2012-04-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Doplněk Thunderbirdu"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Doplněk vám umožní spojit váš email k dokumentům OpenERP. Můžete jej "
-"připojit k jakémukoliv existujícímu v OpenERP nebo vytvořit nový."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -101,3 +99,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Instalovat doplněk Thunderbirdu"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Doplněk vám umožní spojit váš email k dokumentům OpenERP. Můžete jej "
+#~ "připojit k jakémukoliv existujícímu v OpenERP nebo vytvořit nový."
diff --git a/addons/plugin_thunderbird/i18n/da.po b/addons/plugin_thunderbird/i18n/da.po
index 038811f396e..5f595ff0309 100644
--- a/addons/plugin_thunderbird/i18n/da.po
+++ b/addons/plugin_thunderbird/i18n/da.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index e3e96e62b27..385d546fd55 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -52,13 +52,9 @@ msgstr "Thunderbird Plug-in"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Das Plugin ermöglicht die Verlinkung einer EMail mit beliebigen OpenERP "
-"Belegen. Sie können hierzu entweder\r\n"
-"die EMail zu vorhandenen Objekten abspeichern oder wahlweise neue Objekte "
-"durch eine Email in OpenERP erstellen."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -106,3 +102,12 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Installiere Thunderbird Plug-In"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Das Plugin ermöglicht die Verlinkung einer EMail mit beliebigen OpenERP "
+#~ "Belegen. Sie können hierzu entweder\r\n"
+#~ "die EMail zu vorhandenen Objekten abspeichern oder wahlweise neue Objekte "
+#~ "durch eine Email in OpenERP erstellen."
diff --git a/addons/plugin_thunderbird/i18n/en_GB.po b/addons/plugin_thunderbird/i18n/en_GB.po
index d14a3686a05..22c31f65e29 100644
--- a/addons/plugin_thunderbird/i18n/en_GB.po
+++ b/addons/plugin_thunderbird/i18n/en_GB.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/en_US.po b/addons/plugin_thunderbird/i18n/en_US.po
index 9c69a141368..4f658eb4f4a 100644
--- a/addons/plugin_thunderbird/i18n/en_US.po
+++ b/addons/plugin_thunderbird/i18n/en_US.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/es.po b/addons/plugin_thunderbird/i18n/es.po
index 4eb502ff5ad..7027664601d 100644
--- a/addons/plugin_thunderbird/i18n/es.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Conector Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Este conector permite vincular su correo electrónico con documentos OpenERP. "
-"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -102,3 +100,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Este conector permite vincular su correo electrónico con documentos OpenERP. "
+#~ "Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
diff --git a/addons/plugin_thunderbird/i18n/es_CR.po b/addons/plugin_thunderbird/i18n/es_CR.po
index 9ca91e2448c..61c079a5299 100644
--- a/addons/plugin_thunderbird/i18n/es_CR.po
+++ b/addons/plugin_thunderbird/i18n/es_CR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-02-17 20:56+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-18 04:59+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: plugin_thunderbird
@@ -52,11 +52,9 @@ msgstr "Conector Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Este conector permite vincular su correo electrónico con documentos OpenERP. "
-"Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -103,3 +101,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Instalar Thunderbird Plug-In"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Este conector permite vincular su correo electrónico con documentos OpenERP. "
+#~ "Puede adjuntarlo con cualquier elemento de OpenERP o crear uno de nuevo."
diff --git a/addons/plugin_thunderbird/i18n/et.po b/addons/plugin_thunderbird/i18n/et.po
index 228d8845c46..b4dc391a5eb 100644
--- a/addons/plugin_thunderbird/i18n/et.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/eu.po b/addons/plugin_thunderbird/i18n/eu.po
index df211b4c329..674254cf4e8 100644
--- a/addons/plugin_thunderbird/i18n/eu.po
+++ b/addons/plugin_thunderbird/i18n/eu.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/fi.po b/addons/plugin_thunderbird/i18n/fi.po
index 09e2863620f..d0e73e49158 100644
--- a/addons/plugin_thunderbird/i18n/fi.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Thunderbird liitännäinen"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Tämä liitännäien sallii sinun linkittää sähköpostisi OpenERP dokumentteihin. "
-"Voit liittää sen mihin tahansa OpenERP:iin  tai luoda uuden."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -101,3 +99,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Tämä liitännäien sallii sinun linkittää sähköpostisi OpenERP dokumentteihin. "
+#~ "Voit liittää sen mihin tahansa OpenERP:iin  tai luoda uuden."
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index d79a72481f0..d1c4e3e58f2 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/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: 2012-05-25 04:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -52,12 +52,9 @@ msgstr "Module pour Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Ce greffon vous permet de connecter votre courriel aux documents d'OpenERP. "
-"Vous pouvez l'attacher sur n'importe quel objet existant dans OpenERP ou en "
-"créer un nouveau."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -105,3 +102,11 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Installer l'extension Thunderbird"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Ce greffon vous permet de connecter votre courriel aux documents d'OpenERP. "
+#~ "Vous pouvez l'attacher sur n'importe quel objet existant dans OpenERP ou en "
+#~ "créer un nouveau."
diff --git a/addons/plugin_thunderbird/i18n/gl.po b/addons/plugin_thunderbird/i18n/gl.po
index b740d6218f7..e48920a9475 100644
--- a/addons/plugin_thunderbird/i18n/gl.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Conector Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Este conector permítelle vincular ó seu correo electrónico con documentos "
-"OpenERP. Pódeo achegar á calquera elemento de OpenERP ou crear un novo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -102,3 +100,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Este conector permítelle vincular ó seu correo electrónico con documentos "
+#~ "OpenERP. Pódeo achegar á calquera elemento de OpenERP ou crear un novo."
diff --git a/addons/plugin_thunderbird/i18n/hr.po b/addons/plugin_thunderbird/i18n/hr.po
index db73901df0a..67351a33c5b 100644
--- a/addons/plugin_thunderbird/i18n/hr.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: hr\n"
 
 #. module: plugin_thunderbird
@@ -52,13 +52,9 @@ msgstr "Thunderbird Plug-in"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
-"attach it to any existing one in OpenERP or create a new one.\r\n"
-"Ovaj plug-in omogućuje povezivanje vaših el. poruka sa OpenERP dokumentima. "
-"Možete dodjeliti neki postojeći u OpenERP-u ili kreirati novi."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -105,3 +101,12 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one.\r\n"
+#~ "Ovaj plug-in omogućuje povezivanje vaših el. poruka sa OpenERP dokumentima. "
+#~ "Možete dodjeliti neki postojeći u OpenERP-u ili kreirati novi."
diff --git a/addons/plugin_thunderbird/i18n/hu.po b/addons/plugin_thunderbird/i18n/hu.po
index 5553ee1dab5..179a4fc557a 100644
--- a/addons/plugin_thunderbird/i18n/hu.po
+++ b/addons/plugin_thunderbird/i18n/hu.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,12 +51,9 @@ msgstr "Thunderbird kiegészítő"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Ez a plug-in lehetővé teszi, hogy összekapcsoljunk e-maileket OpenERP "
-"dokumentumokkal. Akármelyik OpenERP-ben létező dokumentumhoz tudja csatolni, "
-"vagy létrehozhat újat."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -104,3 +101,11 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Ez a plug-in lehetővé teszi, hogy összekapcsoljunk e-maileket OpenERP "
+#~ "dokumentumokkal. Akármelyik OpenERP-ben létező dokumentumhoz tudja csatolni, "
+#~ "vagy létrehozhat újat."
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index 18b7e36e8df..292e424e443 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,12 +51,9 @@ msgstr "Plug-in Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Il plug in permette di collegare le e-mail ai documenti di OpenERP. E' "
-"possibile allegarle a documenti già esistenti di OpenERP oppure crearne di "
-"nuovi"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -103,3 +100,11 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Il plug in permette di collegare le e-mail ai documenti di OpenERP. E' "
+#~ "possibile allegarle a documenti già esistenti di OpenERP oppure crearne di "
+#~ "nuovi"
diff --git a/addons/plugin_thunderbird/i18n/ja.po b/addons/plugin_thunderbird/i18n/ja.po
index b929d9c05e4..4b555c04502 100644
--- a/addons/plugin_thunderbird/i18n/ja.po
+++ b/addons/plugin_thunderbird/i18n/ja.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: 2012-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Thunderbirdプラグイン"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"このプラグインはあなたのEメールをOpenERPのドキュメントにリンクさせることができます。OpenERPの既存あるいは新しく作成したドキュメントを添付で"
-"きます。"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -98,3 +96,10 @@ msgstr "Thunderbirdプラグインファイル。このファイルを保存し
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Thunderbirdプラグインのインストール"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "このプラグインはあなたのEメールをOpenERPのドキュメントにリンクさせることができます。OpenERPの既存あるいは新しく作成したドキュメントを添付で"
+#~ "きます。"
diff --git a/addons/plugin_thunderbird/i18n/mn.po b/addons/plugin_thunderbird/i18n/mn.po
index 63714a77e25..6abf8c0473e 100644
--- a/addons/plugin_thunderbird/i18n/mn.po
+++ b/addons/plugin_thunderbird/i18n/mn.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/nl.po b/addons/plugin_thunderbird/i18n/nl.po
index 5c01ef4c43c..976e02b54a4 100644
--- a/addons/plugin_thunderbird/i18n/nl.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Thunderbird-plugin"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Deze plug-in laat u uw email koppelen aan OpenERP's documenten. U kunt het "
-"bij elke bestaande in OpenERP bijvoegen en een nieuwe maken."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -101,3 +99,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Installeer de Thunderbird Plug-In"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Deze plug-in laat u uw email koppelen aan OpenERP's documenten. U kunt het "
+#~ "bij elke bestaande in OpenERP bijvoegen en een nieuwe maken."
diff --git a/addons/plugin_thunderbird/i18n/pl.po b/addons/plugin_thunderbird/i18n/pl.po
index 199a7b7ffb5..48b60fffafd 100644
--- a/addons/plugin_thunderbird/i18n/pl.po
+++ b/addons/plugin_thunderbird/i18n/pl.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
index b14f7064901..1faa22d1791 100644
--- a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
+++ b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
@@ -52,7 +52,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/pt.po b/addons/plugin_thunderbird/i18n/pt.po
index e15fd9d16d0..028383ac5e8 100644
--- a/addons/plugin_thunderbird/i18n/pt.po
+++ b/addons/plugin_thunderbird/i18n/pt.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -30,12 +30,12 @@ msgstr "Descrição"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "title"
-msgstr "título"
+msgstr "Título"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
@@ -51,11 +51,9 @@ msgstr "Plug-in para o Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Este plug-in permite ligar documentos OpenERP ao seu e-mail. Pode ligar um e-"
-"mail a um objecto OpenERP já existente ou poderá criar um novo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -63,7 +61,7 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
-"Permite seleccionar um objecto que pretende adicionar ao e-mail como anexo."
+"Permite selecionar um objeto que pretende adicionar ao email como anexo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,pdf_file:0
@@ -85,7 +83,7 @@ msgstr "Instalação e passos da configuração"
 #: field:plugin_thunderbird.installer,name:0
 #: field:plugin_thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr "Nome do ficheiro"
+msgstr "Nome do Ficheiro"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
@@ -93,12 +91,19 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
-"Ficheiro do 'plug-in' para o Thunderbird. Guarde este ficheiro e instale "
-"este 'plug-in' no Thunderbird."
+"Ficheiro do plug-in para o Thunderbird. Guarde este ficheiro e instale este "
+"plug-in no Thunderbird."
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Instale o Plug-In Thunderbird"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Este plug-in permite ligar documentos OpenERP ao seu email. Pode ligar um "
+#~ "email a um objeto OpenERP já existente ou poderá criar um novo."
diff --git a/addons/plugin_thunderbird/i18n/pt_BR.po b/addons/plugin_thunderbird/i18n/pt_BR.po
index bf3bd577afa..6a17f183243 100644
--- a/addons/plugin_thunderbird/i18n/pt_BR.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Plug-in Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Este plug-in permite que você relacione o seu email aos documentos do "
-"OpenERP. Você pode anexar em qualquer documento do OpenERP ou criar um novo."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -101,3 +99,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Este plug-in permite que você relacione o seu email aos documentos do "
+#~ "OpenERP. Você pode anexar em qualquer documento do OpenERP ou criar um novo."
diff --git a/addons/plugin_thunderbird/i18n/ro.po b/addons/plugin_thunderbird/i18n/ro.po
index 0dad5a8928c..6a7ef40290d 100644
--- a/addons/plugin_thunderbird/i18n/ro.po
+++ b/addons/plugin_thunderbird/i18n/ro.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -35,7 +35,7 @@ msgstr "titlu"
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "program_de_instalare.aplicatie_thunderbird"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
@@ -46,17 +46,14 @@ msgstr "Imagine"
 #: field:plugin_thunderbird.installer,plugin_file:0
 #: field:plugin_thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr "Plug-in (Modul de extensie) Thunderbird"
+msgstr "Aplicatia Thunderbird"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Această extensie vă permite să vă conectati e-mail-urile la documentele "
-"OpenERP. Puteti să le atasati de orice document existent in OpenERP sau să "
-"creati unul nou."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -64,29 +61,29 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
-"Vă permite să selectati un obiect pe care doriti să il atasati la e-mail si "
+"Va permite sa selectati un obiect pe care doriti sa il atasati la e-mail si "
 "atasamentele lui."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr "Fisier de documentatie :- cum se instalează Extensia Thunderbird."
+msgstr "Fisier de documentatie :- cum se instaleaza Extensia Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "_Close"
-msgstr "_Închide"
+msgstr "_Inchideti"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr "Pașii de instalare și configurare"
+msgstr "Pasii de Instalare si Configurare"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,name:0
 #: field:plugin_thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr "Numele fişierului"
+msgstr "Nume fisier"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
@@ -94,7 +91,7 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
-"Fisier de extensie Thunderbird. Salvează acest fisier si instalează această "
+"Fisier de extensie Thunderbird. Salveaza acest fisier si instaleaza aceasta "
 "extensie in thunderbird."
 
 #. module: plugin_thunderbird
@@ -102,4 +99,12 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Instalati Aplicatia Thunderbird"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Aceasta aplicatie va permite sa va conectati e-mail-urile la documentele "
+#~ "OpenERP. Puteti sa le atasati de orice document existent in OpenERP sau sa "
+#~ "creati unul nou."
diff --git a/addons/plugin_thunderbird/i18n/ru.po b/addons/plugin_thunderbird/i18n/ru.po
index 28b0ddd1b84..2c528e5b8a6 100644
--- a/addons/plugin_thunderbird/i18n/ru.po
+++ b/addons/plugin_thunderbird/i18n/ru.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,12 +51,9 @@ msgstr "Дополнение для Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Этот плагин позволяет связывать ваши электронные письма с документами "
-"OpenERP. Вы можете прикрепить их к любому существующему документу или "
-"создать новый."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -103,3 +100,11 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Этот плагин позволяет связывать ваши электронные письма с документами "
+#~ "OpenERP. Вы можете прикрепить их к любому существующему документу или "
+#~ "создать новый."
diff --git a/addons/plugin_thunderbird/i18n/sk.po b/addons/plugin_thunderbird/i18n/sk.po
index 3ed8d46e6af..54dd976472b 100644
--- a/addons/plugin_thunderbird/i18n/sk.po
+++ b/addons/plugin_thunderbird/i18n/sk.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/sl.po b/addons/plugin_thunderbird/i18n/sl.po
index 7129984e699..ae4d84b4653 100644
--- a/addons/plugin_thunderbird/i18n/sl.po
+++ b/addons/plugin_thunderbird/i18n/sl.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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,11 +51,9 @@ msgstr "Thunderbird vtičnik"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Ta vtičnik dovoli povezati vaš poštni naslov z OpenERP dokumeti. Lahko "
-"pripnete v kateri kolio obstoječi v OpenErp ali pa kerirate novega."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -102,3 +100,10 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr ""
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Ta vtičnik dovoli povezati vaš poštni naslov z OpenERP dokumeti. Lahko "
+#~ "pripnete v kateri kolio obstoječi v OpenErp ali pa kerirate novega."
diff --git a/addons/plugin_thunderbird/i18n/sr.po b/addons/plugin_thunderbird/i18n/sr.po
index 2e01079bd84..c6b7edb4607 100644
--- a/addons/plugin_thunderbird/i18n/sr.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/sr@latin.po b/addons/plugin_thunderbird/i18n/sr@latin.po
index 6d46f609505..dce0d000349 100644
--- a/addons/plugin_thunderbird/i18n/sr@latin.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
index becd086e728..17f4bac477e 100644
--- a/addons/plugin_thunderbird/i18n/sv.po
+++ b/addons/plugin_thunderbird/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: 2012-06-18 05:27+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -35,7 +35,7 @@ msgstr "Titel"
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
@@ -46,12 +46,12 @@ msgstr "Bild"
 #: field:plugin_thunderbird.installer,plugin_file:0
 #: field:plugin_thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Thunderbird-insticksprogram"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
@@ -61,11 +61,13 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
+"Låter dig välja ett objekt som du vill lägga till din e-post och dess "
+"bilagor."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "Dokumentation :- hur man installerar Thunderbird-insticksprogram."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -89,10 +91,19 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Thunderbird insticksprogramfil. Spara filen och installera insticksprogram i "
+"Thunderbird."
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Installera Thunderbird-insticksprogram"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Detta insticksprogram länkar din e-post till OpenERPs dokumenthantering. Du "
+#~ "kan lägga till e-post till befintliga eller skapa ett nytt dokument."
diff --git a/addons/plugin_thunderbird/i18n/tr.po b/addons/plugin_thunderbird/i18n/tr.po
index fcce17b19b3..34b014979b0 100644
--- a/addons/plugin_thunderbird/i18n/tr.po
+++ b/addons/plugin_thunderbird/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: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,12 +51,9 @@ msgstr "Thunderbird Eklentisi"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
-"Bu eklenti e-posta adresinizi OpenERP dökümanlarına eklemenizi sağlar. "
-"Varolan bir belgeye iliştirebileceğiniz gibi yaratacağınız yeni bir belgede "
-"de kullanabilirsiniz."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -101,3 +98,11 @@ msgstr ""
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "Thunderbird Eklentisini Kur"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Bu eklenti e-posta adresinizi OpenERP dökümanlarına eklemenizi sağlar. "
+#~ "Varolan bir belgeye iliştirebileceğiniz gibi yaratacağınız yeni bir belgede "
+#~ "de kullanabilirsiniz."
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index fbb45e00e6d..0a664568f4b 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.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: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:38+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -51,9 +51,9 @@ msgstr "Thunderbird 插件"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
-msgstr "这插件允许你把你的电子邮件链接到系统的文档到中，你能附属在系统中任何现有的文档或创建一个新的文档。"
+msgstr ""
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -96,3 +96,8 @@ msgstr "Thunderbird 插件。存为文件并在 Thunderbird 里安装这个插
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
 msgstr "安装 Thunderbird 插件"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr "这插件允许你把你的电子邮件链接到系统的文档到中，你能附属在系统中任何现有的文档或创建一个新的文档。"
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 7e9b5626e5b..6473758883d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -27,28 +27,22 @@ class plugin_thunderbird_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'name':fields.char('File name', size=34),
-        'pdf_name':fields.char('File name', size=64),
-        'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
-        'plugin_file':fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
-        'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
-        'description':fields.text('Description', readonly=True)
+        'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
+        'plugin_name': fields.char('File name', size=64),
+        'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."),
+        'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
     }
 
     _defaults = {
-        'thunderbird' : True,
-        'name' : 'openerp_plugin.xpi',
-        'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
-        'description' : """
-Thunderbird plugin installation:
-    1.  Save the Thunderbird plug-in.
-    2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
-    4.  Select the plug-in (the file named openerp_plugin.xpi).
-    5.  Click "Install Now".
-    6.  Restart Thunderbird.
-    7.  From the Thunderbird menubar: OpenERP -> Configuration.
-    8.  Configure your openerp server.
-"""
+        'thunderbird': True,
+        'plugin_name': 'openerp_plugin.xpi',
+        'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
     }
 
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(plugin_thunderbird_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi'
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ec9a8c72610..7ff4f529fd0 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -12,25 +12,30 @@
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
                      <separator string="title" position="before">
-                        <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
+                        <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
                     <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
+                        <group>
                             <field name="thunderbird" invisible="1"/>
-                            <field name="name" invisible="1"/>
-                            <field name="pdf_name" invisible="1"/>
-                            <newline/>
-                            <field name="plugin_file" filename="name" widget="url"/>
-                            <newline/>
-                            <field name="pdf_file" filename="pdf_name" widget="url"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                            <field name="plugin_name" invisible="1"/>
+                            <field name="plugin_file" filename="plugin_name" widget="url"/>
+                            <field name="pdf_file" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Thunderbird plugin installation:</p>
+                        <ul>
+                            <li>1. Save the Thunderbird plug-in.</li>
+                            <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
+                            <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
+                            <li>4. Click "Install Now".</li>
+                            <li>5. Restart Thunderbird.</li>
+                            <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li>
+                            <li>7. Configure your openerp server.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                          <attribute name="string">Install Thunderbird Plug-In</attribute>
@@ -48,19 +53,21 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
         </record>
-    
+
         <!-- Sales Configuration -->
         <record id="view_config_thunderbird_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_thunderbird" position="after">
-                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                        <button name="%(action_thunderbird_installer)d" type="action"
-                            string="Configure Thunderbird Plugin" icon="gtk-execute"/>
-                    </group>
+                <field name="module_plugin_thunderbird" version="7.0" position="replace">
+                    <label for="module_plugin_thunderbird"/>
+                    <div>
+                        <field name="module_plugin_thunderbird"/>
+                        <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"
+                            attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 8605e8cac9c..d62e56cab30 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -884,7 +884,7 @@ openerp.point_of_sale = function(db) {
      */
     var CategoryWidget = db.web.OldWidget.extend({
         start: function() {
-            this.$element.find(".oe-pos-categories-list a").click(_.bind(this.changeCategory, this));
+            this.$element.find(".oe_pos_categories_list a").click(_.bind(this.changeCategory, this));
         },
         template_fct: qweb_template('pos-category-template'),
         renderElement: function() {
@@ -1009,7 +1009,7 @@ openerp.point_of_sale = function(db) {
         },
         start: function() {
             $('button#validate-order', this.$element).click(_.bind(this.validateCurrentOrder, this));
-            $('.oe-back-to-products', this.$element).click(_.bind(this.back, this));
+            $('.oe_back_to_products', this.$element).click(_.bind(this.back, this));
         },
         back: function() {
             this.shop.get('selectedOrder').set({"step": "products"});
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index d24d16713d8..61990732d83 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -120,7 +120,7 @@
                             </table>
                         </div>
                         <div class="pos-payment-buttons">
-                            <button class="oe-back-to-products">
+                            <button class="oe_back_to_products">
                                 <img src="/web/static/src/img/icons/gtk-go-back.png"></img>
                                 Back to Products</button>
                             <button id="validate-order">
@@ -147,13 +147,13 @@
     <t t-name="pos-category-template">
         <header>
             <ol class="breadcrumb">
-                <li class="oe-pos-categories-list">
+                <li class="oe_pos_categories_list">
                     <a href="javascript:void(0)">
                         <img src="/point_of_sale/static/src/img/home.png" class="homeimg" />
                     </a>
                 </li>
                 <t t-foreach="breadcrumb" t-as="category">
-                    <li class="oe-pos-categories-list">
+                    <li class="oe_pos_categories_list">
                         <img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" />
                         <a href="javascript:void(0)" t-att-data-category-id="category.id">
                             <t t-esc="category.name"/>
@@ -169,7 +169,7 @@
         <div id="categories">
             <ol>
                 <t t-foreach="categories" t-as="category">
-                    <li class="oe-pos-categories-list">
+                    <li class="oe_pos_categories_list">
                         <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button">
                             <t t-esc="category.name"/>
                         </a>
diff --git a/addons/portal/i18n/ar.po b/addons/portal/i18n/ar.po
index e88bbb4b4df..6925bed7f36 100644
--- a/addons/portal/i18n/ar.po
+++ b/addons/portal/i18n/ar.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/bg.po b/addons/portal/i18n/bg.po
index ba9fc9bfe96..60e8b7a0638 100644
--- a/addons/portal/i18n/bg.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/bs.po b/addons/portal/i18n/bs.po
index b4496f9a55c..ee25fd30c90 100644
--- a/addons/portal/i18n/bs.po
+++ b/addons/portal/i18n/bs.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index fe0c1cd03f5..8ebcb5bc738 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -65,8 +65,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Correu electrònic"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -420,5 +420,8 @@ msgstr "Assistent de compartició"
 msgid "Officer"
 msgstr ""
 
+#~ msgid "E-mail"
+#~ msgstr "Correu electrònic"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets assignats als usuaris"
diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po
index 1db97d215ca..34b5ed64c52 100644
--- a/addons/portal/i18n/cs.po
+++ b/addons/portal/i18n/cs.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: portal
@@ -67,8 +67,8 @@ msgstr "Povolte tuto volbu k přepsání Akcí nabídky uživatelů portálu"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -418,5 +418,8 @@ msgstr "Průvodce sdílením"
 msgid "Officer"
 msgstr "Úředník"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Pomůcky přiřazené uživatelům"
diff --git a/addons/portal/i18n/da.po b/addons/portal/i18n/da.po
index 0ba0b3016c2..c0505e5066d 100644
--- a/addons/portal/i18n/da.po
+++ b/addons/portal/i18n/da.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index 0432e741ce0..911debb59c2 100644
--- a/addons/portal/i18n/de.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -66,8 +66,8 @@ msgstr "Aktivieren, um die Menü Aktion für Portalbenutzer zu überschreiben"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -416,5 +416,8 @@ msgstr "Freigabeassistent"
 msgid "Officer"
 msgstr "Verwalter"
 
+#~ msgid "E-mail"
+#~ msgstr "E-Mail"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Oberflächenelemente, die Benutzern zugeordnet sind"
diff --git a/addons/portal/i18n/es.po b/addons/portal/i18n/es.po
index 958623e5313..8d859e660d2 100644
--- a/addons/portal/i18n/es.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -66,8 +66,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -410,5 +410,8 @@ msgstr "Asistente de compartición"
 msgid "Officer"
 msgstr ""
 
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets asignados a usuarios"
diff --git a/addons/portal/i18n/es_CR.po b/addons/portal/i18n/es_CR.po
index 5837303974a..c3485a8ef35 100644
--- a/addons/portal/i18n/es_CR.po
+++ b/addons/portal/i18n/es_CR.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:41+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: portal
@@ -70,8 +70,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -426,5 +426,8 @@ msgstr "Asistente de compartición"
 msgid "Officer"
 msgstr "Oficial"
 
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets asignados a usuarios"
diff --git a/addons/portal/i18n/et.po b/addons/portal/i18n/et.po
index fbd05695e21..1a7c29726b5 100644
--- a/addons/portal/i18n/et.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/fi.po b/addons/portal/i18n/fi.po
index 85322f71dce..e89b0d36790 100644
--- a/addons/portal/i18n/fi.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -65,8 +65,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Sähköposti"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -397,5 +397,8 @@ msgstr "Jakovelho"
 msgid "Officer"
 msgstr "Päällikkö"
 
+#~ msgid "E-mail"
+#~ msgstr "Sähköposti"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Käyttäjälle määritellyt sovelmat"
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 7b7cb2683e0..6f4b2207179 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -69,8 +69,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Courriel"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -426,5 +426,8 @@ msgstr "Assistant de partage"
 msgid "Officer"
 msgstr ""
 
+#~ msgid "E-mail"
+#~ msgstr "Courriel"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets assignés aux utilisateurs"
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index 5bb2efb8b61..731de4998dc 100644
--- a/addons/portal/i18n/hr.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,8 +64,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "E-pošta"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -386,3 +386,6 @@ msgstr ""
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
 msgstr ""
+
+#~ msgid "E-mail"
+#~ msgstr "E-pošta"
diff --git a/addons/portal/i18n/hu.po b/addons/portal/i18n/hu.po
index 0b1c328c7f4..507202505c6 100644
--- a/addons/portal/i18n/hu.po
+++ b/addons/portal/i18n/hu.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/id.po b/addons/portal/i18n/id.po
index 607c80e06f7..7ba0b1b72bf 100644
--- a/addons/portal/i18n/id.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index edb3f86de5b..5062a69fe7e 100644
--- a/addons/portal/i18n/it.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po
index 58bd5f3db4b..4e448de33eb 100644
--- a/addons/portal/i18n/ja.po
+++ b/addons/portal/i18n/ja.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: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,8 +64,8 @@ msgstr "ポータルユーザのメニューアクションを無効にするた
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Eメール"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -405,3 +405,6 @@ msgstr "共有ウィザード"
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
 msgstr "役員"
+
+#~ msgid "E-mail"
+#~ msgstr "Eメール"
diff --git a/addons/portal/i18n/lt.po b/addons/portal/i18n/lt.po
index c1d6e7c07b1..bed75bb4ab5 100644
--- a/addons/portal/i18n/lt.po
+++ b/addons/portal/i18n/lt.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/nl.po b/addons/portal/i18n/nl.po
index b353815ce51..e400df85f4e 100644
--- a/addons/portal/i18n/nl.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -67,8 +67,8 @@ msgstr "Schakel deze optie in om de menu actie van portal-gebruikers negeren"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -100,7 +100,7 @@ msgstr "De url waar portaal gebruikers naar de server kunnen verbinden"
 #: model:res.groups,comment:portal.group_portal_officer
 msgid "Portal officers can create new portal users with the portal wizard."
 msgstr ""
-"Portaal managers kunnen nieuwe portaal gebruikers aanmaken met de wizard."
+"Portaal beheerders kunnen nieuwe portaal gebruikers aanmaken met de wizard."
 
 #. module: portal
 #: help:res.portal.wizard,message:0
@@ -320,7 +320,7 @@ msgstr "Volgnummer"
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr "Gekoppelde partner"
+msgstr "Gekoppelde relatie"
 
 #. module: portal
 #: view:res.portal:0
@@ -420,7 +420,10 @@ msgstr "Deel assistent"
 #. module: portal
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
-msgstr "Manager"
+msgstr "Beheerder"
+
+#~ msgid "E-mail"
+#~ msgstr "E-Mail"
 
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets toegewezen aan gebruikers"
diff --git a/addons/portal/i18n/pl.po b/addons/portal/i18n/pl.po
index 5f81fdb43d8..7b6afd13206 100644
--- a/addons/portal/i18n/pl.po
+++ b/addons/portal/i18n/pl.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index ac37f201380..a784c7c43ef 100644
--- a/addons/portal/i18n/portal.pot
+++ b/addons/portal/i18n/portal.pot
@@ -60,7 +60,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/pt.po b/addons/portal/i18n/pt.po
index d50a6f1c952..f75bd4e4d00 100644
--- a/addons/portal/i18n/pt.po
+++ b/addons/portal/i18n/pt.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -68,8 +68,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "Email"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -423,3 +423,6 @@ msgstr "Oficial"
 
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Widgets atribuídos aos utilizadores"
+
+#~ msgid "E-mail"
+#~ msgstr "Email"
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 99e8748524d..b554779ebc0 100644
--- a/addons/portal/i18n/pt_BR.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/ro.po b/addons/portal/i18n/ro.po
index db46447dbab..8b7f7a093d0 100644
--- a/addons/portal/i18n/ro.po
+++ b/addons/portal/i18n/ro.po
@@ -14,41 +14,44 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
 #, python-format
 msgid "Please select at least one user to share with"
 msgstr ""
+"Va rugam sa selectati cel putin un utilizator cu care sa partajati "
+"informatiile"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one group to share with"
 msgstr ""
+"Va rugam sa selectati cel putin un grup cu care sa partajati informatiile"
 
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Grupuri existente"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Config Utilizator Portal"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "Utilizator Portal"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal_manager
@@ -56,32 +59,38 @@ msgid ""
 "Portal managers have access to the portal definitions, and can easily "
 "configure the users, access rights and menus of portal users."
 msgstr ""
+"Managerii portalurilor au acces la definitiile portalurilor, si pot sa "
+"configureze cu usurinta utilizatorii, drepturile de acces si meniurile "
+"utilizatorilor portalurilor."
 
 #. module: portal
 #: help:res.portal,override_menu:0
 msgid "Enable this option to override the Menu Action of portal users"
 msgstr ""
+"Activati aceasta optiune pentru a anula Actiunea Meniului utilizatorilor "
+"portalului"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Widget-uri"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Trimiteti Invitatiile"
 
 #. module: portal
 #: view:res.portal:0
@@ -91,62 +100,66 @@ msgstr ""
 #. module: portal
 #: help:res.portal,url:0
 msgid "The url where portal users can connect to the server"
-msgstr ""
+msgstr "Url-ul unde utilizatorii portalului se pot conecta la server"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal_officer
 msgid "Portal officers can create new portal users with the portal wizard."
 msgstr ""
+"Administratorii portalului pot crea noi utilizatori ai portalului cu "
+"ajutorul wizard-ului portaluri."
 
 #. module: portal
 #: help:res.portal.wizard,message:0
 msgid "This text is included in the welcome email sent to the users"
 msgstr ""
+"Acest text este inclus in e-mail-ul de bun venit trimis utilizatorilor"
 
 #. module: portal
 #: help:res.portal,menu_action_id:0
 msgid "If set, replaces the standard menu for the portal's users"
 msgstr ""
+"Daca este setat, inlocuieste meniul standard pentru utilizatorii portalului"
 
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Limba"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Name"
-msgstr ""
+msgstr "Nume Portal"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal Users"
-msgstr ""
+msgstr "Utilizatori Portal"
 
 #. module: portal
 #: field:res.portal,override_menu:0
 msgid "Override Menu Action of Users"
-msgstr ""
+msgstr "Anulati Actiunea Meniului Utilizatorilor"
 
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Actiune Meniu"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Nume utilizator"
 
 #. module: portal
 #: help:res.portal,group_id:0
 msgid "The group corresponding to this portal"
-msgstr ""
+msgstr "Grupul corespunzator acestui portal"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
 msgid "Portal Widgets"
-msgstr ""
+msgstr "Widget-uri Portal"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal
@@ -155,52 +168,52 @@ msgstr ""
 #: field:res.portal.widget,portal_id:0
 #: field:res.portal.wizard,portal_id:0
 msgid "Portal"
-msgstr ""
+msgstr "Portal"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:35
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "Contul d-voastra OpenERP la %(company)s"
 
 #. module: portal
 #: code:addons/portal/portal.py:107
 #: code:addons/portal/portal.py:184
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "%s Meniu"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
 msgid "The portal in which new users must be added"
-msgstr ""
+msgstr "Portalul in care trebuie adaugati noi utilizatori"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard
 msgid "Portal Wizard"
-msgstr ""
+msgstr "Wizard Portal"
 
 #. module: portal
 #: help:res.portal,widget_ids:0
 msgid "Widgets assigned to portal users"
-msgstr ""
+msgstr "Widget-uri atribuite utilizatorilor portalului"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:163
 #, python-format
 msgid "(missing url)"
-msgstr ""
+msgstr "(url lipsa)"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Utilizatori existenti"
 
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Wizard"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -208,63 +221,66 @@ msgid ""
 "Will be used as user login.  Also necessary to send the account information "
 "to new users"
 msgstr ""
+"Va fi utilizat ca nume de autentificare. De asemenea, este nevoie sa "
+"trimiteti informatiile despre cont utilizatorilor noi"
 
 #. module: portal
 #: field:res.portal,parent_menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Meniu principal"
 
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
 msgid "Widget"
-msgstr ""
+msgstr "Widget"
 
 #. module: portal
 #: help:res.portal.wizard.user,lang:0
 msgid "The language for the user's user interface"
-msgstr ""
+msgstr "Limba pentru interfata utilizatorului"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anulati"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Website"
-msgstr ""
+msgstr "Pagina de Internet"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Create Parent Menu"
-msgstr ""
+msgstr "Creati Meniu Principal"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid ""
 "The following text will be included in the welcome email sent to users."
 msgstr ""
+"Textul urmator va fi inclus in mesajul de bun venit trimis utilizatorilor."
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:135
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "Email necesar"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.utilizatori"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "Adresă de mail nevalida"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -272,18 +288,20 @@ msgstr ""
 msgid ""
 "You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Trebuie sa aveti o adresa de e-mail in Preferintele Utilizatorului pentru a "
+"trimite e-mail-uri."
 
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.meniu"
 
 #. module: portal
 #: view:res.portal:0
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -291,38 +309,38 @@ msgstr ""
 #: model:ir.ui.menu,name:portal.portal_menu
 #: view:res.portal:0
 msgid "Portals"
-msgstr ""
+msgstr "Portaluri"
 
 #. module: portal
 #: help:res.portal,parent_menu_id:0
 msgid "The menu action opens the submenus of this menu item"
-msgstr ""
+msgstr "Meniul actiune deschide submeniurile acestui element de meniu"
 
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secventa"
 
 #. module: portal
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Partener Asociat"
 
 #. module: portal
 #: view:res.portal:0
 msgid "Portal Menu"
-msgstr ""
+msgstr "Meniu Portal"
 
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !"
 
 #. module: portal
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,message:0
 msgid "Invitation message"
-msgstr ""
+msgstr "Mesajul de invitatie"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:36
@@ -343,28 +361,42 @@ msgid ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 msgstr ""
+"Stimata(e) %(name)s,\n"
+"\n"
+"Vi s-a creat un cont OpenERP la %(url)s.\n"
+"\n"
+"Datele d-voastra de autentificare in cont sunt:\n"
+"Baza de date: %(db)s\n"
+"Utilizator: %(login)s\n"
+"Parola: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Aplicatii de afaceri Open Source\n"
+"http://www.openerp.com\n"
 
 #. module: portal
 #: model:res.groups,name:portal.group_portal_manager
 msgid "Manager"
-msgstr ""
+msgstr "Director"
 
 #. module: portal
 #: help:res.portal.wizard.user,name:0
 msgid "The user's real name"
-msgstr ""
+msgstr "Numele real al utilizatorului"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.address_wizard_action
 #: model:ir.actions.act_window,name:portal.partner_wizard_action
 #: view:res.portal.wizard:0
 msgid "Add Portal Access"
-msgstr ""
+msgstr "Adaugati Acces Portal"
 
 #. module: portal
 #: field:res.portal.wizard.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: portal
 #: model:ir.actions.act_window,help:portal.portal_list_action
@@ -376,13 +408,26 @@ msgid ""
 "the portal's users.\n"
 "            "
 msgstr ""
+"\n"
+"Un portal ajuta la definirea vizualizarilor specifice si a regulilor pentru "
+"un grup de utilizatori (grupul\n"
+"portalului). Un meniu portal, widget-uri si grupuri specifice pot fi "
+"atribuite\n"
+"utilizatorilor portalului.\n"
+"            "
 
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Wizard Partajare"
 
 #. module: portal
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
-msgstr ""
+msgstr "Director"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Widgets assigned to Users"
+#~ msgstr "Widget-uri atribuite Utilizatorilor"
diff --git a/addons/portal/i18n/ru.po b/addons/portal/i18n/ru.po
index cffcb7aa084..fef542fd5bb 100644
--- a/addons/portal/i18n/ru.po
+++ b/addons/portal/i18n/ru.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/sl.po b/addons/portal/i18n/sl.po
index dc707c4f30b..a71066c8006 100644
--- a/addons/portal/i18n/sl.po
+++ b/addons/portal/i18n/sl.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/sv.po b/addons/portal/i18n/sv.po
index 4f63d583f9f..5f1131074c6 100644
--- a/addons/portal/i18n/sv.po
+++ b/addons/portal/i18n/sv.po
@@ -14,41 +14,41 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "Vänligen välj minst en användare att dela med"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:55
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "Vänligen välj minst en grupp att dela med"
 
 #. module: portal
 #: field:res.portal,group_id:0
 msgid "Group"
-msgstr ""
+msgstr "Grupp"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Befintliga grupper"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Konfigurerings portalanvändare"
 
 #. module: portal
 #: view:res.portal.wizard.user:0
 msgid "Portal User"
-msgstr ""
+msgstr "Portalanvändare"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal_manager
@@ -64,24 +64,24 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Detta bolag är inte tillåtet för den här användaren"
 
 #. module: portal
 #: view:res.portal:0
 #: field:res.portal,widget_ids:0
 msgid "Widgets"
-msgstr ""
+msgstr "Grafiska komponenter"
 
 #. module: portal
 #: view:res.portal.wizard:0
 msgid "Send Invitations"
-msgstr ""
+msgstr "Skicka inbjudan"
 
 #. module: portal
 #: view:res.portal:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Språk"
 
 #. module: portal
 #: view:res.portal:0
@@ -131,12 +131,12 @@ msgstr ""
 #. module: portal
 #: field:res.portal,menu_action_id:0
 msgid "Menu Action"
-msgstr ""
+msgstr "Menyval"
 
 #. module: portal
 #: field:res.portal.wizard.user,name:0
 msgid "User Name"
-msgstr ""
+msgstr "Användarnamn"
 
 #. module: portal
 #: help:res.portal,group_id:0
@@ -168,7 +168,7 @@ msgstr ""
 #: code:addons/portal/portal.py:184
 #, python-format
 msgid "%s Menu"
-msgstr ""
+msgstr "Meny för %s"
 
 #. module: portal
 #: help:res.portal.wizard,portal_id:0
@@ -200,7 +200,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Guide"
 
 #. module: portal
 #: help:res.portal.wizard.user,user_email:0
@@ -217,7 +217,7 @@ msgstr "Parent Menu"
 #. module: portal
 #: field:res.portal,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: portal
 #: field:res.portal.widget,widget_id:0
@@ -259,12 +259,12 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: portal
 #: constraint:res.portal.wizard.user:0
 msgid "Invalid email address"
-msgstr ""
+msgstr "Ogiltig e-postadress"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:136
@@ -276,14 +276,14 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: portal
 #: view:res.portal:0
 #: view:res.portal.wizard:0
 #: field:res.portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.portal_list_action
@@ -301,7 +301,7 @@ msgstr ""
 #. module: portal
 #: field:res.portal.widget,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: portal
 #: field:res.users,partner_id:0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: portal
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Du kan inte ha två användare med samma användarid !"
 
 #. module: portal
 #: view:res.portal.wizard:0
@@ -347,7 +347,7 @@ msgstr ""
 #. module: portal
 #: model:res.groups,name:portal.group_portal_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: portal
 #: help:res.portal.wizard.user,name:0
@@ -385,4 +385,10 @@ msgstr ""
 #. module: portal
 #: model:res.groups,name:portal.group_portal_officer
 msgid "Officer"
-msgstr ""
+msgstr "Officer"
+
+#~ msgid "E-mail"
+#~ msgstr "E-post"
+
+#~ msgid "Widgets assigned to Users"
+#~ msgstr "Grafiska komponenter knutna till användare"
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index 1cccca2bcd5..1cc95a9143e 100644
--- a/addons/portal/i18n/tr.po
+++ b/addons/portal/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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -68,8 +68,8 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "E-posta"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -418,5 +418,8 @@ msgstr "Paylaşım Sihirbazı"
 msgid "Officer"
 msgstr "Yetkili"
 
+#~ msgid "E-mail"
+#~ msgstr "E-posta"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "Kullanıcıya atanmış parçalar"
diff --git a/addons/portal/i18n/uk.po b/addons/portal/i18n/uk.po
index 8d0d1739460..8ecf6197b6e 100644
--- a/addons/portal/i18n/uk.po
+++ b/addons/portal/i18n/uk.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index ff5088093d1..5a5bfb4084c 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:41+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,8 +64,8 @@ msgstr "勾选这一项，可以覆盖门户用户的菜单动作。"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
-msgstr "电子邮件"
+msgid "Email"
+msgstr ""
 
 #. module: portal
 #: constraint:res.users:0
@@ -404,5 +404,8 @@ msgstr "共享向导"
 msgid "Officer"
 msgstr "经理"
 
+#~ msgid "E-mail"
+#~ msgstr "电子邮件"
+
 #~ msgid "Widgets assigned to Users"
 #~ msgstr "指定给用户的部件"
diff --git a/addons/portal/i18n/zh_TW.po b/addons/portal/i18n/zh_TW.po
index 77e7b92e599..fbcaff92230 100644
--- a/addons/portal/i18n/zh_TW.po
+++ b/addons/portal/i18n/zh_TW.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: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -64,7 +64,7 @@ msgstr ""
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: portal
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 1ec4cbb0e4b..5ce1ca2f114 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -27,7 +27,7 @@ from tools.misc import email_re
 from tools.translate import _
 
 from base.res.res_users import _lang_get
-
+_logger = logging.getLogger(__name__)
 
 
 # welcome email sent to new portal users (note that calling tools.translate._
@@ -174,7 +174,7 @@ class wizard(osv.osv_memory):
                 body = _(WELCOME_EMAIL_BODY) % data
                 res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
                 if not res:
-                    logging.getLogger('res.portal.wizard').warning(
+                    _logger.warning(
                         'Failed to send email from %s to %s', email_from, email_to)
         
         return {'type': 'ir.actions.act_window_close'}
@@ -197,7 +197,7 @@ class wizard_user(osv.osv_memory):
             string='User Name',
             help="The user's real name"),
         'user_email': fields.char(size=64, required=True,
-            string='E-mail',
+            string='Email',
             help="Will be used as user login.  "  
                  "Also necessary to send the account information to new users"),
         'lang': fields.selection(_lang_get, required=True,
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index b5c9d165cc6..b2ed8703421 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -21,6 +21,8 @@
 
 from osv import osv, fields
 from tools.translate import _
+import logging
+_logger = logging.getLogger(__name__)
 
 UID_ROOT = 1
 SHARED_DOCS_MENU = "Documents"
@@ -164,19 +166,19 @@ class share_wizard_portal(osv.osv_memory):
             # v6.1, the algorithm for combining them will OR the rules, hence
             # extending the visible data.
             Rules.write(cr, UID_ROOT, share_rule_ids, {'groups': [(4,target_group.id)]})
-            self._logger.debug("Linked sharing rules from temporary sharing group to group %s", target_group)
+            _logger.debug("Linked sharing rules from temporary sharing group to group %s", target_group)
 
             # Copy the access rights. This is appropriate too because
             # groups have the UNION of all permissions granted by their
             # access right lines.
             for access_line in share_group.model_access:
                 Rights.copy(cr, UID_ROOT, access_line.id, default={'group_id': target_group.id})
-            self._logger.debug("Copied access rights from temporary sharing group to group %s", target_group)
+            _logger.debug("Copied access rights from temporary sharing group to group %s", target_group)
 
         # finally, delete it after removing its users
         Groups.write(cr, UID_ROOT, [share_group_id], {'users': [(6,0,[])]})
         Groups.unlink(cr, UID_ROOT, [share_group_id])
-        self._logger.debug("Deleted temporary sharing group %s", share_group_id)
+        _logger.debug("Deleted temporary sharing group %s", share_group_id)
 
     def _finish_result_lines(self, cr, uid, wizard_data, share_group_id, context=None):
         super(share_wizard_portal,self)._finish_result_lines(cr, uid, wizard_data, share_group_id, context=context)
diff --git a/addons/procurement/i18n/es_CL.po b/addons/procurement/i18n/es_CL.po
new file mode 100644
index 00000000000..a8d63ddb292
--- /dev/null
+++ b/addons/procurement/i18n/es_CL.po
@@ -0,0 +1,990 @@
+# Spanish (Chile) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-27 19:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <es_CL@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: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Solicitar nuevos productos"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Planificaciones"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Realizar abastecimientos"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Dispara un abastecimiento automático para todos los productos que tienen un "
+"stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
+"sugerimos utilizar una configuración de \"Obtener bajo pedido\" en productos."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:291
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "¡No se ha definido un proveedor para este producto!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:307
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "No se ha definido dirección para el proveedor"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr "Calcular sólo reglas de stock mínimo"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary Procurement Exceptions"
+msgstr "Excepciones de abastecimiento temporales"
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Cantidad UdV"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Calcular abastecimientos"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Último error"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr "No se utiliza en los cálculos, sólo sirve como información."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "Bajo pedido"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+"Ha ocurrido una excepción mientras se calculaban órdenes de abastecimiento."
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+"Cuando se crea una orden de abastecimiento, su estado es 'Borrador'. \n"
+"Si el abastecimiento se confirma, el estado cambia a 'Confirmada'.           "
+" \n"
+"Después de confirmar el estado se establece como 'En curso'.\n"
+"Si surge cualquier excepción con la orden, el estado pasa a 'Excepción'.\n"
+"Una vez la excepción es solucionada, el estado cambia a 'Preparada'.\n"
+"Está en estado 'En espera' cuando está esperando a que acabe otro "
+"abastecimiento."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr "Excepciones de abastecimiento permanentes"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr "Buscar reglas de stock mínimo"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parámetros del planificador"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr "Calcular todos los planificadores"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr "Planificación"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Preparada"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:123
+#, python-format
+msgid ""
+"Here is the procurement scheduling report.\n"
+"\n"
+"        Start Time: %s \n"
+"        End Time: %s \n"
+"        Total Procurements processed: %d \n"
+"        Procurements with exceptions: %d \n"
+"        Skipped Procurements (scheduled date outside of scheduler range) %d "
+"\n"
+"\n"
+"        Exceptions:\n"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Quantity specified as Max "
+"Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:386
+#, python-format
+msgid "Procurement '%s' is in exception: "
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Bodega"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr "Mejor precio (aún no activo!)"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:111
+#, python-format
+msgid "PROC %d: from stock - %3.2f %-5s - %s"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Producto y Ubicación"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Calcular abastecimiento"
+
+#. module: procurement
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr "Abastecimientos"
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Fecha planificada"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:379
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: procurement
+#: view:product.product:0
+#: field:product.product,orderpoint_ids:0
+msgid "Minimum Stock Rule"
+msgstr "Regla de stock mínimo"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:328
+#, python-format
+msgid ""
+"Please check the quantity in procurement order(s), it should not be 0 or "
+"less!"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Órdenes de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr "Para corregir"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Asignación desde producción o pedido de compra."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Propiedad"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Solicitud de abastecimiento"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Calcular stock"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity specified for this field, "
+"OpenERP generates a procurement to bring the virtual stock to the Max "
+"Quantity."
+msgstr ""
+"Cuando la cantidad virtual de stock es inferior a la Cantidad Mínima, "
+"OpenERP genera un abastecimiento para aumentar el stock virtual a la "
+"cantidad especificada como Cantidad Máxima."
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr "Órdenes de abastecimiento relacionadas"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"El asistente comprobará todas las reglas de stock mínimo y generará órdenes "
+"de abastecimiento."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Cantidad mínima"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr "más"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+"Si el stock de un producto es menor que 0, actuará como una regla de stock "
+"mínimo."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr "Líneas de abastecimiento"
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Este asistente planificará abastecimientos."
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:383
+#, python-format
+msgid "Not enough stock."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:381
+#, python-format
+msgid "No minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:151
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will be rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:327
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:297
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:product.product:0
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_product_product
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s state!"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:356
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement started late"
+msgstr ""
+
+#. module: procurement
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:152
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:88
+#, python-format
+msgid "PROC %d: on order - %3.2f %-5s - %s"
+msgstr ""
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index db313e65353..1c83711abf7 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -550,10 +550,10 @@ class stock_warehouse_orderpoint(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_min_qty': fields.float('Min Quantity', required=True,
+        'product_min_qty': fields.float('Minimum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
-        'product_max_qty': fields.float('Max Quantity', required=True,
+        'product_max_qty': fields.float('Maximum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 547cbb64730..74c5721965f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -280,12 +280,17 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <group colspan="4" attrs="{'invisible':[('type','=','service')]}" groups="stock.group_stock_manager">
-                        <separator string="Minimum Stock Rules" colspan="4"/>
-                        <field name="orderpoint_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
-                    </group>
-                </group>
+                <page string="Procurement &amp; Locations" position="inside">
+                    <separator string="Minimum Stock Rules"/>
+                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+                            <tree string="Reordering Rules">
+                                <field name="name"/>
+                                <field name="warehouse_id"/>
+                                <field name="product_min_qty"/>
+                                <field name="product_max_qty"/>
+                            </tree>
+                        </field>
+                </page>
             </field>
         </record>
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 506688e0a2b..f02c4648c15 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -149,7 +149,7 @@
                                 <field name="seller_ids" context="{'uom_id': uom_id}"/>
                             </page>
                             <page string="Descriptions">
-                                <separator string="Description"/>
+                                <separator string="Internal Description"/>
                                 <field name="description"/>
                                 <separator string="Sale Description"/>
                                 <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
@@ -548,7 +548,7 @@
                         <field name="product_name"/>
                         <field name="product_code"/>
                         <field name="min_qty"/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" groups="product.group_uom"/>
                         <field name="delay"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -702,7 +702,7 @@
                             <field name="seller_ids"/>
                         </page>
                         <page string="Descriptions">
-                            <separator string="Description"/>
+                            <separator string="Internal Description"/>
                             <field name="description"/>
                             <separator string="Sale Description"/>
                             <field name="description_sale"/>
diff --git a/addons/product_visible_discount/i18n/sv.po b/addons/product_visible_discount/i18n/sv.po
new file mode 100644
index 00000000000..1b440cb2d4c
--- /dev/null
+++ b/addons/product_visible_discount/i18n/sv.po
@@ -0,0 +1,62 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-26 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-27 05:28+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "No Sale Pricelist Found!"
+msgstr "Ingen försäljningsprislista funnen!"
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Synlig rabatt"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "No Purchase Pricelist Found!"
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturarad"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Prislista"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "You must first define a pricelist on the supplier form!"
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "You must first define a pricelist on the customer form!"
+msgstr ""
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 0555682c337..49da04245c7 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,13 +24,13 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "إعادة تضمين وصف المهمة في مهمة المستخدم"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "تم تفويض المهمة ‘%s لـ %s."
 
 #. module: project
 #: constraint:res.users:0
@@ -56,18 +56,18 @@ msgstr "أخبر شريك"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "ضع هنا الساعات المتبقية المطلوبة لغلق المهمة."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "المواعيد النهائية"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "غير مسموح بالعملية !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -76,7 +76,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "تحقق: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -98,12 +98,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "تأخير المهمة"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "ساعات التحقق من الصلاحية"
 
 #. module: project
 #: view:project.project:0
@@ -126,17 +126,17 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "ويعطي ترتيب التسلسل عند عرض قائمة المشاريع"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "خطأ! يجب ان يكون تاريخ بدء المشروع اقل من تاريخ انتهائه."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,7 +146,7 @@ msgstr "أعضاء المشروع"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "مهمة من قبل المفوض"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -156,7 +156,7 @@ msgstr "مارس"
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "المهام المفوضة"
 
 #. module: project
 #: field:project.task,child_ids:0
@@ -174,12 +174,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr ""
+msgstr "المهام الخاصة بي"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "خطأ ! لا يمكنك انشاء مهام متداخلة."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "عنوان المهمة الخاصة بك"
 
 #. module: project
 #: field:project.task.type,name:0
@@ -205,7 +205,7 @@ msgstr "اسم المرحلة"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "ضبط معلق"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -215,22 +215,22 @@ msgstr ""
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "حدد المتطلبات والساعات المخططة الموضوعة."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "مرحلة التغيير"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "المشروع الجديد بناءا على القالب"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "خطأ! لا يمكنك تعيين التصعيد لنفس المشروع!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -241,12 +241,12 @@ msgstr "عاجل جداً"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "المسنخدم الذي تريد تفويض هذه المهمة اليه"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "المهمة الخاصة بي"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
@@ -262,12 +262,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "اضبطه كقالب"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "مهمة السحب"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -286,7 +286,7 @@ msgstr "الأعضاء"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "فتح المهامات الخاصة بي"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -303,7 +303,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "عمل مهمة المشروع"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -313,13 +313,13 @@ msgstr "ملاحظات"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "المشروع مقابل الساعات المتبقية"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "متوسط كفاءة الخطة"
 
 #. module: project
 #: help:project.task,active:0
@@ -328,32 +328,35 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"تم حساب هذا الحلق تلقائيًا وله نفس السلوك عن منطقية الحقل ‘الفعال‘: اذا تم "
+"ربط المهمة للقالب اوللمشروع الغير مفعل, سيتم اخفائها الا اذا طلبت على وجه "
+"التحديد."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "ملخص المهمة"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "ليست قالب المهمة"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr ""
+msgstr "ابدء المهمة"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "تم اكتمال المهمة"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
-msgstr ""
+msgstr "المتغيرات التلقائية للرؤوس والتذييل. استخدم نفس التدوين بالضبط."
 
 #. module: project
 #: view:project.task:0
@@ -386,7 +389,7 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "تم تأدية المهمة"
 
 #. module: project
 #: field:project.task,color:0
@@ -406,7 +409,7 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "ويفوض المهام لمستخدم اخر"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
@@ -424,6 +427,8 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"اذا قمت التحقق من هذا, سينبثق المستخدم عند غلق المهمة اقتراح ارسال رسالة الى "
+"العميل."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -434,7 +439,7 @@ msgstr "الإختبار"
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "تم غلق المهمة ‘%s‘"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -450,7 +455,7 @@ msgstr "محسوب باستخدام مجموع مهام الأعمال المن
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "التخطيط"
 
 #. module: project
 #: view:project.task:0 field:project.task,date_deadline:0
@@ -492,7 +497,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# من المهام"
 
 #. module: project
 #: view:project.task:0
@@ -502,12 +507,12 @@ msgstr "السابق"
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "عُينت لـ"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "تاريخ التوقف: %(التاريخ)"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -517,7 +522,7 @@ msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم ا
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "إعادة كمشروع"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
@@ -542,12 +547,12 @@ msgstr "التالي"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "من حالة السحب, ستصبح لحالة الفتح."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# من الايام"
 
 #. module: project
 #: view:project.project:0
@@ -574,12 +579,12 @@ msgstr "نسبة المهام المغلقة وفقاً لمجموع المها
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "وصف مهمة جديدة"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "مهمة المشروع"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -604,17 +609,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "فاعلية الساعات"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "التحقق من صحة عنوان العمل"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "اعادة تقييم"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -625,7 +630,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "تأخير العبور"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -648,7 +653,7 @@ msgstr "الساعات المتبقية"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -682,7 +687,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "لا يوجد مهام معينة للمستخدمين"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -690,6 +695,7 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"مجموع الساعات المخططة لكل المهام المتعلقة بهذا المشروع ومشاريعها المتفرعة."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -705,13 +711,13 @@ msgstr "معلّق"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "العنوان الذي تم تأخيره"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr ""
+msgstr "المشاريع الخاصة بي"
 
 #. module: project
 #: view:project.task:0
@@ -757,12 +763,14 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"حدد الخطوات التي ستستخدم في المشروع من انشاء المهمة, صعودا الى غلق المهمة او "
+"المسالة. ستسخدم هذه المراحل بالترتيب لتعقب الاجراء في حل المهمة او المسألة."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "تم فتح المهمة ‘%s‘."
 
 #. module: project
 #: view:project.task:0
@@ -772,7 +780,7 @@ msgstr "تواريخ"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "عنوان جديد للمهمة المؤجلة للمستخدم"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -785,12 +793,12 @@ msgstr ""
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "المشروع مقابل الساعات المتوقعة والكلية"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "مهمة فتتح السحب"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -812,13 +820,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "تحليل المهام"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "المندوب"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -843,12 +851,12 @@ msgstr "مشروع"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_تقييم"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "لجنتي"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -870,7 +878,7 @@ msgstr "إدارة المشاريع"
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "وحدة الزمن للمشروع"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -881,7 +889,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "تأخير مهمة المشروع"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -916,6 +924,13 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"تمثل المهمة العمل الذي يتعين القيام به. كل مستخدم يعمل في قائمة خاصة به من "
+"مهام، حيث يمكن أن تسجل عمله مهمة في ساعات. انه يمكن العمل وإغلاق المهمة "
+"نفسها أو تفويض ذلك إلى مستخدم آخر. إذا قمت بتفويض المهمة لمستخدم آخر، ستحصل "
+"على مهمة جديدة في حالة معلقة، والتي سيتم فتحه عندما يكون لديك لمراجعة العمل "
+"المنجز. إذا قمت بتثبيت وحدة سجل الدوام_للمشروع، يمكن عمل فاتورة لعمل المهمة "
+"بناء على ضبط المشروع. مع وحدة project_mrp، يمكن أن ينشا اوامر البيع  المهام "
+"تلقائيا عندما يتم تأكيدها."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -941,11 +956,15 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"اذا تم انشاء المهمة ستكونالحالة ‘مشروع‘.\n"
+"اذا بدأت المهمة, ستصبح الحالة ‘في التقدم‘.\n"
+"اذا احتاجت المراجعة الى المهمة ستكون الحالة ‘معلق‘.\n"
+"اذا كانت المهمة زائدة, ستعيين الحالات الى ‘تم‘."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -956,13 +975,13 @@ msgstr "شهر"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "مرحلة المهمة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -985,7 +1004,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "الحالات: %(الحالة)"
 
 #. module: project
 #: help:project.task,sequence:0
@@ -1007,7 +1026,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "المهام الاساسية"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1041,7 +1060,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "المستخدم: %(هوية_المستخدم)"
 
 #. module: project
 #: view:project.project:0
@@ -1062,7 +1081,7 @@ msgstr "أولوية"
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "قوالب المشاريع"
 
 #. module: project
 #: view:project.project:0
@@ -1072,7 +1091,7 @@ msgstr "الإدارة"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "اعادة تقييم.المهمة.المشروع"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -1088,12 +1107,12 @@ msgstr "عضو"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "الوقت المقدر لغلق هذه المهمة بواسطة المستخدم المفوض"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1126,6 +1145,9 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"يسمح لك هذا التقرير بتحليل اداء المشاريع الخاصة بك والمستخدمين. يمكنك تحليل "
+"كميات المهام, الساعات المقضية مقارنة بالساعات المخطط اليها, عدد الايام "
+"المتوسط لفتح او غلق المهمة, هكذا."
 
 #. module: project
 #: view:project.task:0
@@ -1138,6 +1160,7 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"اعضاء المشروع هم مستخدمين يمكنهم الوصول للمهمة المتعلقة بهذا المشروع."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1152,7 +1175,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "المهام بالمستخدم والمشروع"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1183,6 +1206,7 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"حالة جديدة لمهمتك الخاصة. وسيرد التعليق تلقائيًا عند غلق المهمة المتأخرة"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1210,12 +1234,12 @@ msgstr "الأيام للغلق"
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "لوحة التحكم للمشروع"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "إعادة تنشيط"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
@@ -1247,7 +1271,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "تم غلق المشروع ‘%s‘."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1257,7 +1281,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "تعديل المهمة"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1292,6 +1316,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"اذا تم تعيين الحقل الفعال الى خطأ, سيسمح لك بإخفاء المشروع بدون ازالتها."
 
 #. module: project
 #: view:project.task:0
@@ -1311,13 +1336,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "ابحث عن المشروع"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "تم فتح المشروع ‘%s‘."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1337,6 +1362,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"ستعين هذه وحدة القياس المستخدمة في المشروعات والمهام.\n"
+"اذا استخدمت سجل الدوام المتصل بالمشاريع(وحدة سجل الدوام_للمشروع), لا تنسى "
+"بضبط الوحدة الصحيحة للقياس في الموظفين الخاصين بك."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1348,17 +1376,17 @@ msgstr "خطأ"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "مشاريع المستخدم"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_التفويض"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "عدد الايام لفتفتح المهمة"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1387,7 +1415,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "عنوان لمهمة التحقق بالصلاحية الخاصة بك"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1405,7 +1433,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "عدد الساعات الكلية"
 
 #. module: project
 #: view:project.task:0 field:project.task,state:0
@@ -1426,12 +1454,12 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "تم تعيين المهمة ‘%s‘ في مرحلة التقدم"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "تاريخ البداية: %(تاريخ_البدء)"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -1440,6 +1468,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"اربط هذا المشروع بالحساب التحليلي اذا كنت تحتاج الى ادارة مالية على "
+"المشاريع. وهي تمكنك بالاتصال بالمشاريع مع الميزانيات, والتخطيط, والتكلفة "
+"وتحليل العائد, سجلات الدوام على المشروع, وهكذا."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1471,7 +1502,7 @@ msgstr "إغلاق"
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "فتح المهمة"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1482,7 +1513,7 @@ msgstr "فتح"
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "هوية: %(هوية_المهمة)"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1514,7 +1545,7 @@ msgstr ""
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1536,17 +1567,17 @@ msgstr ""
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "المهمة ‘%s‘ معلقة."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " المشروع مقابل الساعات"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "المهمة المؤجلة"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1554,6 +1585,7 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"مجموع الساعات المقضية لكل المهم المتعلقة بهذا المشروع ومشاريعها الفرعية."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1579,12 +1611,12 @@ msgstr "تخطي الموعد النهائي"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "المواعيد النهائية للمهمة الخاصة بي"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1594,7 +1626,7 @@ msgstr "التّطوير"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "الساعات المتبيقة لي للمشروع"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1615,12 +1647,12 @@ msgstr "مايو"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr ""
+msgstr "التحقق من صلاحية المهمة"
 
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "المهام الكلية"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1634,12 +1666,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "المهام المؤخرة الخاصة بي"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "المهام: %(الاسم)"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1660,7 +1692,7 @@ msgstr "الوقت المستغرق"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "الحسابات الخاصة بي للفاتورة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -1670,20 +1702,20 @@ msgstr ""
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "تمت هذه المهمة ‘%s‘"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "مجموع الساعات الكلية لكل المهام المتعلقة بهذا المشروع وفروعها."
 
 #. module: project
 #: field:project.task.type,project_default:0
@@ -1693,7 +1725,7 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "عند اكتمال المهمة, ستصبح في حالة تم."
 
 #. module: project
 #: view:project.project:0
@@ -1716,7 +1748,7 @@ msgstr "فبراير"
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "المهمة بالايام"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1731,12 +1763,12 @@ msgstr "تحرير"
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "تشفير ساعات العمل الخاصة بك"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "ملخص العمل"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1746,7 +1778,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "عدد الايام لغلق المهمة"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1771,7 +1803,7 @@ msgstr "متفرقات"
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "فتح المهمة المكتملة"
 
 #. module: project
 #: view:project.task.type:0
@@ -1781,7 +1813,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "الساعات المقضية"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1793,13 +1825,13 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "ويعطي امر التسلسل عند عرض قائمة للمشاريع."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "تم غلق المهمة ‘%s‘"
 
 #. module: project
 #: field:project.task,id:0
@@ -1820,7 +1852,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "المهام الزائدة"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1842,7 +1874,7 @@ msgstr "مسلسل"
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "الساعات المتبقية لكل مشروع"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1850,6 +1882,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"تم اضافة التذييل عند بداية البريد الالكتروني للرساله التحذيرية المرسلة الى "
+"العميل عند غلق المهمة."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1863,22 +1897,29 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"يحتوي المشروع على مجموعة من المهام أو القضايا التي سوف يتم تنفيذها من قبل "
+"الموارد الخاصة بك المسندة إليها. يمكن أن يكون المشروع بتنظيم هرمي، وهو جزء "
+"من المشروع الرئيسي. هذا يسمح لك لتصميم الهياكل للمشروع الكبير مع مختلف مراحل "
+"موزعة على المشروع المشروع خلال الدورة. يمكن لكل مستخدم ضبط مشروعه الافتراضي "
+"في تفضيلاته الخاصة لتصفية تلقائيا المهام أو القضايا التي عادة ما يعمل عليها. "
+"إذا اخترت فاتورة للوقت الذي يقضيه في مهمة المشروع، يمكنك العثور على مهام "
+"المشروع لعمل الفاتورة في قسم الفواتير."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "عمل المهمة"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "التحقق من صلاحية الحالة"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "تم الغاء المهمة ‘%s‘"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1886,6 +1927,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"الوقت المقدر لك للتحقق من صلاحية العمل المكتمل من المستخدم لمن قمت بتفويضه "
+"بهذه المهمة."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1901,7 +1944,7 @@ msgstr "إنشاء تاريخ"
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "تم الغاء المهمة ‘%s‘."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1919,23 +1962,23 @@ msgstr "شريك"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "ارسل بريد الكتروني بعد غلق المهمة"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "مراحل المهام"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "فوض المهمة الخاصة بك الى مستخدم اخر"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "تذييل البريد"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -2015,3 +2058,166 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "الاسم"
+
+#~ msgid "Public Notes"
+#~ msgstr "ملاحظات عامة"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "إنجاز المهام"
+
+#~ msgid "Delegations"
+#~ msgstr "التفويضات"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "تعقب القضايا"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "تعيين المهم"
+
+#~ msgid "Warn Message"
+#~ msgstr "رسالة تحذير"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "المشاريع:المخطط مقابل الساعات الكلية"
+
+#~ msgid "SCRUM"
+#~ msgstr "سكروم"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "يساعد على انتاج الفواتير على أساس الوقت الذي يقضيه في المهام، إذا تفعيلها في "
+#~ "هذا المشروع."
+
+#~ msgid "Project Close Task"
+#~ msgstr "يغلق المشروع المهمة"
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "قم بضبط تطبيق ادارة المشروع الخاص بك"
+
+#~ msgid "Reactivate Project"
+#~ msgstr "إعادة تفعيل المشروع"
+
+#~ msgid "Specification"
+#~ msgstr "تخصيص"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "عنوان البريد الالكتروني للعميل"
+
+#~ msgid "Methodologies"
+#~ msgstr "المنهجيات"
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "الرجاء تحديد عنوان البريد الالكتروني لمدير المشروع."
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "ويساعد المحاسبين في ادارة المزيد من الميزانية والتحليل"
+
+#~ msgid "Parent Project"
+#~ msgstr "المشروع الاساسي"
+
+#~ msgid "Customer Email"
+#~ msgstr "البريد الالكتروني للعميل"
+
+#~ msgid "Task Edition"
+#~ msgstr "تعديل المهمة"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "تحذير المدير عن طريق البريد الالكتروني"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr "غير قادر على ارسال البريد لانه لم يتم ضبط عنوان البريد الالكتروني!"
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr "لا يمكنك حذف المشروع بالمهام. اقترح عليك الغائها."
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "تحذير العميل بالبريد الالكتروني"
+
+#~ msgid "Month works"
+#~ msgstr "اعمال الشهر"
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "الرجاء تخصيص عنوان بريد الكتروني للعميل."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "وتمكنك من تعقب المشاريع الطويلة الاجل, شاملة على مشاريع ذات مراحل متعدده  "
+#~ "وتناول تخصيص المصدر."
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "تم حسابها كإختلاف في التوقيت المقدر من مدير المشروع والوقت الحقيقي لغلق "
+#~ "المهمة."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "الوقت القانوني للمهمة"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "عنوان البريد الالكتروني لمدير المشروع"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "ضبط تطبيق المشروع"
+
+#~ msgid "project.installer"
+#~ msgstr "مُثبت.المشروع"
+
+#~ msgid "Warn Customer"
+#~ msgstr "تحذير العميل"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "المشاريع الخاصة بي: المخططة مقابل الساعات الكلية"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr ""
+#~ "غير قادر على ارسال البريد! تحقق من هويات البريد الالكتروني و اعدادات التكوين "
+#~ "لـsmtp"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "تتزامن تلقائيًا مهام المشروع و حالات ادارة علاقات العملاء."
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "وتُتاح تطبيقات OpenERP المتنوعه لادارة المشاريع الخاصة بك بمستوى مختلف من "
+#~ "التحكم والمرونة."
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr "وتتعقب وتنفذ المفاهيم و علامات المهمة المحددة في منهج سكروم."
+
+#~ msgid ""
+#~ "GTD is a methodology to efficiently organise yourself and your tasks. This "
+#~ "module fully integrates GTD principle with OpenERP's project management."
+#~ msgstr ""
+#~ "GTD هي منهجية لتنظيمك وتنظيم مهامك بكفاءة. وتنتج هذه الوحدة بشكل كامل مبدأ "
+#~ "GTD مع ادارة مشروع OpenERP."
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "تتعقب وحدة ادارة المشروع المشاريع المتعددة المستوى,المهام,العمل المتمم على "
+#~ "المهام, هكدذ. وهي قادرة على تقدير التخطيط, مهام الامر, هكذا.\n"
+#~ "لوحة القيادة لاعضاء المشروع تتضمن:\n"
+#~ "*قائمة من الماه الخاصة بي المفتوحة\n"
+#~ "*قائمة اعضاء المشروع\n"
+#~ "    "
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 63ac1ba73bc..51753d255b6 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "Оставащи часове"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index e717609fc3d..bf6f4db558a 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index fe6931f2711..8a20f0d3fcd 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,7 +662,7 @@ msgstr "Hores restants"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 92c17d9f44a..db09f811f46 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
@@ -655,7 +655,7 @@ msgstr "Zbývající hodiny"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 47229bed142..455c84bff0e 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 19c942300a8..1f9f51077b2 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/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: 2012-02-16 05:04+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,8 +662,8 @@ msgstr "Verbleibende Stunden"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2570,3 +2570,6 @@ msgstr "Aufgaben in Bearbeitung"
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Fehler! Die Währung muss der Währung des Unternehmens entsprechen"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 948483990e2..2479fda7f84 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -657,7 +657,7 @@ msgstr "Ώρες που Απομένουν"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 303aafd2af6..e61530f7e28 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/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: 2012-02-16 05:04+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,8 +662,8 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2565,3 +2565,6 @@ msgstr ""
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index c82036c48f7..f99c47bbd68 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -654,7 +654,7 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index 0cce28f4ee4..2109b8a0b7d 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-17 22:33+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-18 04:57+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: \n"
 
 #. module: project
@@ -665,8 +665,8 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2579,3 +2579,6 @@ msgstr "Tarea en progreso"
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index c3781604aa0..f57f2977b16 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -13,39 +13,40 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nuevas tareas"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr "Incluir la descripción de la tarea en la del usuario"
+msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "La tarea '%s' has sido delegada a '%s'."
+msgstr "La tarea '%s' ha sido delegada a %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "LA compañia elegida no esta en las permitidas por el usuario."
+msgstr ""
+"La compañía seleccionada no está autorizada como compañía para este usuario"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mes anterior"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mis tareas"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +81,7 @@ msgstr "COMPROBAR: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email del usuario"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +93,7 @@ msgstr "Trabajo realizado"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡ Advertencia !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +108,7 @@ msgstr "Horas a validar"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Proyectos pendientes"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +122,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Reabrir proyecto"
 
 #. module: project
 #: help:project.project,priority:0
@@ -192,7 +193,7 @@ msgstr "Compañía"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tareas pendientes"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -212,7 +213,7 @@ msgstr "Cambiar a pendiente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -259,7 +260,7 @@ msgstr "Día"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Proyectos y Etapas"
 
 #. module: project
 #: view:project.project:0
@@ -296,11 +297,13 @@ msgstr "Mis tareas abiertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Por favor, especifique el Administrador del proyecto o la dirección de "
+"correo electrónico del Administrador del proyecto."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Para cancelar la tarea"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -365,7 +368,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar únicamente las tareas con fecha límite"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -388,7 +391,7 @@ msgstr "Cabecera correo"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Cambiar a la siguiente etapa"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -398,7 +401,7 @@ msgstr "Tarea realizada"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Color del Indice"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -408,7 +411,7 @@ msgstr "Configuración"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mes actual"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -476,12 +479,12 @@ msgstr "_Cancelar"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Listo"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Cambiar color"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -497,7 +500,7 @@ msgstr " (copia)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nuevas tareas"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -562,18 +565,18 @@ msgstr "# de Días"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Proyectos abiertos"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "¡Usted debe asignar miembros al proyecto '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tareas en proceso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -597,7 +600,7 @@ msgstr "Tarea del proyecto"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nueva"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -608,7 +611,7 @@ msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flujo acumulado"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -630,7 +633,7 @@ msgstr "Reevaluar"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +649,7 @@ msgstr "Media"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tareas pendientes"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -658,19 +661,19 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tiempo restante"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -738,7 +741,7 @@ msgstr "Julio"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Diagrama de quemado de tareas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -796,6 +799,7 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"No puede eliminar un proyecto que contenga tareas. Le sugerimos desactivarlo."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -820,7 +824,7 @@ msgstr "Retraso horas"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Muy importante"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -841,6 +845,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Si selecciona este campo, el responsable de proyecto recibirá un email cada "
+"vez que una tarea sea completada por su equipo."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -874,7 +880,7 @@ msgstr "Etapas"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Cambiar a etapa anterior"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -890,7 +896,7 @@ msgstr "Unidad de tiempo proyecto"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -917,7 +923,7 @@ msgstr "Padre"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcar como bloqueada"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -995,7 +1001,7 @@ msgstr "Etapa de Tarea"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Diseño"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1008,7 +1014,7 @@ msgstr "Horas estimadas"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Revisar etapas de tareas"
 
 #. module: project
 #: view:project.project:0
@@ -1018,7 +1024,7 @@ msgstr "Estado: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Da el orden de secuencia cuando se muestra una lista de tareas."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1030,7 +1036,7 @@ msgstr "Fecha Inicio"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Listo para extraer"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1043,7 +1049,7 @@ msgstr "Tareas padre"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1051,11 +1057,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Si la tarea tiene un progreso de 99,99% debe cerrar la tarea si está "
+"terminada o reevaluar el tiempo"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Dirección de contacto"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1065,6 +1073,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Las tareas en estado Kanban indican situaciones especiales que le afectan:\n"
+"        * Normal, es la situación por defecto\n"
+"        * Bloqueado, indica que algo está impidiendo el progreso de esta "
+"tarea\n"
+"        * Listo para extraer, indica que la tarea está lista para ser "
+"extraida a la siguiente etapa"
 
 #. module: project
 #: view:project.project:0
@@ -1079,7 +1093,7 @@ msgstr "Facturación"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para cambiar al estado delegar"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1106,7 +1120,7 @@ msgstr "Reevaluar"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CONSULTAR: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1140,7 +1154,7 @@ msgstr "Baja"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Estado Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1162,7 +1176,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Tipo de cambio"
 
 #. module: project
 #: help:project.project,members:0
@@ -1170,6 +1184,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Los miembros del proyecto son usuarios que pueden tener un acceso a las "
+"tareas relacionadas con este proyecto."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1179,7 +1195,7 @@ msgstr "Responsable de proyecto"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Para cambiar ha estado realizado"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1196,7 +1212,7 @@ msgstr "Agosto"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1207,7 +1223,7 @@ msgstr "Nombre del proyecto"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Histórico de tareas"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1222,7 +1238,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor indique el cliente o email del cliente"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1254,7 +1270,7 @@ msgstr "Reactivar"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: project
 #: field:project.project,active:0
@@ -1275,7 +1291,7 @@ msgstr "Noviembre"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Cree sus primeros proyectos"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1286,7 +1302,7 @@ msgstr "El poryecto '%s' ha sido cerrado"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Tareas del flujo acumulado"
 
 #. module: project
 #: view:project.task:0
@@ -1301,7 +1317,7 @@ msgstr "Octubre"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar tiempo planificado y abrir tarea"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1309,11 +1325,13 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculado como la diferencia del tiempo estimado por el responsable del "
+"proyecto y el tiempo real para cerrar la tarea."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico de delegaciones"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1341,7 +1359,7 @@ msgstr "Compañias"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Proyectos en los cuales soy miembro."
 
 #. module: project
 #: view:project.project:0
@@ -1437,7 +1455,7 @@ msgstr "Filtros extendidos..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1459,7 +1477,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Debe especificar un usuario delegado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1539,7 +1557,7 @@ msgstr "En progreso"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Análisis de tareas"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1548,16 +1566,19 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarea hija sigue abierta.\n"
+"Por favor, cancelar o completar la tarea hija primero."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapas comunes a todos los proyectos"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1573,7 +1594,7 @@ msgstr "Tiempo trabajado"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Proyectos en los cuales soy responsable"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1674,6 +1695,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Si marca este campo, esta etapa se propondrá de forma predeterminada en cada "
+"nuevo proyecto. No se podrá asignar esta etapa en los proyectos existentes."
 
 #. module: project
 #: view:board.board:0
@@ -1711,7 +1734,7 @@ msgstr "Mis cuentas a facturar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Despliegue"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1736,7 +1759,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Común a todos los proyectos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1769,7 +1792,7 @@ msgstr "Tareas por Día"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: project
 #: view:project.task:0
@@ -1789,7 +1812,7 @@ msgstr "Resumen del trabajo"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mes-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1799,7 +1822,7 @@ msgstr "Número de Dias para cerrar la tarea"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mes-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1824,7 +1847,7 @@ msgstr "Abrir tarea realizada"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comunes"
 
 #. module: project
 #: view:project.task:0
@@ -1837,6 +1860,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Las etapas pueden ser comunes a todos los proyectos o específicos de un "
+"proyecto. Cada tarea seguirá en orden las diferentes etapas para ser cerrada."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1858,12 +1883,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Grafico de Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tareas asignadas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1873,12 +1898,12 @@ msgstr "Tareas sobrepasadas"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Año actual"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1967,7 +1992,7 @@ msgstr "La tarea '%s' esta cancelada"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para cambiar a estado abierto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2001,7 +2026,7 @@ msgstr "Pie correo"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tareas en progreso"
 
 #~ msgid ""
 #~ "Project's member. Not used in any computation, just for information purpose."
@@ -2540,3 +2565,6 @@ msgstr ""
 #~ msgstr ""
 #~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
 #~ "seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index 4e716165a78..bd88b227967 100644
--- a/addons/project/i18n/es_PY.po
+++ b/addons/project/i18n/es_PY.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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index d3b671b0248..565a837e4e6 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -652,7 +652,7 @@ msgstr "Järelejäänud tunnid"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 18f7b8b630d..853d059b201 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -650,7 +650,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 007b2a5c5d1..e1d6db8aa7c 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Uudet tehtävät"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -41,12 +41,12 @@ msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Edellinen kuukausi"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Omat tehtävät"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -81,7 +81,7 @@ msgstr "TARKISTA: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Käyttäjän sähköposti"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -93,7 +93,7 @@ msgstr "Työ tehty"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varoitus !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -108,7 +108,7 @@ msgstr "Tarkistettavat tunnit"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Odottavat projektit"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -122,7 +122,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Avaa projekti uudelleen"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Yritys"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Odottavat tehtävät"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -211,7 +211,7 @@ msgstr "Aseta odottamaan"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Tarkeä"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -258,7 +258,7 @@ msgstr "Päivä"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projektit ja vaiheet"
 
 #. module: project
 #: view:project.project:0
@@ -295,11 +295,12 @@ msgstr "Omat avoimet tehtävät"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Ole hyvä ja määrittele projektipäällikkö tai hänen sähköpostiosoitteensa."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Peruuttaaksesi tehtävän"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -320,7 +321,7 @@ msgstr "Projekti vs. jäljelläolevat tunnit"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Keskimääräinen suunniteltu tehokkuus"
 
 #. module: project
 #: help:project.task,active:0
@@ -361,7 +362,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Näytä vain tehtävät joilla on takaraja"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -384,7 +385,7 @@ msgstr "Sähköpostin ylätunniste"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Vaihda seuraavaan vaiheeseen"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -394,7 +395,7 @@ msgstr "Tehty tehtävä"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Väri-indeksi"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -404,7 +405,7 @@ msgstr "Konfiguraatio"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Kuluva kuukausi"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -466,17 +467,17 @@ msgstr "Määräaika"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Valmis"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Vaihda väriä"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -492,7 +493,7 @@ msgstr " (kopio)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Uudet tehtävät"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -557,18 +558,18 @@ msgstr "Päivien määrä"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Avoimet projektit"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Sinun pitää määritellä projektin jäsenet '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Meneillään olevat tehtävät"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -592,7 +593,7 @@ msgstr "Projekti tehtävä"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -603,7 +604,7 @@ msgstr "Laskettu: käytetty aika + jäljelläoleva aika"
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Kumulatiivinen virtaus"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -625,12 +626,12 @@ msgstr "Uudelleenarvioi"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopio)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Ohituksen viive"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -641,7 +642,7 @@ msgstr "Keskitaso"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Odottavat tehtävät"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -653,19 +654,19 @@ msgstr "Jäljellä olevat tunnit"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Jäljellä oleva aika"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -788,6 +789,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Et voi poistaa projekteja jotka sisältävät tehtäviä. Suosittelen että se "
+"muutetaan epäaktiiviseen tilaan."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -812,7 +815,7 @@ msgstr "Viivästyneet tunnit"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Erittäin tärkeä"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -833,6 +836,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Jos valitset tämän kentän, projektipäällikkö saa aina sähköpostia kun jokin "
+"tehtävä valmistuu"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -866,7 +871,7 @@ msgstr "Vaiheet"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Vaihda edelliseen vaiheeseen"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -882,7 +887,7 @@ msgstr "Projektin aikayksikkö"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -909,7 +914,7 @@ msgstr "vanhempi"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Merkitse estetyksi"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -974,7 +979,7 @@ msgstr "Tehtävän vaihe"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Suunnittele"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -987,7 +992,7 @@ msgstr "Suunnitellut tunnit"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Tarkista tehtävän vaiheet"
 
 #. module: project
 #: view:project.project:0
@@ -997,7 +1002,7 @@ msgstr "Tila: (state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä tehtäväluetteloa."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1022,7 +1027,7 @@ msgstr "Ylätason tehtävät"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Estetty"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1030,11 +1035,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Jos tehtävän valmistumisaste on 99.99%, sinun tulisi sulkea tehtävä jos se "
+"on valmis tai uudelleenarvioida aika."
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "kontaktin osoite"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1058,7 +1065,7 @@ msgstr "Laskutus"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Vaihtaaksesi deletointitilaan"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1085,7 +1092,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "Tarkista: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1120,7 +1127,7 @@ msgstr "Matala"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban tila"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1145,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Vaihda tyyppi"
 
 #. module: project
 #: help:project.project,members:0
@@ -1157,7 +1164,7 @@ msgstr "Projektipäällikkö"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Vaihtaaksesi valmis tilaan"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1174,7 +1181,7 @@ msgstr "Elokuu"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaali"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1185,7 +1192,7 @@ msgstr "Projektin nimi"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Tehtävähistoria"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1200,7 +1207,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Ole hyvä ja määrittele asiakas tai asiakkaan sähköpostiosoite."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1232,7 +1239,7 @@ msgstr "Uudelleen aktivoi"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: project
 #: field:project.project,active:0
@@ -1253,7 +1260,7 @@ msgstr "Marraskuu"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Luo ensimmäiset projektisi"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1264,7 +1271,7 @@ msgstr "Projekti '%s' on suljettu"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Tehtävien kumulatiivinen virtaus"
 
 #. module: project
 #: view:project.task:0
@@ -1279,7 +1286,7 @@ msgstr "Lokakuu"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Tarkista suunniteltu aika ja avaa tehtävä"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1293,7 +1300,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Delegointien historia"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1322,7 +1329,7 @@ msgstr "Yritykset"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projektit joissa olen jäsenenä"
 
 #. module: project
 #: view:project.project:0
@@ -1414,7 +1421,7 @@ msgstr "Laajennetut Suotimet..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Ole hyvä ja poista tähän tunnukseen linkitetty projekti ensin."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1436,7 +1443,7 @@ msgstr "Tila"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Delegoitu käyttäjä tulisi olla määriteltynä"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1512,7 +1519,7 @@ msgstr "Käynnissä"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Tehtävien analyysi"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1521,11 +1528,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Alatason tehtävä yhä avoin.\n"
+"Ole hyvä ja peruuta tai merkitse valmiiksi se ensin."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Kaikille projekteille yhteiset vaiheet"
 
 #. module: project
 #: constraint:project.task:0
@@ -1547,7 +1556,7 @@ msgstr "Työaika"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projektit joissa olen päällikkönä"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1583,7 +1592,7 @@ msgstr "Erittäin vähäinen"
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Aikatauluta työtunnit säätääkseksi gantt diagrammin raporttia"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1684,7 +1693,7 @@ msgstr "Omat laskutettavat tilit"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Käyttöönotto"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1708,7 +1717,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Yhteinen kaikille projekteille"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1741,7 +1750,7 @@ msgstr "Tehtävä päivien mukaan"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Yrityksen nimi on jo käytössä!"
 
 #. module: project
 #: view:project.task:0
@@ -1761,7 +1770,7 @@ msgstr "Työn yhteenveto"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Toissakuukausi"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1771,7 +1780,7 @@ msgstr "Päivien määrä tehtävän valmistumiseksi"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Edellinen kuukausi"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1796,7 +1805,7 @@ msgstr "Avaa valmiiksimerkitty tehtävä"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Yhteinen"
 
 #. module: project
 #: view:project.task:0
@@ -1824,7 +1833,7 @@ msgstr "Tehtävä '%s' on suljettu"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "TUNNISTE (ID)"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
@@ -1835,7 +1844,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Määritellyt tehtävät"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1845,12 +1854,12 @@ msgstr "Ohitetut tehtävät"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Kuluva vuosi"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisen kumppanin luonti ei ole sallittu."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1930,7 +1939,7 @@ msgstr "Tehtävä '%s' on peruttu"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Vaihtaaksesi avoimeen tilaan"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1964,7 +1973,7 @@ msgstr "Sähköpostiviestin alatunnite"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Meneilläänolevat tehtävät"
 
 #~ msgid "Close Task"
 #~ msgstr "Sulje tehtävä"
@@ -2326,3 +2335,6 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "otsikko"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Sähköpostin luonti velho"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index fa21a2b724b..1b8e319fa1a 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nouvelles tâches"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -43,12 +43,12 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mois précédent"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mes Tâches"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -83,7 +83,7 @@ msgstr "VALIDATION: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Courriel de l'utilisateur"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -95,7 +95,7 @@ msgstr "Travail effectué"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -105,12 +105,12 @@ msgstr "Déléguer une tâche"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Temps à valider"
+msgstr "Temps pour validation"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projets en attente"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Rouvrir le projet"
 
 #. module: project
 #: help:project.project,priority:0
@@ -196,7 +196,7 @@ msgstr "Société"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tâches en attente"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -216,7 +216,7 @@ msgstr "Mettre en attente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -264,7 +264,7 @@ msgstr "Jour"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projets et étapes"
 
 #. module: project
 #: view:project.project:0
@@ -300,12 +300,12 @@ msgstr "Mes tâches ouvertes"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Spécifier le nom du responsable ou son adresse de courriel."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Pour supprimer la tâche"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -370,7 +370,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Afficher seulement les tâches avec une date limite"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -393,7 +393,7 @@ msgstr "En-tête du courriel"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Faire passer à l'étape suivante"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -403,7 +403,7 @@ msgstr "Tâche terminée"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Couleur"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -413,7 +413,7 @@ msgstr "Configuration"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mois en cours"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -481,12 +481,12 @@ msgstr "_Annuler"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Prêt"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Modifier la couleur"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -502,7 +502,7 @@ msgstr " (copie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nouvelles tâches"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -512,7 +512,7 @@ msgstr "Nb de tâches"
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr "Précédent"
+msgstr "Précédente"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -553,7 +553,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr "Suivant"
+msgstr "Suivante"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -568,18 +568,18 @@ msgstr "Nb de jours"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Projets ouverts"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Vous devez assigner des membres au projet '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tâches en cours"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -604,18 +604,18 @@ msgstr "Tâche de projet"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculer comme: Temps passé + Temps restant"
+msgstr "Calculé comme : Temps passé + Temps restant."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flux cumulé"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -637,7 +637,7 @@ msgstr "Réévaluer"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Moyenne"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tâches en attente"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -665,19 +665,19 @@ msgstr "Heures restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Temps restant"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -689,7 +689,7 @@ msgstr "Temps planifié"
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr "Information"
+msgstr "Suivi"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -724,7 +724,7 @@ msgstr "En attente"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr "Titre délégué"
+msgstr "Intitulé"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -735,7 +735,7 @@ msgstr "Mes projets"
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "Infos Complémentaires"
+msgstr "Informations complémentaires"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -745,7 +745,7 @@ msgstr "Juillet"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Graphique d'avancement des tâches"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -804,6 +804,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Vous ne pouvez pas supprimer un projet qui contient des tâches. Par contre, "
+"vous pouvez le désactiver."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -828,7 +830,7 @@ msgstr "Retard en heures"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Très important"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -841,7 +843,7 @@ msgstr "Analyse des tâches"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Délégué"
+msgstr "Déléguer"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -849,6 +851,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Si vous cochez, le responsable recevra un courriel à chaque fois qu'une "
+"tâche est fermée par un des membres."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -882,7 +886,7 @@ msgstr "Étapes"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Revenir à l'étape précédente"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -898,7 +902,7 @@ msgstr "Unité de temps du projet"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -925,7 +929,7 @@ msgstr "Parent"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marquer comme bloquée"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -974,11 +978,11 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
-"Si la tâche est créée, le statut est 'Brouillon'.\n"
-" Si la tâche est démarrée, le statut devient 'En cours'.\n"
-" Si une revue est nécessaire, la tâche est en statut 'En attente'.           "
-"                       \n"
-" Si la tâche est terminée, le statut est 'Effectuée'."
+"Si la tâche est créée, son état est 'Brouillon'.\n"
+" Si la tâche est démarrée, l'état devient 'En cours'.\n"
+" Si une revue est nécessaire, l'état de la tâche est  'En attente'.          "
+"                        \n"
+" Si la tâche est terminée, l'état est 'Terminé'."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -1005,7 +1009,7 @@ msgstr "Étape de tâche"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Conception"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1018,17 +1022,17 @@ msgstr "Heures planifiées"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Réexaminer les étapes des tâches"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr "Statut: %(state)s"
+msgstr "État: %(state)s"
 
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Donne la séquence (l'ordre) d'affichage d'une liste de tâches"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1040,7 +1044,7 @@ msgstr "Date de début"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Prêt à avancer"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1053,7 +1057,7 @@ msgstr "Tâche parente"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqué"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1061,11 +1065,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Si la progression de la tâche est 99.99% vous devez soit clôturer la tâche "
+"si elle est terminée soit réévaluer le temps alloué"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adresse du contact"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1075,6 +1081,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"L'état kanban de la tâche indique différentes situations qui peuvent "
+"l'affecter:\n"
+" * Normal : situation par défaut\n"
+" * Bloqué  : indique que quelquechose empêche la tâche d'avancer\n"
+" * Prêt à avancer : indique que la tâche peut passer à l'étape suivante"
 
 #. module: project
 #: view:project.project:0
@@ -1089,7 +1100,7 @@ msgstr "Facturation"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Pour passer à l'état délégué"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1151,7 +1162,7 @@ msgstr "Basse"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "État kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1173,7 +1184,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Modifier le type"
 
 #. module: project
 #: help:project.project,members:0
@@ -1187,12 +1198,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Responsable du projet"
+msgstr "Responsable"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Pour passer à l'état terminé"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1209,7 +1220,7 @@ msgstr "Août"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1220,7 +1231,7 @@ msgstr "Nom du Projet"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Historique des tâches"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1235,7 +1246,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Préciser le client ou l'adresse de courriel du client"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1267,7 +1278,7 @@ msgstr "Ré-activer"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: project
 #: field:project.project,active:0
@@ -1288,7 +1299,7 @@ msgstr "Novembre"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Créer vos premiers projets"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1299,7 +1310,7 @@ msgstr "Le projet '%s' a été fermé."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Flux cumulé des tâches"
 
 #. module: project
 #: view:project.task:0
@@ -1314,7 +1325,7 @@ msgstr "Octobre"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Valider le temps prévu et ouvrir une tâche"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1328,7 +1339,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Historique des délégations"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1357,7 +1368,7 @@ msgstr "Sociétés"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projets dont je suis membre."
 
 #. module: project
 #: view:project.project:0
@@ -1408,7 +1419,7 @@ msgstr "Projets de l'utilisateur"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Déleguer"
+msgstr "_Déléguer"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1453,7 +1464,7 @@ msgstr "Filtres étendus..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Supprimer d'abord le projet lié avec ce compte analytique."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1475,7 +1486,7 @@ msgstr "État"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "L'utilisateur à qui la tâche est déléguée doit être spécifié"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1508,7 +1519,7 @@ msgstr ""
 #: view:report.project.task.user:0 selection:report.project.task.user,state:0
 #: view:res.partner:0 selection:task.by.days,state:0
 msgid "Done"
-msgstr "Effectué"
+msgstr "Terminé"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
@@ -1555,7 +1566,7 @@ msgstr "En cours"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analyse des tâches"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1564,11 +1575,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tâche enfant encore ouverte.\n"
+"Merci d' annuler ou de terminer d'abord  la tâche  enfant."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Étapes communes à tous les projets"
 
 #. module: project
 #: constraint:project.task:0
@@ -1591,7 +1604,7 @@ msgstr "Temps de Travail"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projets dans lesquels je suis membre"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1693,6 +1706,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Si vous cochez ce champ, cette étape sera proposée par défaut sur chaque "
+"nouveau projet. elle ne s'appliquera pas aux projets existants."
 
 #. module: project
 #: view:board.board:0
@@ -1730,7 +1745,7 @@ msgstr "Mes comptes à facturer"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Déploiement"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1754,7 +1769,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Commun à tous les projets"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1787,7 +1802,7 @@ msgstr "Tâches par jour"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: project
 #: view:project.task:0
@@ -1807,7 +1822,7 @@ msgstr "Résumé des tâches"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mois -2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1817,7 +1832,7 @@ msgstr "Nb de jours pour effectuer la tâche"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mois -1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1842,7 +1857,7 @@ msgstr "Rouvrir les tâches terminées"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Commun"
 
 #. module: project
 #: view:project.task:0
@@ -1855,6 +1870,9 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Les étapes peuvent être communes à tous les projets ou spécifiques à un "
+"projet. Chaque tâche suivra les différentes étapes avant de pouvoir être "
+"fermée."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1876,12 +1894,12 @@ msgstr "Id."
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Graphe d'avancement"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tâches affectées"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1891,12 +1909,13 @@ msgstr "Tâches en dépassement"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Année en cours"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1916,8 +1935,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Le pied de page est ajouté à la fin de l'email pour le message "
-"d'avertissement envoyé au client lorsque la tâche est fermée"
+"Le pied de page est ajouté à la fin du courriel du message d'avertissement "
+"envoyé au client lorsque la tâche est fermée"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1931,15 +1950,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
-"Un projet contient des tâches ou des incidents qui seront effectués par vos "
-"ressources auxquels ils sont assignés. Un projet peut avoir une structure "
-"hiérarchique, comme être le fils d'un projet parent.Ceci vous permet de "
-"concevoir des structures de projet large avec différentes phases qui "
+"Un projet contient des tâches ou des incidents qui seront effectués ou "
+"traités par vos ressources auxquels ils sont assignés. Un projet peut avoir "
+"une structure hiérarchique, comme être le fils d'un projet parent. Ceci vous "
+"permet de concevoir des structures de projet avec différentes phases qui "
 "s'étalent pendant toute la durée d'un cycle. Chaque utilisateur peut "
 "s'attribuer un projet par défaut dans ces préférences pour automatiquement "
-"filtrer les tâches et les problèmes sur lesquels ils travaillent. Si vous "
+"filtrer les tâches et les incidents sur lesquels il travaille. Si vous "
 "choisissez de facturer le temps passé sur une tâche d'un projet, vous pouvez "
-"trouver les tâches de projet à facturer dans la section facturation."
+"retrouver les tâches de projet à facturer dans la section facturation."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1949,7 +1968,7 @@ msgstr "Travail effectué"
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr "État de Validation"
+msgstr "État de la validation"
 
 #. module: project
 #: code:addons/project/project.py:882
@@ -1985,7 +2004,7 @@ msgstr "La tâche '%s' est annulée."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Pour revenir à l'état ouvert"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2004,7 +2023,7 @@ msgstr "Envoyer un courriel après avoir fermé la tâche"
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr "Etapes des tâches"
+msgstr "Étapes des tâches"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -2019,7 +2038,7 @@ msgstr "Pied du courriel"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tâches en cours"
 
 #~ msgid "Reinclude the description of the task in the task of the user."
 #~ msgstr "Reprendre la description de la tâche dans la tâche de l'utilisateur."
@@ -2567,3 +2586,6 @@ msgstr ""
 
 #~ msgid "Manager Email"
 #~ msgstr "Courriel du responsable"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant de composition de courriels"
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index c6fad807409..1fd6599bd96 100644
--- a/addons/project/i18n/gl.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index b21d72a8a04..2df235ce585 100644
--- a/addons/project/i18n/gu.po
+++ b/addons/project/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: 2012-02-17 04:57+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index f61a595ce09..ea508ead52c 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: hr\n"
 
 #. module: project
@@ -653,7 +653,7 @@ msgstr "Preostali Sati"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 2bee7f15171..693cc2f89ae 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -664,7 +664,7 @@ msgstr "Hátralévő idő"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index a16bf62eab4..e561d33b548 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 3ef2b7d7bb4..547b485bc7f 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -103,7 +103,7 @@ msgstr "Delega attività"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Ore da convalidare"
+msgstr "Ore per la convalida"
 
 #. module: project
 #: view:project.project:0
@@ -660,7 +660,7 @@ msgstr "Ore Rimanenti"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 23af8d1c547..3fda3a1349c 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.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: 2012-06-21 05:16+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -648,8 +648,8 @@ msgstr "残り時間数"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ウィザード"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1966,3 +1966,6 @@ msgstr "メールフッター"
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
 msgstr "進行中タスク"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ウィザード"
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 490c242c396..ca47b5b5e52 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "남은 시간"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 34374e5033f..a46b3c273c8 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,18 +24,18 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Pakartotinai įtraukite užduoties aprašymą vartotojo užduotyje"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Užduotis '%s' buvo priskirta %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Pasirinkta įmonė nėra galima šiam vartotojui"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -55,12 +55,12 @@ msgstr "Įspėti partnerį"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Įrašykite likusias valandas, reikalingas užduoties baigimui."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Galutiniai terminai"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -75,7 +75,7 @@ msgstr "Veiksmas neleidžiamas!"
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "Patikrinti: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -97,7 +97,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Užduoties delegavimas"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -125,17 +125,17 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Suteikia eiliškumą kai rodomas projektų sąrašas"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Klaida! Projekto pradžios data turi būti ankščiau nei baigimo data."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Pakartotinė užduotis"
 
 #. module: project
 #: field:project.project,members:0
@@ -150,7 +150,7 @@ msgstr "Deleguotos užduotys"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Kovas"
 
 #. module: project
 #: view:project.task:0
@@ -179,13 +179,13 @@ msgstr "Mano užduotys"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti pasikartojančių užduočių."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Įmonė"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -200,7 +200,7 @@ msgstr "Jūsų užduočių antraštė"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etapo pavadinimas"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -220,7 +220,7 @@ msgstr "Apibrėžkite reikalavimus ir planuojamas valanadas."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Pakeisti etapą"
 
 #. module: project
 #: view:project.project:0
@@ -230,7 +230,7 @@ msgstr "Naujas projektas naudojantis šablonu"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Klaida! Jūs negalite išplėsti projekto prie to paties projekto"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -241,18 +241,18 @@ msgstr "Labai skubus"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Vartotojas, kuriam norite priskirti šią užduotį"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Diena"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
@@ -280,13 +280,13 @@ msgstr "Užduotis"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Dalyviai"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mano atviros užduotys"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -332,12 +332,12 @@ msgstr ""
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Užduoties konspektas"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Ne šabloninė užduotis"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -373,7 +373,7 @@ msgstr "Nutrauktas"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -413,7 +413,7 @@ msgstr "Deleguoti užduotis kitiems naudotojams"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -432,13 +432,13 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testuojama"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "Užduotis '%s' uždaryta"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -465,7 +465,7 @@ msgstr "Galutinis terminas"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Atšaukti"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -480,13 +480,13 @@ msgstr ""
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti pasikartojančių analitinių sąskaitų."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " .(kopijuoti)"
 
 #. module: project
 #: view:project.task:0
@@ -496,22 +496,22 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# užduočių"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Ankstesnis"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Priskirtas"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Sustabdymo data: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -536,12 +536,12 @@ msgstr "Mano projektai"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti rekursyvių įmonių."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Sekantis"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -551,7 +551,7 @@ msgstr "Nuo projekto būsenos, pereis į vykdomą būseną ."
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dienos"
 
 #. module: project
 #: view:project.project:0
@@ -579,7 +579,7 @@ msgstr ""
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Naujos užduoties aprašymas"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -609,17 +609,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Faktinis valandų skaičius"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Testavimo užduoties antraštė"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Iš naujo įvertinti"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -653,7 +653,7 @@ msgstr "Likusios valandos"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -687,7 +687,7 @@ msgstr "Nepriskirtos užduotys"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Nepriskirtos užduotys"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -695,6 +695,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma visų darbo valandų, skirtų atlikti šio projekto, įskaitant susijusius "
+"projektus, užduotims."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -726,7 +728,7 @@ msgstr "Papildoma informacija"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Liepa"
 
 #. module: project
 #: view:project.task.history.burndown:0
@@ -753,7 +755,7 @@ msgstr "Projektai"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapas"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -767,7 +769,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Užduotis '%s' atidaryta."
 
 #. module: project
 #: view:project.task:0
@@ -777,7 +779,7 @@ msgstr "Datos"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Naujas pavadinimas užduoties, priskirtos vartotojui"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -800,7 +802,7 @@ msgstr "Atidarytų užduočių juodraščiai"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Sausis"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -817,7 +819,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Užduočių analizė"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -848,18 +850,18 @@ msgstr "Projektas"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Įvertinti"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mano lenta"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Etapai"
 
 #. module: project
 #: view:project.task:0
@@ -886,7 +888,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projekto užduoties delegavimas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -902,7 +904,7 @@ msgstr "Užduotys"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Pirminis"
 
 #. module: project
 #: view:project.task:0
@@ -925,12 +927,12 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rugsėjis"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Gruodis"
 
 #. module: project
 #: field:project.task,progress:0
@@ -950,13 +952,13 @@ msgstr ""
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Iš naujo įvertinti užduotį"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mėnuo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -967,7 +969,7 @@ msgstr "Projektų užduotys"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Užduoties etapas"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -1000,7 +1002,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Pradžios data"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1012,7 +1014,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Pirminės užduotys"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1051,7 +1053,7 @@ msgstr "Naudotojas:  %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Mokėjimas"
 
 #. module: project
 #: view:project.task:0
@@ -1061,13 +1063,13 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Svarbumas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Projektų šablonai"
 
 #. module: project
 #: view:project.project:0
@@ -1088,7 +1090,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Dalyviai"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1098,7 +1100,7 @@ msgstr "Projekto užduotys"
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Priskirto vartotojo užduoties baigimo tikėtinas laikas"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1157,12 +1159,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Užduotys pagal vartotoją ir projektą"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
@@ -1198,7 +1200,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Birželis"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1209,13 +1211,13 @@ msgstr "Iš viso laiko"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dienos iki uždarymo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projekto vitrina"
 
 #. module: project
 #: view:project.task:0
@@ -1236,12 +1238,12 @@ msgstr "Aktyvus"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dienos iki atidarymo"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Lapkritis"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1252,7 +1254,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projektas '%s' uždarytas."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1267,7 +1269,7 @@ msgstr "Užduoties redagavimas"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Spalis"
 
 #. module: project
 #: view:project.task:0
@@ -1289,7 +1291,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "Vartotojai"
 
 #. module: project
 #: help:project.project,active:0
@@ -1297,16 +1299,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Jei laukelis \"aktyvus\" yra nenustatytas, tai bus palikta galimybė paslėpti "
+"projektą jo neištrynus iš sistemos."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Įmonės"
 
 #. module: project
 #: view:project.project:0
@@ -1316,7 +1320,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Ieškoti projekto"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1333,7 +1337,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Vitrina"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1362,12 +1366,12 @@ msgstr "Naudotojo projektai"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Priskirti"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Dienų skaičiui iki užduoties atidarymo"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1377,7 +1381,7 @@ msgstr "Deleguotas"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
@@ -1396,12 +1400,12 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Testavimo užduoties antraštė"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Išplėsti filtrai..."
 
 #. module: project
 #: code:addons/project/project.py:1148
@@ -1435,7 +1439,7 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "Užduotis '%s' nustatyta kaip vykdoma"
 
 #. module: project
 #: view:project.project:0
@@ -1466,7 +1470,7 @@ msgstr "Atlikta"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Metai"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1478,7 +1482,7 @@ msgstr "Atšaukti"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Uždaryti"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1526,13 +1530,13 @@ msgstr ""
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Klaida! Užduočių pabaigos data turi būti vėliau nei pradžios data"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Atsakingas"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1591,7 +1595,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Mano užduočių galutiniai terminai"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
@@ -1601,7 +1605,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Kūrimas"
 
 #. module: project
 #: view:board.board:0
@@ -1622,7 +1626,7 @@ msgstr "Skubus"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Gegužė"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1632,7 +1636,7 @@ msgstr "Patvirtinta užduotis"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Viso užduočių"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1688,7 +1692,7 @@ msgstr "Projekto užduotys"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Užduotis '%s' atlikta"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1710,25 +1714,25 @@ msgstr "Kai užduotis atliekama, jos būsena tampa - atlikta."
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klientas"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Vasaris"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Užduotys pagal dienas"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1738,7 +1742,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Redaguoti"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1768,7 +1772,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Balandis"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1778,7 +1782,7 @@ msgstr "Sugaištos valandos"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Įvairūs"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1793,7 +1797,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Praleistos valandos"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1805,18 +1809,18 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Rikiavimo poreikiui projektų sąraše."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Užduotis '%s' uždaryta"
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
@@ -1832,7 +1836,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Uždelstos užduotys"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1892,7 +1896,7 @@ msgstr "Patvirtinimo būsena"
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "Užduotis '%s' atšaukta"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1900,22 +1904,24 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Apskaičiuotas laikas, kurio prireiks testuoti atliktas užduotis kitų "
+"vartotojų, kuriems priskyrėte darbus"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Vadovas"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Užduotis '%s' atšaukta."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1933,13 +1939,13 @@ msgstr "Partneris"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Siųsti el. paštą kai uždaroma užduotis"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Užduočių etapai"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -2179,11 +2185,6 @@ msgstr ""
 #~ msgid "Reactivate Project"
 #~ msgstr "Atnaujinti projektą"
 
-#, python-format
-#~ msgid "Couldn't send mail because your email address is not configured!"
-#~ msgstr ""
-#~ "Negalima išsiųsti laiško, kadangi nesukonfigūruotas elektronio pašto adresas!"
-
 #~ msgid "Delegate this task to a user"
 #~ msgstr "Deleguoti šią užduotį naudotojui"
 
@@ -2264,3 +2265,156 @@ msgstr ""
 
 #~ msgid "Running projects"
 #~ msgstr "Vykdomi projektai"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Problemų stebėjimas"
+
+#~ msgid "Timesheets"
+#~ msgstr "Tabelis"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projektai: Suplanuoti ir atliktos valandos"
+
+#~ msgid "Warn Message"
+#~ msgstr "Įspėjimo žinutė"
+
+#~ msgid "Invoice Address"
+#~ msgstr "Sąskaitos faktūros adresas"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Jei aktyvuojamas projekte šis nustatymas, padeda sugeneruoti sąskaitas "
+#~ "faktūras pagal atliktų užduočių sugaištą darbo laiką."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Nustatykite projektų valdymo programą"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mėnuo...   "
+
+#~ msgid "Specification"
+#~ msgstr "Specifikacija"
+
+#~ msgid "Methodologies"
+#~ msgstr "Metodologija"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "Kliento el. pašto adresas"
+
+#~ msgid "Public Notes"
+#~ msgstr "Vieši užrašai"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    ....Mėnuo-1....    "
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Prašome nurodyti projekto vadovo el. pašto adresą"
+
+#~ msgid "Image"
+#~ msgstr "Paveiksliukas"
+
+#~ msgid "Long Term Planning"
+#~ msgstr "Ilgalaikė prognozė"
+
+#~ msgid "  Year  "
+#~ msgstr "  ..Metai..  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr ""
+#~ "Padeda buhalteriui valdyti analitines sąskaitas ir susikertančius biudžetus."
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "Klaida! Jūs negalite sukurti rekursyvių susijusių dalyvių"
+
+#~ msgid "Task Edition"
+#~ msgstr "Užduoties versija"
+
+#~ msgid "Configure"
+#~ msgstr "Nustatyti"
+
+#~ msgid "Customer Email"
+#~ msgstr "Kliento el. pašto adresas"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Perspėti vadovą el. paštu"
+
+#~ msgid "Manager Email"
+#~ msgstr "Vadovo el. pašto adresas"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Klaida! Valiuta turi būti tokia pati kaip ir pasirinktos įmonės valiuta"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Nustatymo progresas"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Negalima išsiųsti laiško, kadangi nenusistatėte savo el. pašto adreso!"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Atlikti užduotis"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Perspėti klientą el. paštu"
+
+#~ msgid "Send Email"
+#~ msgstr "Siųsti el. paštą"
+
+#~ msgid "Current Activity"
+#~ msgstr "Dabartinė veikla"
+
+#~ msgid ""
+#~ "GTD is a methodology to efficiently organise yourself and your tasks. This "
+#~ "module fully integrates GTD principle with OpenERP's project management."
+#~ msgstr ""
+#~ "DTG yra metodologija, kuri efektyviai padeda organizuotis darbus. Šis "
+#~ "modulis pilnai integruojasi GTD principu su OpenERP projektų valdymu."
+
+#~ msgid "Current"
+#~ msgstr "Dabartinis"
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Įgalina ilgalaikių projektų sekimą, įskaitant kelių fazių projektus ir "
+#~ "resursų priskyrimo valdymą."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Mokėjimo laikas užduotyse"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "Projekto vadovo el. pašto adresas"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr "Negalima išsiųsti el. pašto! Patikrinkite SMTP serverio nustatymus"
+
+#~ msgid "Warn Customer"
+#~ msgstr "Perspėti klientą"
+
+#~ msgid "Merge"
+#~ msgstr "Sulieti"
+
+#~ msgid "_Send"
+#~ msgstr "_Siūsti"
+
+#~ msgid "title"
+#~ msgstr "pavadinimas"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Automatiškai sinchronizuoti projektų užduotis su CRM atvejais"
+
+#~ msgid "Budgets"
+#~ msgstr "Biudžetai"
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index dda63acf5c9..e1d51f24862 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -31,7 +31,7 @@ msgstr "Ievietot uzdevuma aprakstu lietotāja uzdevumā"
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "Uzdevums '%s' tika deliģēts %s."
+msgstr "Uzdevums '%s' tika deleģēts %s."
 
 #. module: project
 #: constraint:res.users:0
@@ -243,7 +243,7 @@ msgstr "Ļoti steidzams"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr "Lietotājs, kuram gribat deliģēt šo uzdevumu"
+msgstr "Lietotājs, kuram gribat deleģēt šo uzdevumu"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -657,7 +657,7 @@ msgstr "Atlikušās Stundas"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -786,7 +786,7 @@ msgstr "Datumi"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr "Jauns lietotājam deliģēta uzdevuma virsraksts"
+msgstr "Jauns lietotājam deleģēta uzdevuma virsraksts"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -1394,7 +1394,7 @@ msgstr "Lietotāja Projekti"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Deliģēt"
+msgstr "_Deleģēt"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1680,7 +1680,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr "Mani deliģētie uzdevumi"
+msgstr "Mani deleģētie uzdevumi"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 30a8adb1018..0ea447b09a6 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -13,39 +13,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Шинэ даалгаврууд"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Даалгаврын тайлбарыг хэрэглэгчийн даалгавар дотор дахин оруулах"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "The task '%s' has been delegated to %s."
+msgstr "'%s' даалгавар %s-д ацлагдлаа."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Сонгосон компани энэ хэрэглэгчид зөвшөөрөгдсөн компаниуд дунд алга."
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Өмнөх сар"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Миний даалгаврууд"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -55,7 +55,7 @@ msgstr "Харилцагчид анхааруулах"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Ажлыг дуусгахад шаардагдах үлдэгдэл цагийг энд оруул"
 
 #. module: project
 #: view:project.task:0
@@ -80,7 +80,7 @@ msgstr "ШАЛГАХ: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Хэрэглэгчийн Имэйл"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,12 +92,12 @@ msgstr "Ажил дууссан"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Сануулга !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr "Даалгавар шилжүүлэх"
+msgstr "Даалгаврыг ацаглах"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -107,7 +107,7 @@ msgstr "Хянах цаг"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Хүлээгдэж байгаа Төслүүд"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -115,26 +115,28 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Бүх үлдсэн цаг нь даалгаврын хариуцагчаар тогтмол хугацаанд дахин "
+"тооцоологдож болно"
 
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Төслийг дахин нээх"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Төслүүдийн жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Даалгаврыг дахин үнэлэх"
 
 #. module: project
 #: field:project.project,members:0
@@ -144,7 +146,7 @@ msgstr "Төслийн гишүүд"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Даалгавруудыг шилжүүлгээр нь"
+msgstr "Даалгаврыг ацаглалтаар"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -154,12 +156,12 @@ msgstr "3 сар"
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "Delegated tasks"
+msgstr "Ацаглагдсан Даалгаврууд"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "Шилжүүлэгдсэн даалгаварууд"
+msgstr "Ацаглагдсан Даалгаврууд"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -189,7 +191,7 @@ msgstr "Компани"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Хүлээгдэж байгаа даалгаврууд"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -199,7 +201,7 @@ msgstr "Даалгаврын гарчиг"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Нэр"
+msgstr "Үеийн нэр"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -209,7 +211,7 @@ msgstr "Хүлээлгэх"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Чухал"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -229,7 +231,7 @@ msgstr "Загвар дээр суурилсан шинэ төсөл"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -240,7 +242,7 @@ msgstr "Маш яаралтай"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Даалгаврыг ацаглах хэрэглэгч"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -256,7 +258,7 @@ msgstr "Өдөр"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Төслүүд болон Үеүүд"
 
 #. module: project
 #: view:project.project:0
@@ -292,12 +294,12 @@ msgstr "Миний нээлттэй даалгаврууд"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Төслийн менежер эсвэл Төслийн менежерийн имэйл хаягийг зааж өгнө үү."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Даалгаврыг цуцлахад"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -327,6 +329,10 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Энэ талбар нь автомат тооцоологдоог бөгөөд 'active' буюу идэвхтэй гэх "
+"boolean талбартай ижил байдлаар ажилладаг: хэрэв даалгавар нь үлгэр эсвэл "
+"идэвхгүй төсөлтэй холбогдсон бол харагддаггүй талбар, гэхдээ тухайлан "
+"асуувал харуулж болно."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -336,7 +342,7 @@ msgstr "Даалгаврын товч утга"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Даалгаврын Үлгэр Биш"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -358,7 +364,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Зөвхөн дуусах хугацаатай даалгавруудыг харуулах"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -381,7 +387,7 @@ msgstr "Мэйлийн толгой"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Дараачийн үе рүү өөрчлөх"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -391,7 +397,7 @@ msgstr "Дууссан даалгавар"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Өнгөний Индекс"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -401,12 +407,12 @@ msgstr "Тохиргоо"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Энэ сар"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Даалгаврыг өөр хэрэглэгчид ацаглах"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
@@ -424,11 +430,13 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Хэрэв үүнийг тэмдэглэвэл даалгаврыг хаахад захиалагчид имэйл илгээхийг санал "
+"болгосон имэйлийн цонх гарч ирнэ."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Шалгаж байна"
 
 #. module: project
 #: code:addons/project/project.py:829
@@ -466,12 +474,12 @@ msgstr "_Цуцлах"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Бэлэн"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Өнгө Өөрчлөх"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -487,7 +495,7 @@ msgstr " (хувилах)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Шинэ даалгавар"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -502,17 +510,17 @@ msgstr "Өмнөх"
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Оноогдсон"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Зогсоох Огноо: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ижил нэвтрэх нэртэй хоёр хэрэглэгч байж болохгүй!"
 
 #. module: project
 #: view:project.project:0
@@ -532,7 +540,7 @@ msgstr "Миний төслүүд"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
 
 #. module: project
 #: view:project.task:0
@@ -552,23 +560,23 @@ msgstr "# Өдрийн"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Нээлттэй Төслүүд"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Энэхүү '%s' төсөлд гишүүд оноох ёстой !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Боловсруулагдаж байгаа даалгаврууд"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "Бүх хийх ёстой даалгварын хаагдсан даалгаврын эзлэх хувь."
 
 #. module: project
 #: view:project.task.delegate:0
@@ -587,7 +595,7 @@ msgstr "Төслийн даалгавар"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -598,7 +606,7 @@ msgstr "Бодолт: Зарцуулсан цаг + Үлдсэн цаг."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Хуримдлагдсан Урсгал"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -620,7 +628,7 @@ msgstr "Дахин үнэлэх"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (хуулбар)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -636,7 +644,7 @@ msgstr "Дундаж"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Хүлээгдэж байгаа Даалгаврууд"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -648,19 +656,19 @@ msgstr "Үлдсэн цаг"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн Огноо"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Үлдсэн хугацаа"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -682,7 +690,7 @@ msgstr "Эзэнгүй даалгаврууд"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Хэрэглэгчид оноогдоогүй даалгаврууд"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -690,6 +698,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон охин төсөлд холбогдох бүх даалгаврын төлөвлөсөн нийлбэр "
+"хугацаа."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -705,7 +715,7 @@ msgstr "Шийд хүлээсэн"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Ацагласан Гарчиг"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -726,7 +736,7 @@ msgstr "7 сар"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Даалгаврын Гал унтраалтын Диаграмм"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -757,6 +767,9 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Төсөлд хэрэглэгдэх даалгаврын үеүүдийг тодорхойл. Энэ үе нь даалгавар "
+"эхлэхээс эхлээд дуусах хүртэлх алхамууд юм. Энэ үеийн тусламжтайгаар "
+"даалгавар эсвэл асуудлын үеүүдийг хөтлөж явцыг хянахад тустай бадйаг."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -772,7 +785,7 @@ msgstr "Огноонууд"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Ацагласан даалгаварын шинэ гарчиг"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -781,11 +794,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Даалгавар агуулж байгаа төслийг устгах боломжгүй. Идэвхгүй болгохыг зөвлөе."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Төсөл болон Төлөвлөсөн цаг, Нийт цагийн харьцуулалт"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -805,7 +819,7 @@ msgstr "Саатлын цаг"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Маш чухал"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -818,7 +832,7 @@ msgstr "Даалгавар шинжилгээ"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Delegate"
+msgstr "Ацаглах"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -826,6 +840,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Хэрэв энэ талбарыг тэмдэглэвэл даалгавар дуусах бүрт төслийн менежер имэйл "
+"хүлээн авах болно."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -859,7 +875,7 @@ msgstr "Үе"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Өмнө үе рүү өөрчлөх"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -875,13 +891,13 @@ msgstr "Төслийн цагийн нэгж"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Эхэлсэн"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Төслийн даалгавар шилжүүлэх"
+msgstr "Төслийн даалгавар ацаглах"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -902,7 +918,7 @@ msgstr "Эцэг"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Хоригдсоноор Тэмдэглэх"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -916,6 +932,14 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Даалгавар гэдэг нь хийх ёстой ажлыг илтгэнэ. Хэрэглэгч бүр нь өөрийн "
+"даалгавар дээр ажиллах бөгөөд түүндээ ажилласан цагаа хөтлөх боломжтой. "
+"Хэрэв та ямар нэг даалгаварыг хэн нэгэнд ацаглах юм бол хүлээж байгаа "
+"төлөвтэй өөр шинэ даалгавартай болох бөгөөд энэ нь хийсэн ажлыг ревюү хийх "
+"үед дахин нээгдэнэ. Хэрэв project_timesheet буюу төслийн цагийн хуудас "
+"модулийг суулгах юм бол төслийн тохиргоо дээр үндэслэн ажилласан цагаа "
+"нэхэмжлэх боломжтой. Харин project_mrp модулийн тусламжтай борлуулалтын "
+"захиалга батлагдахад автоматаар төслийн даалгаврыг үүсгэх мөн боломжтой."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -972,7 +996,7 @@ msgstr "Даалгаврын үе"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Зохиомж"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -985,7 +1009,7 @@ msgstr "Төлөвлөсөн цаг"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Даалгаврын үеийг үзлэг"
 
 #. module: project
 #: view:project.project:0
@@ -995,7 +1019,7 @@ msgstr "Төлөв: %(төлөв)"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Даалгаврын жагсаалтыг харуулах дарааллын эрэмбийг өгнө."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1007,7 +1031,7 @@ msgstr "Эхлэх огноо"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Чирэхэд Бэлэн"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1020,7 +1044,7 @@ msgstr "Эцэг даалгавар"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Хоригдсон"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1028,11 +1052,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Даалгаврын тооцоолсон хугацаа нь 99.99% болсон бол энэ даалгаврыг хаах нь "
+"зохимжтой."
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Холбогдох хаяг"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1042,6 +1068,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Даалгаврын канбан төлөв нь үүнд нөлөөлж байгаа тохиолдлуудыг харуулна:\n"
+" * Энгийн гэдэг нь нөхцөл байдлын анхны утга\n"
+" * Хоригдсон гэдэг нь ямар нэг зүйл даалгаврыг цааш үргэлжлүүлэхэд садаа "
+"болж байгаа илтгэнэ.\n"
+" * Чирэхэд Бэлэн гэдэг нь даалгаврыг дараачийн үе рүү нь чирэхэд бэлэн гэсэн "
+"утгыг илтгэнэ."
 
 #. module: project
 #: view:project.project:0
@@ -1051,12 +1083,12 @@ msgstr "Хэрэглэгч: %(user_id)"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Тооцоо"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Ацаглах төлөвийг өөрчлөхдөө"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1083,7 +1115,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "ШАЛГАЛТ: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1098,7 +1130,7 @@ msgstr "Төслийн даалгаврууд"
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Энэ даалгаврыг гүйцээхэд ацагласан хэрэглэгчийн таамаг хугацаа"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1117,7 +1149,7 @@ msgstr "Бага"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Канбан Төлөв"
 
 #. module: project
 #: view:project.project:0
@@ -1131,11 +1163,14 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Энэ тайлан нь өөрийн төсөл болон хэрэглэгчдийн биелэлтийг шинжлэх боломжийг "
+"өгдөг. Даалгаврын тоо хэмжээ, зарцуулсан цаг төлөвлөсөн цагийн харьцуулалт, "
+"даалгаврыг нээж хаах дундаж хугацаа зэрэгийг шинжлэх боломжтой."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Төрлийг солих"
 
 #. module: project
 #: help:project.project,members:0
@@ -1143,6 +1178,7 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Төслийн гишүүд гэдэг нь төслийн даалгавруудруу хандаж чадах хэрэглэгчид юм."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1152,7 +1188,7 @@ msgstr "Төслийн Менежер"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Төлөвийг хийгдсэн болгож өөрчлөхөд"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1169,7 +1205,7 @@ msgstr "8 сар"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Энгийн"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1180,7 +1216,7 @@ msgstr "Төслийн нэр"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Даалгавруудын Түүх"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1188,12 +1224,14 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Таны өөрийн даалгаврын шинэ төлөв. Ацагласан даалгавар хаагдахад автоматаар "
+"хүлээгдэж байгаа төлөвтэйгээр дахин нээгдэнэ."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Захиалагч эсвэл захиалагчийн имэйл хаягийг зааж өгнө үү."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1225,7 +1263,7 @@ msgstr "Дахин идэвхжүүлэх"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: project
 #: field:project.project,active:0
@@ -1246,7 +1284,7 @@ msgstr "11 сар"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Өөрийн анхны төслүүдээ үүсгэ"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1257,7 +1295,7 @@ msgstr "Төсөл '%s' хаагдлаа."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Даалгавруудын Хуримтлагдсан Урсгал"
 
 #. module: project
 #: view:project.task:0
@@ -1272,7 +1310,7 @@ msgstr "10 сар"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Төлөвлөсөн цагийг шалгаад даалгаврыг нээ"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1280,11 +1318,13 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Төслийн менежерийн төлөвлөсөн цаг болон даалгаврын нийт цагийн ялгаа болгож "
+"тооцоологдсон."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Ацагласан Түүх"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1297,6 +1337,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар нь False буюу Худал гэж тохируулагдсан бол төслийг "
+"устгалгүйгээр нуух боломжийг олгодог."
 
 #. module: project
 #: view:project.task:0
@@ -1311,7 +1353,7 @@ msgstr "Компаниуд"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Би гишүүн нь болсон төслүүд."
 
 #. module: project
 #: view:project.project:0
@@ -1342,6 +1384,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Энэ нь төсөл болон даалгаврыг хэмжих нэгж нь болно. Хэрэв төсөлтэй "
+"холбогдсон цагийн хуваарь (project_timesheet модуль) хэрэглэж байгаа бол "
+"ажилчдад зөв хэмжих нэгж тохируулахаа мартаж болохгүй."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1358,17 +1403,17 @@ msgstr "Хэрэглэгчийн төслүүд"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Төлөөлөгч"
+msgstr "_Ацаглах"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Даалгаврыг нээх хүртэлх өдөр"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "рүү шилжүүлэх"
+msgstr "Ацаглагдсан нь"
 
 #. module: project
 #: view:res.partner:0
@@ -1386,6 +1431,8 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Даалгаврыг хийх таамагласан хугацаа бөгөөд ихэнхдээ даалгаврыг ноорог "
+"төлөвтэй байхад нь төслийн менежер тогтоож өгдөг."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
@@ -1401,7 +1448,7 @@ msgstr "Өргөтгөсөн хайлт..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Энэ данстай холбогдсон төслийг эхлээд устгана уу."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1423,7 +1470,7 @@ msgstr "Төлөв"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Ацагласан хэрэглэгч заагдсан байх хэрэгтэй"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1443,6 +1490,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Төсөл дээр санхүүгийн менежмент хиймээр байгаа бол төсөлд шинжилгээний "
+"дансыг холбох ёстой. Энэ нь төслийн цагийн хуудас, өртөг, төсөв, төлөвлөсөн "
+"өртөг, төлөвлөсөн орлого зэрэгийг шинжлэх боломжийг олгодог."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1499,7 +1549,7 @@ msgstr "Явж байна"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Даалгаврын Шинжилгээ"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1507,23 +1557,24 @@ msgstr ""
 msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
-msgstr ""
+msgstr "Дэд даалгавар нээлттэй хэвээр байна."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Бүх төслүүдэд ерөнхий үеүүд"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Хариуцагч"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1533,7 +1584,7 @@ msgstr "Ажлын цаг"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Би менежер нь байгаа төслүүд"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1549,7 +1600,7 @@ msgstr " Төслүүд ба хугацааг харьцуулах"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr "Шилжүүлсэн даалгавар"
+msgstr "Ацагласан даалгавар"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1557,6 +1608,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон дэд төслүүдийн холбогдох даалгавруудын зарцуулсан хугацааны "
+"нийлбэр."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1567,7 +1620,7 @@ msgstr "Маш бага"
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Гант диаграмын тайланг тохируулах ажлын цагийн хуваарь"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1577,7 +1630,7 @@ msgstr "Менежерт анхааруулах"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Товлосон Хугацаа хэтэрсэн"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1592,7 +1645,7 @@ msgstr "Даалгаврыг дахин үнэлүүлэх"
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Хөгжүүлэлт"
 
 #. module: project
 #: view:board.board:0
@@ -1631,13 +1684,15 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Хэрэв энэ талбарыг тэмдэглэвэл энэ үе нь бүх төсөл дээр анхны утга болно. "
+"Одоо байгаа төслүүдэд энэ хамаагүй."
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr "Миний шилжүүлсэн даалгаврууд"
+msgstr "Миний ацагласан даалгаврууд"
 
 #. module: project
 #: view:project.project:0
@@ -1668,7 +1723,7 @@ msgstr "Дансны нэхэмжлэх"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Суулгалт"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1687,11 +1742,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон дэд төслүүдийн холбогдох даалгавруудын нийт хугацааны "
+"нийлбэр."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Бүх төсөлд ерөнхий"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1724,7 +1781,7 @@ msgstr "Даалгаврыг өдрүүдээр харуулах"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Компаний нэр үл давхцах байх ёстой !"
 
 #. module: project
 #: view:project.task:0
@@ -1744,7 +1801,7 @@ msgstr "Ажлын тойм"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Сар-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1754,7 +1811,7 @@ msgstr "Даалгаврыг хаах өдрүүдийн тоо"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Сар-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1779,12 +1836,12 @@ msgstr "Дууссан даалгавар нээх"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Ерөнхий"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Зарцуулсан цаг"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1792,11 +1849,13 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Үеүүд нь бүх төслүүдэд ерөнхий байх эсвэл зарим нэг төсөлд тухайлсан байх "
+"боломжтой. Даалгавар бүр нь хаагдах хүртлээ ялгаатай үеүүдийг туулна."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Төслийн жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
@@ -1813,12 +1872,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Гал унтраалтын Диаграмм"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Оноогдсон Даалгаврууд"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1828,12 +1887,12 @@ msgstr "Алгассан даалгаврууд"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Энэ жил"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1868,6 +1927,14 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Төсөл бүр нь даалгавар болон асуудлын олонлог байх бөгөөд үүнд оноогдсон "
+"нөөц нь даалгаврыг гүйцэтгэнэ. Төсөл нь мөчирлөсөн бүтэцтэй буюу охин, эцэг "
+"гэсэн бүтэцтэй байж болно. Энэ нь том төслийг олон шатуудад хуваан түүнийгээ "
+"дэд төсөл байдлаар зохиожлох боломжийг өгдөг. Хэрэглэгч бүр өөрийн "
+"хэрэглэгчийн тохиргоондоо өөрийн төслийн анхны утгыг тохируулах боломжтой. "
+"Ингэснээр даалгавар болон асуудал нь автоматаар өөрийн төслөөр нь шүүгдэнэ. "
+"Хэрэв төслийн даалгаварт зарцуулсан цагтаа нэхэмжлэл үүсгэхээр бол төлбөр "
+"тооцоо хэсэгт нэхэмжэлж болох даалгавруудаг харах боломжтой."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1890,7 +1957,7 @@ msgstr "Даалгавар '%s' цуцлагдсан."
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
-msgstr ""
+msgstr "Ацагласан даалгаврыг шалгахад таны зарцуулах таамаг хугацаа"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1911,7 +1978,7 @@ msgstr "Даалгавар '%s'-г цуцалсан."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Нээлттэй төлөвтэй болгоход"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1924,7 +1991,7 @@ msgstr "Харилцагч"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Даалгаврыг хаасан дараагаараа имэйл илгээх"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
@@ -1935,7 +2002,7 @@ msgstr "Даалгаврын үе"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Өөр хэрэглэгчид өөрийн даалгаврыг ацаглах"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
@@ -1945,7 +2012,7 @@ msgstr "Мэйлийн хөл"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Боловсруулагдаж байгаа даалгаврууд"
 
 #~ msgid "Contact"
 #~ msgstr "Харьцах хүн"
@@ -2265,3 +2332,6 @@ msgstr ""
 
 #~ msgid "Budgets"
 #~ msgstr "Төсөв"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "И-мэйл үүсгэх харилцах цонх"
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index 943814adea3..ccb1d91c49d 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Gjenstående timer"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index c3373a8b42f..7ec14fe77f2 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:07+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nieuwe taak"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -40,12 +40,12 @@ msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Vorige Maand"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mijn taken"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +80,7 @@ msgstr "CONTROLEER: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Gebruikers e-mail"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +92,7 @@ msgstr "Voltooide taken"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +107,7 @@ msgstr "Te bevestigen uren"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Lopende projecten"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Her-open project"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Bedrijf"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -201,7 +201,7 @@ msgstr "Titel van uw taak"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Naam stadium"
+msgstr "Naam fase"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -211,7 +211,7 @@ msgstr "Zet op wachtend"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Belangrijk"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -221,7 +221,7 @@ msgstr "Definiëer de benodigdheden en de geplande uren."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr "Stadium wijzigen"
+msgstr "Wijzig fase"
 
 #. module: project
 #: view:project.project:0
@@ -258,7 +258,7 @@ msgstr "Dag"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projecten en taken fases"
 
 #. module: project
 #: view:project.project:0
@@ -294,12 +294,12 @@ msgstr "Mijn openstaande taken"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Definieer de projectmanager of e-mail adres van de projectmanager"
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Hiermee annuleert u de taak"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -364,7 +364,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Geef alleen taken met een deadline weer"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -387,7 +387,7 @@ msgstr "Kopregels mail"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Verander naar volgende fase"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -397,7 +397,7 @@ msgstr "Voltooide taak"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Kleur index"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -407,7 +407,7 @@ msgstr "Instellingen"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Huidige maand"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -475,12 +475,12 @@ msgstr "_Annuleren"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Gereed"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Wijzig kleur"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -496,7 +496,7 @@ msgstr " (kopie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nieuwe taak"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -561,18 +561,18 @@ msgstr "# Dagen"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Open Projecten"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "U dient gebruikers aan het project '%s' toe te wijzen!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Taken in behandeling"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -596,7 +596,7 @@ msgstr "Projecttaak"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -607,7 +607,7 @@ msgstr "Berekend als: Gebruikte uren + resterende uren."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Cumulative flow"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -629,7 +629,7 @@ msgstr "Herevalueren"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr "Gemiddeld"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -657,19 +657,19 @@ msgstr "Resterende uren"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Resterende tijd"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -737,7 +737,7 @@ msgstr "Juli"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Burndown grafiek van taken"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -759,7 +759,7 @@ msgstr "Projecten"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Stadium"
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -769,8 +769,8 @@ msgid ""
 "order to track the progress in solving a task or an issue."
 msgstr ""
 "Definieer de te gebruiken stappen in het project vanaf het maken van de taak "
-"tot en met het sluiten van de taak of probleem. U gebruikt deze stadia om "
-"het verloop van een taak of probleem te volgen."
+"tot en met het sluiten van de taak of probleem. U gebruikt deze fases om het "
+"verloop van een taak of probleem te volgen."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -795,6 +795,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Het is niet mogelijk een project, welke taken bevat, te verwijderen. U kunt "
+"hte beste het project deactiveren."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -819,7 +821,7 @@ msgstr "Uren vertraging"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Heel belangrijk"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -840,6 +842,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Indien u deze optie aanvinkt, krijgt de projectmanager een e-mail, iedere "
+"keer een taak is afgerond door zijn team."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -868,12 +872,12 @@ msgstr "Mijn dashboard"
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr "Stadia"
+msgstr "Taken fases"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Verander naar vorige fase"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -889,7 +893,7 @@ msgstr "Tijdseenheid project"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "In behandeling"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -916,7 +920,7 @@ msgstr "Bovenliggend"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Maarkeer als geblokkeerd"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -993,7 +997,7 @@ msgstr "Taak status"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Ontwerp"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1006,7 +1010,7 @@ msgstr "Geplande uren"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Controleer uw taakfases"
 
 #. module: project
 #: view:project.project:0
@@ -1016,7 +1020,7 @@ msgstr "Status: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Geeft de volgorde weer wanneer de lijst van taken wordt weergegeven."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1028,7 +1032,7 @@ msgstr "Startdatum"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Gereed om binnen te trekken"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1041,7 +1045,7 @@ msgstr "Bovenliggende taken"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Geblokkeerd"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1049,11 +1053,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Indien de taak een voortgang heeft van 99,99%, kunt u, indien de taak gereed "
+"is, het beste de taak afsluiten of de tijd herzien"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres contactpersoon"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1063,6 +1069,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Een Kanban status van ene taak geeft specifieke situaties weer:\n"
+"* Normaal is de standaard situatie\n"
+"* Geblokkeerd geeft aan dat iets het verdere verloop van de taak blokkeert\n"
+"* Gereed om binnen te trekken geeft aan dat een taak gereed is om naar de "
+"volgende taak te slepen"
 
 #. module: project
 #: view:project.project:0
@@ -1077,7 +1088,7 @@ msgstr "In rekening brengen"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de delegeer status"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1104,7 +1115,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CHECK: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1149,7 @@ msgstr "Laag"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban Status"
 
 #. module: project
 #: view:project.project:0
@@ -1160,7 +1171,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Veraander type"
 
 #. module: project
 #: help:project.project,members:0
@@ -1179,7 +1190,7 @@ msgstr "Projectleider"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de gereed status"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1196,7 +1207,7 @@ msgstr "Augustus"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1207,7 +1218,7 @@ msgstr "Naam project"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Taakhistorie"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1222,7 +1233,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Definieer de klant of het e-mail adres van de klant."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1254,7 +1265,7 @@ msgstr "Heractiveren"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: project
 #: field:project.project,active:0
@@ -1275,7 +1286,7 @@ msgstr "November"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Maak uw eerste projecten aan"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1286,7 +1297,7 @@ msgstr "Het project '%s' is gesloten."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Taken cumulative flow"
 
 #. module: project
 #: view:project.task:0
@@ -1301,7 +1312,7 @@ msgstr "Oktober"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Bevestigen de geplande tijd en geopende taak"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1315,7 +1326,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Deligatiehistorie"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1344,7 +1355,7 @@ msgstr "Bedrijven"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projecten waarvan ik deelnemer ben*"
 
 #. module: project
 #: view:project.project:0
@@ -1441,7 +1452,7 @@ msgstr "Uitgebreide filters..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Verwijder eerst het project dat aan deze kostenplaats is gekoppeld"
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1463,7 +1474,7 @@ msgstr "Status"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "De gedelegeerde gebruiker moet worden gespecificeerd"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1543,7 +1554,7 @@ msgstr "In uitvoering"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Takenanalyse"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1552,11 +1563,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Onderliggende taken zijn nog open.\n"
+"Annuleer of maak eerst onderliggende taken af."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Fases van taken, geldend voor alle projecten"
 
 #. module: project
 #: constraint:project.task:0
@@ -1577,7 +1590,7 @@ msgstr "Werktijd"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "projecten waarvan ik manager ben"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1618,7 +1631,7 @@ msgstr "Rooster met werktijden ter correctie van de GANTT-diagrammen."
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "Waarschuw manager"
+msgstr "Waarschuw projectleider"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
@@ -1677,6 +1690,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Indien u dit veld aanvinkt, wordt de fase standaard voorgesteld voor ieder "
+"nieuw project. het zal deze fase niet toewijzen aan bestaande projecten."
 
 #. module: project
 #: view:board.board:0
@@ -1714,7 +1729,7 @@ msgstr "Mijn declaratierekeningen"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Implementatie"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1739,7 +1754,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Normaal voor alle projecten"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1772,7 +1787,7 @@ msgstr "Taken per dag"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "De naam van het bedrijf moet uniek zijn!"
 
 #. module: project
 #: view:project.task:0
@@ -1792,7 +1807,7 @@ msgstr "Samenvatting werk"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Maand-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1802,7 +1817,7 @@ msgstr "Aantal dagen tot sluiten taak"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Maand-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1812,7 +1827,7 @@ msgstr "April"
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr "Gespendeerde uren"
+msgstr "Gewerkte uren"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1827,7 +1842,7 @@ msgstr "Open voltooide taak"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: project
 #: view:project.task:0
@@ -1840,6 +1855,9 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"De fase van een taak kan algemeen zijn voor alle projecten of voor een "
+"specifiek project. Iedere taak zal diverse fases doorlopen, voordat deze "
+"wordt afgesloten."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1861,12 +1879,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndown grafiek"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Toegewezen taken"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1876,12 +1894,13 @@ msgstr "Overschreden taken"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Huidig jaar"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1969,7 +1988,7 @@ msgstr "De taak '%s' is geannuleerd."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de open status"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2003,7 +2022,7 @@ msgstr "Mail voetregels"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #~ msgid "Validate"
 #~ msgstr "Valideren"
@@ -2544,3 +2563,6 @@ msgstr ""
 
 #~ msgid "Helps accountants manage analytic and crossover budgets."
 #~ msgstr "Helpt accountants analytische en crossover budgetten te beheren."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index d5e149532e3..f9ff0c939de 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,18 +24,20 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "De omschrijving van de taak ook opnemen in de taak van de gebruiker"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Taak '%s' is gedelegeerd aan %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"De gekozen firma behoort niet tot de toegelaten bedrijven voor deze "
+"gebruiker."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -50,23 +52,23 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Relatie informeren"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Zet hier de resterende uren die nodig zijn om de taak af te werken."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Deadlines"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "Deze bewerking is niet toegelaten."
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -75,7 +77,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "CONTROLE: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -85,7 +87,7 @@ msgstr ""
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Werk uitgevoerd"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
@@ -97,12 +99,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Gedelegeerde taak"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Goed te keuren uren"
 
 #. module: project
 #: view:project.project:0
@@ -115,6 +117,8 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Totale resterende tijd; kan periodiek worden herbekeken door de uitvoerder "
+"van de taak."
 
 #. module: project
 #: view:project.project:0
@@ -124,42 +128,42 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Bepaalt de volgorde bij het weergeven van een lijst van projecten."
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "De begindatum van het project moet voor de einddatum liggen."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Projectleden"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Taak per gedelegeerde"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Gedelegeerde taken"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Gedelegeerde taken"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -167,22 +171,24 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Koptekst aan het begin van een e-mail die bij het afsluiten van een taak "
+"naar de klant wordt gestuurd."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Mijn taken"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "U kunt niet dezelfde taken maken."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -192,17 +198,17 @@ msgstr ""
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Uw taaktitel"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Fasenaam"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Op wachtend zetten"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -212,44 +218,44 @@ msgstr ""
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Stel de vereisten in en de geplande uren."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Status wijzigen"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Nieuw project volgens model"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "U kunt niet escaleren binnen eenzelfde project"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Heel dringend"
 
 #. module: project
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "De gebruiker aan wie u deze taak wilt delegeren"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mijn taken"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
@@ -259,12 +265,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Instellen als model"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Voorlopige taak"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -272,18 +278,18 @@ msgstr ""
 #: field:project.task.history.cumulative,task_id:0
 #: field:project.task.work,task_id:0 view:report.project.task.user:0
 msgid "Task"
-msgstr ""
+msgstr "Taak"
 
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Leden"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mijn openstaande taken"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -300,23 +306,23 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projecttaakwerk"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Opmerkingen"
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Project vs. resterende uren"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gem. gepland-eff."
 
 #. module: project
 #: help:project.task,active:0
@@ -325,32 +331,37 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Dit veld wordt automatisch berekend en werkt op dezelfde manier als het veld "
+"'Actief'. Als een taak aan een model of aan een niet-actief project is "
+"gekoppeld, wordt ze verborgen tot ze wordt opgevraagd."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Taaksamenvatting"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Dit is geen modeltaak"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr ""
+msgstr "Taak starten"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Taak is afgewerkt"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Automatische variabelen voor kop– en voetteksten. Gebruik dezelfde "
+"schrijfwijze."
 
 #. module: project
 #: view:project.task:0
@@ -363,17 +374,17 @@ msgstr ""
 #: selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Koptekst mail"
 
 #. module: project
 #: view:project.task:0
@@ -383,7 +394,7 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Afgewerkte taak"
 
 #. module: project
 #: field:project.task,color:0
@@ -393,7 +404,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -403,17 +414,17 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Hiermee delegeert u taken aan een andere gebruiker"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Uitgevoerd door"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -421,44 +432,46 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Als u dit inschakelt, krijgt de gebruiker bij het afsluiten van een taak het "
+"voorstel om een mail naar de klant te sturen."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testen"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "Taak '%s' afgesloten"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Berekend volgens de som van het uitgevoerde taakwerk."
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planning"
 
 #. module: project
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Deadline"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuleren"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -473,13 +486,13 @@ msgstr ""
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "U kunt niet dezelfde analytische rekeningen maken."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopie)"
 
 #. module: project
 #: view:project.task:0
@@ -489,62 +502,62 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# taken"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Einddatum: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "U kunt geen twee gebruikers met dezelfde login maken."
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Opnieuw instellen als project"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr ""
+msgstr "Model"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Mijn projecten"
 
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "U kunt niet dezelfde bedrijven maken."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "De taak gaat van status \"Voorlopig\" naar \"Open\"."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dagen"
 
 #. module: project
 #: view:project.project:0
@@ -566,17 +579,19 @@ msgstr ""
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Percentage afgesloten taken in functie van het totaal aantal uit te voeren "
+"taken."
 
 #. module: project
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Nieuwe taakomschrijving"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projecttaak"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -589,7 +604,7 @@ msgstr ""
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Berekend als: Bestede tijd + resterende tijd"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
@@ -601,17 +616,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Bestede uren"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Titel voor valideringstaak"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Opnieuw inschatten"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -622,13 +637,13 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Overschrijdingstijd"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Gemiddeld"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -641,11 +656,11 @@ msgstr ""
 #: field:project.vs.hours,remaining_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Resterende uren"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -664,12 +679,12 @@ msgstr ""
 #: field:project.task.history,planned_hours:0
 #: field:project.task.history.cumulative,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Geplande tijd"
 
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -679,14 +694,14 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Taken die niet zijn toegewezen aan gebruikers"
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som geplande uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -697,28 +712,28 @@ msgstr ""
 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Wachtend"
 
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Totel gedelegeerde taak"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr ""
+msgstr "Mijn projecten"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: project
 #: view:project.task.history.burndown:0
@@ -728,7 +743,7 @@ msgstr ""
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: project
 #: code:addons/project/project.py:324
@@ -737,7 +752,7 @@ msgstr ""
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr ""
+msgstr "Projecten"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -745,7 +760,7 @@ msgstr ""
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -754,22 +769,25 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Bepaal de stappen die in het project zullen worden gebruikt: van het maken "
+"van een taak tot het afsluiten van een taak of een probleem. U kunt deze "
+"fasen gebruiken om de voortgang van een taak of probleem op te volgen."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Taak '%s' is geopend."
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datums"
 
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Nieuwe titel van de gedelegeerde taak"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -782,22 +800,22 @@ msgstr ""
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Project vs. geplande en totale uren"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Voorlopige / Open taak"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Opgelopen vertraging"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -809,13 +827,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Taakanalyse"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegeren"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -835,23 +853,23 @@ msgstr ""
 #: model:res.request.link,name:project.req_link_project
 #: field:res.users,context_project_id:0 field:task.by.days,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Project"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Inschatten"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mijn dashboard"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Fasen"
 
 #. module: project
 #: view:project.task:0
@@ -862,12 +880,12 @@ msgstr ""
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projectbeheer"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Projecttijdeenheid"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -878,7 +896,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projecttaak delegeren"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -889,12 +907,12 @@ msgstr ""
 #: model:process.process,name:project.process_process_tasksprocess0
 #: view:project.task:0 view:res.partner:0 field:res.partner,task_ids:0
 msgid "Tasks"
-msgstr ""
+msgstr "Taken"
 
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Hoofd"
 
 #. module: project
 #: view:project.task:0
@@ -913,21 +931,30 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Een taak betekent werk dat moet worden uitgevoerd. Elke gebruiker heeft zijn "
+"eigen takenlijst waarvoor hij uren taakwerk kan boeken. Hij kan zelf werken "
+"aan een taak, deze afsluiten of delegeren aan een andere gebruiker. Als u "
+"een taak doorgeeft aan een andere gebruiker, krijgt u een nieuwe taak in "
+"status \"Wachtend\" die wordt heropend op het ogenblik dat u de gedelegeerde "
+"taak kunt evalueren. Met de module project_timesheet kan het taakwerk worden "
+"gefactureerd afhankelijk van de instellingen van het project. Met de module "
+"project_mrp kunnen taken automatisch worden gemaakt zodra een verkooporder "
+"wordt bevestigd."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Voortgang (%)"
 
 #. module: project
 #: help:project.task,state:0
@@ -938,28 +965,33 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Bij het aanmaken, heeft een taak status 'Voorlopig'.\n"
+" Als de taak is gestart, komt ze in status 'Open'.\n"
+" Als de taak moet worden nagekeken, krijgt ze status 'Wachtend'.             "
+"                     \n"
+" Als de taak is afgewerkt, komt ze op 'Gereed'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Taakfase"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -972,7 +1004,7 @@ msgstr ""
 #: field:project.vs.hours,planned_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Geplande uren"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
@@ -982,7 +1014,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Status: %(state)s"
 
 #. module: project
 #: help:project.task,sequence:0
@@ -992,7 +1024,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1004,7 +1036,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Hoofdtaken"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1038,12 +1070,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Gebruiker: %(user_id)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Facturatie"
 
 #. module: project
 #: view:project.task:0
@@ -1053,23 +1085,23 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Modelprojecten"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Beheer"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -1080,30 +1112,32 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Lid"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Geschatte tijd die de gedelegeerde gebruiker nodig heeft om de taak af te "
+"werken"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0 selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Voorlopig"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: project
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
@@ -1114,7 +1148,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Prestatie"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1123,6 +1157,10 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Met dit rapport kunt u de prestaties van uw projecten en gebruikers "
+"analyseren. U kunt het aantal taken, de bestede uren ten opzichte van de "
+"geplande, het gemiddelde aantal dagen om een taak te openen of af te "
+"sluiten, enz."
 
 #. module: project
 #: view:project.task:0
@@ -1135,11 +1173,13 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Projectleden zijn gebruikers die toegang krijgen tot de taken van het "
+"betrokken project."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projectmanager"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1149,12 +1189,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Taken per gebruiker en project"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
@@ -1166,7 +1206,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projectnaam"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1180,6 +1220,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Nieuwe status van uw eigen taak. Wachtende taak wordt automatisch heropend "
+"als de gedelegeerde taak wordt afgesloten."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1190,29 +1232,29 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Totale tijd"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagen tot afsluiten"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projectdashboard"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reactiveren"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
@@ -1222,18 +1264,18 @@ msgstr ""
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagen tot openen"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1244,7 +1286,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Project '%s' is afgesloten."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1254,12 +1296,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "Taak bewerken"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: project
 #: view:project.task:0
@@ -1281,7 +1323,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1289,16 +1331,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Als het veld Actief is uitgeschakeld, kunt u het project verbergen zonder "
+"het te verwijderen."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bedrijven"
 
 #. module: project
 #: view:project.project:0
@@ -1308,24 +1352,24 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Zoeken in projecten"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Project '%s' is geopend."
 
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0 field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1334,43 +1378,46 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Hiermee bepaalt u de meeteenheid voor projecten en taken.\n"
+"Als u ook werkt met uurroosters voor projecten (project_timesheet module), "
+"mag u niet vergeten de juiste meeteenheid te gebruiken voor uw medewerkers."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Projecten van de gebruiker"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegeren"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Aantal dagen tot openen van taak"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Gedelegeerd aan"
 
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historiek"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -1378,16 +1425,18 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Geschatte tijd om de taak uit te voeren. Doorgaans wordt deze in de "
+"voorlopige taak ingesteld door de projectmanager."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Titel voor uw valideringstaak"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: project
 #: code:addons/project/project.py:1148
@@ -1400,7 +1449,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Totaal aantal uren"
 
 #. module: project
 #: view:project.task:0 field:project.task,state:0
@@ -1409,7 +1458,7 @@ msgstr ""
 #: field:project.vs.hours,state:0 view:report.project.task.user:0
 #: field:report.project.task.user,state:0 field:task.by.days,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: code:addons/project/project.py:925
@@ -1421,12 +1470,12 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "Taak '%s' is open gezet."
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Begindatum: %(date_start)s"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -1435,6 +1484,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Koppel dit project aan een analytische rekening als u financiële opvolging "
+"van uw projecten wilt doen. Hiermee kunt u projecten aan budgetten koppelen, "
+"kosten– en batenanalyse, uurroosters koppelen aan projecten, enz."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1444,40 +1496,40 @@ msgstr ""
 #: view:report.project.task.user:0 selection:report.project.task.user,state:0
 #: view:res.partner:0 selection:task.by.days,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gereed"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
 #: view:project.project:0 view:project.task:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Taak openen"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr ""
+msgstr "Openen"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1486,7 +1538,7 @@ msgstr ""
 #: selection:project.task.history.cumulative,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Lopende"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1510,12 +1562,13 @@ msgstr ""
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Let op: de einddatum van de taak moet na de begindatum van de taak liggen"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1531,30 +1584,30 @@ msgstr ""
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Taak '%s' staat in wacht."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Project vs. uren"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Gedelegeerde taak"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som bestede uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Zeer laag"
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1564,58 +1617,58 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Manager inlichten"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Deadline overschreden"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Deadlines van mijn taken"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Ontwikkeling"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Mijn resterende uren per project"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Dringend"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Valideringstaak"
 
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Totaal taken"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1629,33 +1682,33 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Mijn gedelegeerde taken"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Taak: %(name)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: field:project.project,progress_rate:0 view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Voortgang"
 
 #. module: project
 #: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Bestede tijd"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Mijn te factureren rekeningen"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -1665,20 +1718,20 @@ msgstr ""
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Taak '%s' is afgewerkt."
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som totale uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: field:project.task.type,project_default:0
@@ -1688,30 +1741,30 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Een afgewerkte taak heeft status Gereed."
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klant"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Taken per dag"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1721,17 +1774,17 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Geef uw gepresteerde uren in."
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "Werkomschrijving"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1741,7 +1794,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Aantal dagen tot afsluiten van taak"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1751,22 +1804,22 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Bestede uren"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diversen"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Taak geopend / afgesloten"
 
 #. module: project
 #: view:project.task.type:0
@@ -1776,7 +1829,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Gepresteerde uren"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1788,18 +1841,18 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Bepaalt de volgorde bij het weergeven van een lijst van projecten."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Taak '%s' afgesloten"
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
@@ -1815,7 +1868,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Taken over tijd"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1831,13 +1884,13 @@ msgstr ""
 #: field:project.project,priority:0 field:project.project,sequence:0
 #: field:project.task,sequence:0 field:project.task.type,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Resterende uren per project"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1845,6 +1898,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Voettekst aan het begin van een e-mail die bij het afsluiten van een taak "
+"naar de klant wordt gestuurd."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1858,22 +1913,30 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Een project bevat een aantal taken of problemen die door uw mensen worden "
+"uitgevoerd of opgelost. Een project kan volgens een hiërarchische structuur "
+"worden gemaakt, als onderdeel van een hoofdproject. Hiermee kunt u "
+"uitgebreide projectstructuren opzetten volgens diverse fasen tijdens de duur "
+"van het project. Elke gebruiker kan zijn standaardproject instellen in zijn "
+"eigen voorkeuren om automatisch taken of problemen waaraan hij werkt in dit "
+"project te zien. Als u facturen maakt op basis van gespresteerd taakwerk, "
+"gebruikt u de factuurinformatie op een project."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Taakwerk"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Valideringsstatus"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "Taak '%s' is geannuleerd."
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1881,22 +1944,24 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Geschatte tijd voor het nakijken van het werk uitgevoerd door de gebruiker "
+"aan wie u de taak delegeert."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Taak '%s' is geannuleerd."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1908,29 +1973,29 @@ msgstr ""
 #: field:project.task,partner_id:0 view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: project
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Mail sturen na afsluiten van taak"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Taakfasen"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Delegeer uw taak aan een andere gebruiker"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Voettekst van mail"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1941,3 +2006,246 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "Toegewezen taken"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Probleemopvolging"
+
+#~ msgid "Timesheets"
+#~ msgstr "Uurroosters"
+
+#~ msgid "Delegations"
+#~ msgstr "Gedelegeerde taken"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projecten: geplande vs. totale uren"
+
+#~ msgid "Warn Message"
+#~ msgstr "Waarschuwingsbericht"
+
+#~ msgid "Project Close Task"
+#~ msgstr "Projecttaak sluiten"
+
+#~ msgid "Invoice Address"
+#~ msgstr "Factuuradres"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Hiermee maakt u facturen volgens taakwerk indien dit voor het project is "
+#~ "ingesteld."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Stel uw toepassing voor projectbeheer in"
+
+#~ msgid "   Month   "
+#~ msgstr "   Maand   "
+
+#~ msgid "Reactivate Project"
+#~ msgstr "Project opnieuw actief maken"
+
+#~ msgid ""
+#~ "Tracks and helps employees encode and validate timesheets and attendances."
+#~ msgstr ""
+#~ "Hiermee kunnen medewerkers hun uurroosters en aanwezigheden ingeven en "
+#~ "goedkeuren."
+
+#~ msgid "Specification"
+#~ msgstr "Specificatie"
+
+#~ msgid "Methodologies"
+#~ msgstr "Methodologieën"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "E-mailadres van de klant"
+
+#~ msgid "Public Notes"
+#~ msgstr "Openbare notities"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Maand-1    "
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "Er zijn diverse OpenERP-toepassingen beschikbaar voor projectbeheer, met "
+#~ "verschillende niveaus van controle en flexibiliteit."
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Gelieve het e-mailadres van de projectmanager op te geven."
+
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
+#~ msgid "Computed as: Time Spent / Total Time."
+#~ msgstr "Berekend als: Bestede tijd / totale tijd"
+
+#~ msgid "Long Term Planning"
+#~ msgstr "Langetermijnplanning"
+
+#~ msgid "  Year  "
+#~ msgstr "  Jaar  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "Hiermee kunnen boekhouders analytische en gekruiste budgetten maken."
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "U kunt niet dezelfde leden maken."
+
+#~ msgid "Task Edition"
+#~ msgstr "Taak bewerken"
+
+#~ msgid "Configure"
+#~ msgstr "Instellen"
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr ""
+#~ "Implementeert en volgt de concepten en taaktypes uit de SCRUM-methodologie."
+
+#~ msgid "Parent Project"
+#~ msgstr "Hoofdproject"
+
+#~ msgid "Customer Email"
+#~ msgstr "E-mail klant"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Manager inlichten via e-mail"
+
+#~ msgid "Manager Email"
+#~ msgstr "E-mail manager"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "De munt moet gelijk zijn aan de munt van de geselecteerde firma"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Configuratievoortgang"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Mail kan niet worden verstuurd, omdat uw e-mailadres niet is ingesteld."
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Getting Things Done"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Klant informeren via e-mail"
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "Projectbeheermodule doet de opvolging van projecten op verschillende "
+#~ "niveaus, taken, taakwerk, enz. Het inplannen en rangschikken van taken kan "
+#~ "ook.\n"
+#~ " Dashboard voor projectleden met:\n"
+#~ "    * Lijst van openstaande taken\n"
+#~ "    * Leden van het project\n"
+#~ "    "
+
+#~ msgid "Month works"
+#~ msgstr "Werk tijdens de maand"
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr ""
+#~ "U kunt een project met taken niet verwijderen. Wij raden u aan het om niet-"
+#~ "actief te zetten."
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "Gelieve het e-mailadres van de klant op te geven."
+
+#~ msgid "Send Email"
+#~ msgstr "E-mail verzenden"
+
+#~ msgid "Current Activity"
+#~ msgstr "Huidige activiteit"
+
+#~ msgid ""
+#~ "GTD is a methodology to efficiently organise yourself and your tasks. This "
+#~ "module fully integrates GTD principle with OpenERP's project management."
+#~ msgstr ""
+#~ "GTD is een methodologie waarmee u uzelf en uw taken efficiënt kunt "
+#~ "organiseren. Deze module integreert de GTD-principes met OpenERP's "
+#~ "projectbeheer."
+
+#~ msgid "Current"
+#~ msgstr "Huidig"
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "Berekend als het verschil tussen de door de projectmanager geschatte tijd en "
+#~ "de reële tijd om de taak te sluiten."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Hiermee kunt u projecten op lange termijn opvolgen, met meerdere fasen en "
+#~ "toewijzing van mensen."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Tijd van taken facturen"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "Project instellen"
+
+#~ msgid ""
+#~ "If you check this field, the project manager will receive a request each "
+#~ "time a task is completed by his team."
+#~ msgstr ""
+#~ "Als u dit veld inschakelt, krijgt de projectmanager een verzoek bij elke "
+#~ "taak die wordt afgewerkt door zijn team."
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "E-mailadres van de projectmanager"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr ""
+#~ "Kan geen e-mail versturen. Kijk de e-mailadressen en smtp-instellingen na."
+
+#~ msgid "Warn Customer"
+#~ msgstr "Klant informeren"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "Mijn projecten: geplande vs. totale uren"
+
+#~ msgid "project.installer"
+#~ msgstr "project.installer"
+
+#~ msgid "Merge"
+#~ msgstr "Samenvoegen"
+
+#~ msgid "_Send"
+#~ msgstr "_Verzenden"
+
+#~ msgid "title"
+#~ msgstr "Titel"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Automatisch projecttaken en crm-meldingen synchroniseren."
+
+#~ msgid "Budgets"
+#~ msgstr "Budgetten"
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index b37fe72b5e1..e521d434bcd 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nowe zadania"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -40,12 +40,12 @@ msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Poprzedni miesiąc"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Moje zadania"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +80,7 @@ msgstr "SPRAWDŹ: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Adres pocztowy użytkownika"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +92,7 @@ msgstr "Praca wykonana"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +107,7 @@ msgstr "Godziny do zatwierdzenia"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projekty oczekujące"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Ponownie otwórz projekt"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Firma"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Zadania oczekujące"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -211,7 +211,7 @@ msgstr "Ustaw na oczekujące"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Ważne"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -258,7 +258,7 @@ msgstr "Dzień"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projekty i etapy"
 
 #. module: project
 #: view:project.project:0
@@ -294,12 +294,12 @@ msgstr "Moje otwarte zadania"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Wprowadź Menedżera projektu lub adres mailowy menedżera projektu"
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Do anulowania zadania"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -363,7 +363,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Pokaż tylko zadania z podanym terminem"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -386,7 +386,7 @@ msgstr "Magłówek wiadomości"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Zmień etap na następny"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -396,7 +396,7 @@ msgstr "Zadanie wykonane"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Indeks kolorów"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -406,7 +406,7 @@ msgstr "Konfiguracja"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Bieżący miesiąc"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -473,12 +473,12 @@ msgstr "_Anuluj"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Gotowe"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Zmień kolor"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -494,7 +494,7 @@ msgstr " (kopia)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nowe zadania"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -559,18 +559,18 @@ msgstr "# dni"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Otwarte projekty"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Musisz przypisac uczestników do projektu '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Zadania w toku"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -594,7 +594,7 @@ msgstr "Zadanie projektu"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nowe"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -605,7 +605,7 @@ msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Przepływ kumulacyjny"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -627,7 +627,7 @@ msgstr "Ponownie oszacuj"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -643,7 +643,7 @@ msgstr "Średni"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Oczekujące zadania"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -655,19 +655,19 @@ msgstr "Pozostałe godziny"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Pozostały czas"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -734,7 +734,7 @@ msgstr "Lipiec"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Wykres wykonania zadań"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -792,6 +792,7 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Nie możesz usuwać projektu z zadaniami. Sugerujemy deaktywację projektu."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -816,7 +817,7 @@ msgstr "Opóźnienie"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Bardzo ważne"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -837,6 +838,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Jeśli zaznaczysz to pole, to menedżer projektu otrzyma wiadomość po "
+"zakończeniu każdego zadania."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -870,13 +873,13 @@ msgstr "Etapy"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Zmień na poprzedni etap."
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Projekty"
+msgstr "Zarządzanie projektem"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -886,7 +889,7 @@ msgstr "Jednostka czasu w projekcie"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "W toku"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -913,7 +916,7 @@ msgstr "Nadrzędny"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Zaznacz jako zablokowane"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -992,7 +995,7 @@ msgstr "Etap zadania"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Projektowanie"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1005,7 +1008,7 @@ msgstr "Planowane godziny"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Przegląd etapów zadań"
 
 #. module: project
 #: view:project.project:0
@@ -1015,7 +1018,7 @@ msgstr "Stan: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Określa kolejność wyświetlania zadań w listach"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1027,7 +1030,7 @@ msgstr "Data Rozpoczęcia"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Gotowe do zatrzymania"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1040,7 +1043,7 @@ msgstr "Zadania nadrzędne"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Zablokowane"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1048,11 +1051,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Jeśli zadanie ma postęp 99,99%, to powinieneś je zamknąć lub przeszacować "
+"czas"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres kontaktu"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1062,6 +1067,10 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Stan kanban zadania oznacza specjalne sytuacje:\n"
+" * Normalne oznacza sytuację typową\n"
+" * Zablokowane oznacza, że coś przeszkadza w postępie zadania\n"
+" * Gotowe do przejścia oznacza, że zadanie może przejść do następnego etapu"
 
 #. module: project
 #: view:project.project:0
@@ -1076,7 +1085,7 @@ msgstr "Fakturowanie"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Do zmiany stanu na delegowane"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1103,7 +1112,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "SPRAWDŹ: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1147,7 @@ msgstr "Niski"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Stan Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1159,7 +1168,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Zmień typ"
 
 #. module: project
 #: help:project.project,members:0
@@ -1167,6 +1176,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Członkowie projektu to użytkownicy, którzy mają dostęp do zadań związanych z "
+"tym projektem."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1176,7 +1187,7 @@ msgstr "Menedżer projektu"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Do zmiany w stan wykonane"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1193,7 +1204,7 @@ msgstr "Sierpień"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalne"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1204,7 +1215,7 @@ msgstr "Nazwa projektu"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Historia zadań"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1219,7 +1230,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Podaj klienta lub adres mailowy klienta"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1251,7 +1262,7 @@ msgstr "Reaktywuj"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: project
 #: field:project.project,active:0
@@ -1272,7 +1283,7 @@ msgstr "Listopad"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Utwórz swój pierwszy projekt"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1283,7 +1294,7 @@ msgstr "Projekt '%s' został zamknięty."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Kumulacyjny przepływ zadań"
 
 #. module: project
 #: view:project.task:0
@@ -1298,7 +1309,7 @@ msgstr "Październik"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Zatwierdź planowany czas i otwórz zadanie"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1312,7 +1323,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Historia przydziałów"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1341,7 +1352,7 @@ msgstr "Firmy"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projekty. których jestem członkiem"
 
 #. module: project
 #: view:project.project:0
@@ -1437,7 +1448,7 @@ msgstr "Rozszerzone filtry..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Usuń najpierw projekt związany z tym kontem."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1459,7 +1470,7 @@ msgstr "Stan"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Oddelegowani pracownicy powinni być wyspecyfikowani"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1538,7 +1549,7 @@ msgstr "W toku"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analiza zadań"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1547,16 +1558,18 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Zadania podrzędne są otwarte.\n"
+"Najpierw anuluj lub zakończ zadania podrzędne."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapy wspólne dla wsystkich projektów"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Błąd ! Data końcowa musi być późniejsza niż data początkowa"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1572,7 +1585,7 @@ msgstr "Czas pracy"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projekty, których jestem menedżerem"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1609,6 +1622,7 @@ msgstr "Bardzo niski"
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
+"Rozkład godzin roboczych do uwzględnienia w raporcie z wykresem Gantta"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1672,6 +1686,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Jeśli to zaznaczysz, to ten etap będzie domyślnie proponowany dla każdego "
+"nowego projektu. W bieżących projektach etap się nie zmieni."
 
 #. module: project
 #: view:board.board:0
@@ -1709,7 +1725,7 @@ msgstr "Moje konta do fakturowania"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Rozwój"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1732,7 +1748,7 @@ msgstr "Suma godzin wszystkich zadań tego projektu i projektów podrzędnych."
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Wspólne dla wszystkich projektów"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1765,7 +1781,7 @@ msgstr "Zadania wg dni"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nazwa firmy musi być unikalna !"
 
 #. module: project
 #: view:project.task:0
@@ -1785,7 +1801,7 @@ msgstr "Podsumowanie pracy"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Miesiąc-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1795,7 +1811,7 @@ msgstr "Liczba dni do zamknięcia zadania"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Miesiąc-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1820,7 +1836,7 @@ msgstr "Otwórz wykonane zadania"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Wspólne"
 
 #. module: project
 #: view:project.task:0
@@ -1833,6 +1849,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapy mogą być jednakowe dla wszystkich projektów lub różne dla różnych "
+"projektów. Każde zadanie przejdzie różne etapy, aby zostać wykonanym."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1854,12 +1872,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Wykres wykonania"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Przypisane zadania"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1869,12 +1887,12 @@ msgstr "Zadania przeterminowane"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Bieżący rok"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych obiektów."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1961,7 +1979,7 @@ msgstr "Zadanie '%s' zostało anulowane."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Do zmiany stanu na otwarty"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1995,7 +2013,7 @@ msgstr "Stopka wiadomości"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Zadania w toku"
 
 #~ msgid "All Tasks"
 #~ msgstr "Wszystkie zadania"
@@ -2508,3 +2526,6 @@ msgstr ""
 
 #~ msgid "Issues Tracker"
 #~ msgstr "Obsługa problemów"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Kreator tworzenia wiadomości"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 19c18efd5d1..46cf1a9279a 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -663,7 +663,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 1f097e77a31..40ade73da66 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Novas tarefas"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Voltar a incluir a descrição da tarefa na tarefa do utilizador"
 
 #. module: project
 #: code:addons/project/project.py:951
@@ -36,28 +36,28 @@ msgstr "A tarefa '%s' foi atribuída a %s."
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"A empresa escolhida não faz parte das possíveis de serem selecionadas para "
-"este utilizador"
+"A empresa escolhida não está entre as permitidas para este utilizador"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mês anterior"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "As Minhas Tarefas"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "Alertar Terceiro"
+msgstr "Avisar Parceiro"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr "Indicar aqui as horas ainda necessárias para terminar a tarefa"
+msgstr ""
+"Indicar aqui as horas que ainda serão necessárias para terminar a tarefa."
 
 #. module: project
 #: view:project.task:0
@@ -68,7 +68,7 @@ msgstr "Prazos"
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operação Não Permitida !"
+msgstr "Operação não é permitida !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -82,24 +82,24 @@ msgstr "VERIFICAR: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email Utilizador"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Trabalho feito"
+msgstr "Trabalho concluído"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Aviso !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delegar tarefa"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -109,7 +109,7 @@ msgstr "Horas para Validar"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projetos pendentes"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -123,12 +123,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Re-abrir projeto"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir a lista de projetos"
 
 #. module: project
 #: constraint:project.project:0
@@ -138,12 +138,12 @@ msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Tarefa reavaliação"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr "Membros do Projecto"
+msgstr "Membros do Projeto"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -153,7 +153,7 @@ msgstr "Tarefas por delegado"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr "março"
+msgstr "Março"
 
 #. module: project
 #: view:project.task:0
@@ -177,7 +177,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr "Minhas tarefas"
+msgstr "As Minhas Tarefas"
 
 #. module: project
 #: constraint:project.task:0
@@ -193,7 +193,7 @@ msgstr "Empresa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tarefas pendentes"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -203,7 +203,7 @@ msgstr "Título da Sua Tarefa"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome estágio"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -213,7 +213,7 @@ msgstr "Definir como pendente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -223,22 +223,22 @@ msgstr "Definir as exigências e fixar as horas planeadas."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Alterar etapa"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Novo Projecto Baseado em um Modelo"
+msgstr "Novo Projeto Baseado num Template"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Erro! Não pode atribuir uma escaltion ao mesmo projeto!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr "Muito urgente"
+msgstr "Muito Urgente"
 
 #. module: project
 #: help:project.task.delegate,project_id:0
@@ -249,7 +249,7 @@ msgstr "Utilizador a quem quer entregar esta tarefa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Minhas Tarefas"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
@@ -260,12 +260,12 @@ msgstr "Dia"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projetos e etapas"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr "Definir como Modelo"
+msgstr "Definir como Template"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -289,7 +289,7 @@ msgstr "Membros"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr "Minhas tarefas abertas"
+msgstr "Minhas Tarefas Abertas"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -297,16 +297,18 @@ msgstr "Minhas tarefas abertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Por favor, especifique o Gestor de Projeto ou o endereço de e-mail de Gestor "
+"de Projeto."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Para cancelar a tarefa"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Trabalho da Tarefa do Projeto"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -316,7 +318,7 @@ msgstr "Notas"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projeto vs horas restantes"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -331,6 +333,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Este campo é calculado automaticamente e têm o mesmo comportamento que o "
+"campo boolean \"ativo\": se a tarefa está ligada a um template ou projeto "
+"inativo, estará oculto, a menos que especificamente solicitado."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -340,7 +345,7 @@ msgstr "Resumo da Tarefa"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Não é uma tarefa do template"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -357,13 +362,13 @@ msgstr "Tarefa está Concluída"
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
-"Variáveis automáticas para cabeçalhos e rodapés. Use exactamente a mesma "
+"Variáveis automáticas para cabeçalhos e rodapés. Use exatamente a mesma "
 "notação."
 
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas com prazo"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -376,17 +381,17 @@ msgstr "Cancelado"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr "Data de fim"
+msgstr "Data Final"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr "Cabeçalho da Mensagem"
+msgstr "Cabeçalho do Mail"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Mudar para próxima etapa"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -396,7 +401,7 @@ msgstr "Tarefa concluída"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de Cor"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -406,7 +411,7 @@ msgstr "Configuração"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mês Atual"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -421,7 +426,7 @@ msgstr "Agrupar por..."
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr "Feito por"
+msgstr "Concluído por"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -452,7 +457,7 @@ msgstr "Conta Analítica"
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "Calculado usando a soma das tarefas realizadas."
+msgstr "Processado com base na soma das tarefas de trabalho concluídas."
 
 #. module: project
 #: view:project.task:0
@@ -468,43 +473,43 @@ msgstr "Prazo Limite"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Pronto"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Mudar Cor"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivamente"
+msgstr "Erro! Não pode criar contas analíticas recursivas."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (cópia)"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nova tarefa"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr "Número de tarefas"
+msgstr "# de tarefas"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -514,32 +519,32 @@ msgstr "Atribuído a"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Data Stop : %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Não se pode ter dois utilizadores com os mesmos dados de acesso"
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "Redefinir como Projecto"
+msgstr "Redefinir como Projeto"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr "Modelo"
+msgstr "Template"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr "Meus projectos"
+msgstr "Os Meus projectos"
 
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Não pode criar empresas recursivas."
 
 #. module: project
 #: view:project.task:0
@@ -549,28 +554,28 @@ msgstr "Próximo"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "A partir do estado \"Rascunho\", vai passar ao estado \"Aberto\"."
+msgstr "A partir do estado Rascunho, vai passar ao estado Aberto."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr "Número de dias"
+msgstr "# de dias"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Abrir projeto"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Deve atribuir os membros em projeto '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tarefas em progresso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -587,7 +592,7 @@ msgstr "Descrição da Nova Tarefa"
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr "Tarefa do projecto"
+msgstr "Tarefa do projeto"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -595,7 +600,7 @@ msgstr "Tarefa do projecto"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -606,18 +611,18 @@ msgstr "Processado como: Tempo Gasto + Tempo Restante."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flow acumulado"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr "Horas efectivas"
+msgstr "Horas Efetivas"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Título da tarefa de validação"
 
 #. module: project
 #: view:project.task:0
@@ -628,23 +633,23 @@ msgstr "Reavaliar"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Atraso OverPass"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Medium"
-msgstr "Medio"
+msgstr "Médio"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tarefas pendentes"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -656,19 +661,19 @@ msgstr "Horas Restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data da Criação"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tempo Restante"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -690,7 +695,7 @@ msgstr "Tarefas não Atribuídas"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Sem tarefas atribuídas a utilizadores"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -698,6 +703,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Soma das horas planeadas de todas as tarefas relacionadas a este projeto e "
+"sub projetos."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -719,7 +726,7 @@ msgstr "Título Delegado"
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr "Meus Projectos"
+msgstr "Meus Projetos"
 
 #. module: project
 #: view:project.task:0
@@ -729,12 +736,12 @@ msgstr "Informação Extra"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr "julho"
+msgstr "Julho"
 
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Gráfico Burndown de Tarefas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -748,7 +755,7 @@ msgstr "Data Inicial"
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr "Projectos"
+msgstr "Projetos"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -756,7 +763,7 @@ msgstr "Projectos"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Estágio"
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -765,6 +772,9 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Definir os passos que serão utilizados no projeto desde a criação da tarefa, "
+"até o encerramento da tarefa ou problema. Vai usar essas fases, a fim de "
+"acompanhar o progresso na solução de uma tarefa ou um problema."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -780,7 +790,7 @@ msgstr "Datas"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Novo título da tarefa delegada ao utilizador"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -789,11 +799,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Não pode excluir um projeto contendo tarefas. Eu sugiro que o desative."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projeto vs Planeado e Total Horas"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -803,24 +814,24 @@ msgstr "Rascunho da tarefa em aberto"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr "janeiro"
+msgstr "Janeiro"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr "Horas de demora"
+msgstr "Horas em Atraso"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Muito importante"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Análise de tarefas"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -834,6 +845,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Se verificar neste campo, o gerente de projetos receberá um email cada vez "
+"que uma tarefa seja concluída pela equipa."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -846,50 +859,50 @@ msgstr ""
 #: model:res.request.link,name:project.req_link_project
 #: field:res.users,context_project_id:0 field:task.by.days,project_id:0
 msgid "Project"
-msgstr "Projecto"
+msgstr "Projeto"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Avaliar"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr "Meu quadro"
+msgstr "O meu Painel"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr "Estágios"
+msgstr "Fases"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Muda para a fase anterior"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Gestão de Projectos"
+msgstr "Gestão de Projetos"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr "Unidade de tempo do projecto"
+msgstr "Unidade de tempo do projeto"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Delegar tarefa do projeto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -905,12 +918,12 @@ msgstr "Tarefas"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Ascendente"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcar como Bloqueado"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -924,16 +937,24 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"A tarefa representa um trabalho que tem que ser feito. Cada utilizador "
+"trabalha na própria lista de tarefas, onde pode gravar a tarefa em horas. "
+"Pode trabalhar e fechar a tarefa em si ou delegá-la a outro utilizador. Se "
+"delegar uma tarefa para outro utilizador, recebe uma nova tarefa no estado "
+"pendente, que será reaberta quando tem que rever o trabalho realizado. Se "
+"instalar o módulo project_timesheet, o trabalho da tarefa pode ser faturado "
+"com base na configuração do projeto. Com o módulo project_mrp, ordens de "
+"vendas pode criar tarefas automaticamente quando são confirmadas."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr "setembro"
+msgstr "Setembro"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr "dezembro"
+msgstr "Dezembro"
 
 #. module: project
 #: field:project.task,progress:0
@@ -949,6 +970,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Se a tarefa é criada o Estado é 'Rascunho'. \n"
+"  Se a tarefa for iniciada, o Estado torna-se 'em processamento'. \n"
+"  Se é necessário rever a tarefa está em estado 'Pendente'. \n"
+"  Se a tarefa é terminada, os estados são definidos para 'Concluído'."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -964,18 +989,18 @@ msgstr "Mês"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr "Tarefas do projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Fase Tarefas"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Design"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -988,7 +1013,7 @@ msgstr "Horas Planeadas"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Reveja fase da tarefa"
 
 #. module: project
 #: view:project.project:0
@@ -998,24 +1023,24 @@ msgstr "Estado: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir uma lista de tarefas."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr "Data de início"
+msgstr "Data Inicial"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pronto para puxar"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr "Tarefas \"mãe\""
+msgstr "Tarefas ascendentes"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1023,7 +1048,7 @@ msgstr "Tarefas \"mãe\""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1031,11 +1056,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Se a tarefa tem um avanço de 99,99%, deve fechar a tarefa se ela acabou ou "
+"reavaliar o tempo"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Endereço de Contato"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1045,6 +1072,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Estado de uma tarefa kanban indica situações especiais que lhe dizem "
+"respeito:\n"
+"  * Normal é a situação padrão\n"
+"  * Bloqueado indica que algo está a impedir o progresso desta tarefa\n"
+"  * Pronto para Pull indica a tarefa está pronta para ser puxada para a "
+"próxima fase"
 
 #. module: project
 #: view:project.project:0
@@ -1054,12 +1087,12 @@ msgstr "Utilizador: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr "Facturação"
+msgstr "Faturação"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para mudar para estado delegado"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1070,7 +1103,7 @@ msgstr "Prioridade"
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Templates do projeto"
 
 #. module: project
 #: view:project.project:0
@@ -1080,13 +1113,13 @@ msgstr "Administração"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CONFIRA: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1096,12 +1129,12 @@ msgstr "Membro"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr "Tarefas do Projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Tempo estimado para fechar esta tarefa pelo utilizador delegado"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1120,7 +1153,7 @@ msgstr "Baixo"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Estado Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1134,11 +1167,14 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Este relatório permite analisar o desempenho dos projetos e utilizadores. "
+"Pode analisar a quantidade de tarefas, as horas gastas em comparação com as "
+"horas planeadas, o número médio de dias para abrir ou fechar uma tarefa, etc"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Mudar tipo"
 
 #. module: project
 #: help:project.project,members:0
@@ -1146,44 +1182,46 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Membros do projeto são os utilizadores que podem ter um acesso a tarefas "
+"relacionadas a este projeto."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Gestor do Projecto"
+msgstr "Gestor do Projeto"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Para mudar para o estado concluído"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "Tarefas por utilizador e projecto"
+msgstr "Tarefas por utilizador e projeto"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
 msgid "Project Name"
-msgstr "Nome do projecto"
+msgstr "Nome do Projeto"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Histórico de tarefas"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1191,49 +1229,51 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Novo estado da própria tarefa. Pendente será reaberto automaticamente quando "
+"a tarefa delegada está fechado"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor, especifique o cliente ou endereço de email do cliente."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr "junho"
+msgstr "Junho"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr "Tempo total"
+msgstr "Tempo Total"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr "Dias até ao fecho"
+msgstr "Dias para Fechar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Painel de projecto"
+msgstr "Painel do Projeto"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "Reactivar"
+msgstr "Reativar"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilizador"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr "Ativo"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1244,23 +1284,23 @@ msgstr "Dias até a abertura"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Crie os seus primeiros projetos"
 
 #. module: project
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "O projeto '%s' foi fechado."
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Flow das tarefas acumulado"
 
 #. module: project
 #: view:project.task:0
@@ -1270,12 +1310,12 @@ msgstr "Edições de tarefas"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr "outubro"
+msgstr "Outubro"
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar tempo planeado e tarefa aberta"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1283,16 +1323,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculado como a diferença entre as horas planeadas pelo gestor do projeto e "
+"as horas totais da tarefa."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico das delegações"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1300,6 +1342,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Se o campo ativo é definido como Falso, ele permitirá que oculte o projeto "
+"sem o remover."
 
 #. module: project
 #: view:project.task:0
@@ -1314,12 +1358,12 @@ msgstr "Empresas"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projetos em que sou membro."
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Pesquisar projeto"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1336,7 +1380,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr "Painel"
+msgstr "Painel de Controlo"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1344,7 +1388,7 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr "Isto define a unidade de medida usada nos projectos e tarefas."
+msgstr "Isto define a unidade de medida usada nos projetos e tarefas."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1356,17 +1400,17 @@ msgstr "Erro"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr "Projectos do utilizador"
+msgstr "Projetos do utilizador"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegar"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Número de dias até abrir tarefa"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1390,23 +1434,23 @@ msgid ""
 "task is in draft state."
 msgstr ""
 "Tempo estimado para executar esta tarefa, normalmente definido pelo gestor "
-"do projecto quando a tarefa encontra-se em  rascunho."
+"do projeto quando a tarefa está no estado rascunho."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Título para a validação da tarefa"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Avançados..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Por favor, excluir o projeto ligado a esta conta primeiro."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1428,7 +1472,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Utilizador delegado deve ser especificado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1448,9 +1492,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"Ligue este projecto a uma conta analítica caso precisar de gestão financeira "
-"nos projectos. Permite-lhe ligar projectos a orçamentos, planeamento, "
-"análise de custos e de receitas, calendário de projectos, etc."
+"Ligue este projeto a uma conta analítica caso precisar de gestão financeira "
+"nos projetos. Permite-lhe ligar projetos a orçamentos, planeamento, análise "
+"de custos e de receitas, calendário de projetos, etc."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1477,7 +1521,7 @@ msgstr "Cancelar"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1507,7 +1551,7 @@ msgstr "Em Progresso"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Análise das tarefas"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1516,16 +1560,18 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarefa descendente ainda em aberto.\n"
+"Por favor, cancelar ou completar a tarefa descendente primeiro."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Fases comuns a todos os projetos"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1536,23 +1582,23 @@ msgstr "Responsável"
 #. module: project
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr "Tempo de trabalho"
+msgstr "Tempo de Trabalho"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projetos em que eu sou gestor"
 
 #. module: project
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "A tarefa '%s' está pendente."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projecto vs  horas"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1565,6 +1611,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Soma de horas gastas de todas as tarefas relacionadas a este projeto e sub "
+"projetos."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1585,7 +1633,7 @@ msgstr "Alertar o Gestor"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1605,7 +1653,7 @@ msgstr "Desenvolvimento"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Horas restantes para projeto"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1621,7 +1669,7 @@ msgstr "Urgente"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr "maio"
+msgstr "Maio"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1631,7 +1679,7 @@ msgstr "Validação da Tarefa"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Total de tarefas"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1639,13 +1687,15 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Se verificar neste campo, esta fase será proposta por omissão em cada "
+"projeto novo. Não vai atribuir nesta fase, os projetos existentes."
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Minhas tarefas delegadas"
 
 #. module: project
 #: view:project.project:0
@@ -1676,12 +1726,12 @@ msgstr "Minhas contas a facturar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Desenvolvimento"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr "Tarefas do projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: code:addons/project/project.py:851
@@ -1695,11 +1745,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Somatório do total de horas de todas as tarefas para este projeto e sub "
+"projetos."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Comum a todos os projetos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1717,23 +1769,23 @@ msgstr "Cliente"
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr "fevereiro"
+msgstr "Fevereiro"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Tarefas por Dias"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: project
 #: view:project.task:0
@@ -1753,22 +1805,22 @@ msgstr "Resumo do trabalho"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mês-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Número de dias para fechar a tarefa"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mês-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr "abril"
+msgstr "Abril"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1788,12 +1840,12 @@ msgstr "Abrir Tarefa Concluída"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comum"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Horas Gastas"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1801,17 +1853,19 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"As fases podem ser comuns a todo o projeto ou específico de um projeto. Cada "
+"tarefa seguirá as diferentes fases, a fim de ser fechada."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir uma lista de projetos."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Tarefa '%s' Fechada"
 
 #. module: project
 #: field:project.task,id:0
@@ -1822,27 +1876,27 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Tabela Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "As tarefas atribuídas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Tarefas superada"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Ano Atual"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Não pode criar membros recursivos."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1854,7 +1908,7 @@ msgstr "Sequência"
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Restantes horas por projeto"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1877,6 +1931,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Um projeto contém um conjunto de tarefas ou questões que serão executadas "
+"pelos recursos atribuídos a ele. Um projeto pode ser hierarquicamente "
+"estruturado, como um sub projeto do projeto principal. Isso permite que "
+"projete estruturas grandes com fases diferentes espalhadas ao longo do ciclo "
+"de duração do projeto. Cada utilizador pode definir o projeto padrão com as "
+"próprias preferências para filtrar automaticamente as tarefas ou as questões "
+"que ele geralmente trabalha. Se escolher faturar o tempo gasto numa tarefa "
+"de projeto, pode encontrar as tarefas do projeto a ser faturado na secção de "
+"faturamento."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1900,6 +1963,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Tempo estimado para que se possa validar o trabalho feito pelo utilizador "
+"para quem se delegado essa tarefa"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1909,25 +1974,25 @@ msgstr "Gestor"
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr "Data de criação"
+msgstr "Data de Criação"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "A tarefa '%s' está cancelada."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para mudar para o estado aberto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
 #: field:project.task,partner_id:0 view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr "Terceiro"
+msgstr "Parceiro"
 
 #. module: project
 #: code:addons/project/project.py:804
@@ -1939,7 +2004,7 @@ msgstr "Enviar mensagem após o fecho da tarefa"
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Estágios da tarefa"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1949,12 +2014,12 @@ msgstr "Delegue a sua tarefa ao outro utilizador"
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr "Rodapé do Mensagem"
+msgstr "Mail do Rodapé"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tarefas em progresso"
 
 #~ msgid "Close Task"
 #~ msgstr "Fechar a Tarefa"
@@ -2053,9 +2118,6 @@ msgstr ""
 #~ msgid "Task invoice"
 #~ msgstr "Factura da tarefa"
 
-#~ msgid "Assigned tasks"
-#~ msgstr "Tarefas atribuidas"
-
 #~ msgid ""
 #~ "Project management module that track multi-level projects, tasks,\n"
 #~ "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
@@ -2085,9 +2147,6 @@ msgstr ""
 #~ msgid "New Task"
 #~ msgstr "Nova tarefa"
 
-#~ msgid "Computed as: Time Spent / Total Time."
-#~ msgstr "Calculado como: Tempo despendido / tempo total"
-
 #~ msgid "Review"
 #~ msgstr "Rever"
 
@@ -2245,11 +2304,6 @@ msgstr ""
 #~ msgid "Create a Task"
 #~ msgstr "Criar uma Tarefa"
 
-#, python-format
-#~ msgid ""
-#~ "You can not delete a project with tasks. I suggest you to deactivate it."
-#~ msgstr "Não pode apagar um projecto com tarefas. Sugiro desactivá-lo."
-
 #~ msgid "Parent Task"
 #~ msgstr "Tarefa Ascendente"
 
@@ -2326,3 +2380,186 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "título"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "Tarefas atribuídas"
+
+#~ msgid "_Send"
+#~ msgstr "_Send"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Rastreador de questões"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projectos: Planeado Vs Total horas"
+
+#~ msgid "Warn Message"
+#~ msgstr "Mensagem Aviso"
+
+#~ msgid "Project Close Task"
+#~ msgstr "Fechar tarefa do projecto"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Ajuda a gerar facturas com base no tempo gasto em tarefas, se activada no "
+#~ "projecto."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Configurar a aplicação de Gerência de Projectos"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mês   "
+
+#~ msgid ""
+#~ "Tracks and helps employees encode and validate timesheets and attendances."
+#~ msgstr ""
+#~ "Faixas e ajuda os funcionários a codificar e validar a folha de horas e "
+#~ "assiduidade."
+
+#~ msgid "Specification"
+#~ msgstr "Especificação"
+
+#~ msgid "Methodologies"
+#~ msgstr "Metodologias"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mês-1    "
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "Várias aplicações OpenERP estão disponíveis para gerir os projectos com "
+#~ "diferentes níveis de controle e flexibilidade."
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Por favor, especifique o endereço de email do Gerente do Projecto."
+
+#~ msgid "Computed as: Time Spent / Total Time."
+#~ msgstr "Calculado como: Tempo gasto / tempo total"
+
+#~ msgid "  Year  "
+#~ msgstr "  Ano  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "Ajuda a gerir os contabilistas analíticos e orçamentos cruzados."
+
+#~ msgid "Configure"
+#~ msgstr "Configure"
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr ""
+#~ "Implementa e acompanha os conceitos e tipos de tarefa definidos na "
+#~ "metodologia SCRUM."
+
+#~ msgid "Customer Email"
+#~ msgstr "E-mail do cliente"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Avisa Gerente por Email"
+
+#~ msgid "Manager Email"
+#~ msgstr "Gerente de E-mail"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Erro! A divisa tem que ser o mesma que a divisa da empresa seleccionada"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Ter coisas concluídas"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Avisar Cliente por E-mail"
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "Projecto do módulo da gerência de faixas multi-nível de projectos, tarefas \n"
+#~ "trabalho em tarefas, eso. É capaz de tornar o planeamento, as tarefas de "
+#~ "ordem, eso. \n"
+#~ "  Painel para os membros do projecto, que inclui: \n"
+#~ "     * Lista das minhas tarefas abertas \n"
+#~ "     * Lista de membros do projecto\n"
+#~ "    "
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr "Não pode apagar um projecto com tarefas. Sugiro que o desactive."
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "Por favor, especifique o endereço de e-mail do cliente."
+
+#~ msgid "Send Email"
+#~ msgstr "Enviar E-mail"
+
+#~ msgid "Current Activity"
+#~ msgstr "Actividade corrente"
+
+#~ msgid ""
+#~ "GTD is a methodology to efficiently organise yourself and your tasks. This "
+#~ "module fully integrates GTD principle with OpenERP's project management."
+#~ msgstr ""
+#~ "GTD é uma metodologia para organizar eficazmente a si mesmo e suas tarefas. "
+#~ "Este módulo integra totalmente princípio GTD com a gestão OpenERP do "
+#~ "projecto."
+
+#~ msgid "Current"
+#~ msgstr "Actual"
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "Calculado como a diferença do tempo estimado pelo gerente de projecto e o "
+#~ "tempo real para fechar a tarefa."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Permite a longo prazo de monitorização de projectos, incluindo projectos de "
+#~ "múltipla-fase e manipulação de alocação de recursos."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Tempo contabilizado em tarefas"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "Configuração da aplicação do projecto"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "Endereço de E-mail do Gestor dos Projectos"
+
+#~ msgid "Warn Customer"
+#~ msgstr "Avisar Cliente"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "Meus Projectos: Planeado vs Total Horas"
+
+#~ msgid "project.installer"
+#~ msgstr "project.installer"
+
+#~ msgid "Merge"
+#~ msgstr "Fundir"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Sincroniza automaticamente as tarefas do projecto e os casos de crm."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de email"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 370c26587c3..0ef329a5891 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/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: 2012-02-21 05:54+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -298,6 +298,8 @@ msgstr "Minhas Tarefas Abertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Favor especificar o Gerente de Projeto ou o endereço de email do Gerente de "
+"Projeto."
 
 #. module: project
 #: view:project.task:0
@@ -569,7 +571,7 @@ msgstr "Projetos Abertos"
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Você precisa associar membros no projeto '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -660,7 +662,7 @@ msgstr "Horas Restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -798,6 +800,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Você não pode excluir um projeto que contêm tarefas. Eu sugiro a você "
+"desativá-lo."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -843,6 +847,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Se você marcar este campo, o gerente de projeto receberá um email a cada vez "
+"que uma tarefa for completada pelo seu time."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -998,7 +1004,7 @@ msgstr "Estágios de Tarefas"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Desenho"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1317,7 +1323,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico de Delegações"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2535,3 +2541,6 @@ msgstr "Tarefas em Progresso"
 
 #~ msgid "Current Activity"
 #~ msgstr "Atividade Atual"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 153594cfa6b..c27db5b508f 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,50 +13,50 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Sarcini noi"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr "Reinclude descrierea sarcinii in activitatea utilizatorului"
+msgstr "Reincludei descrierea sarcinii in activitatea utilizatorului"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "Sarcina '%s' a fost delegată lui %s."
+msgstr "Sarcina '%s' i-a fost delegata lui %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Compania aleasă nu se află printre companiile permise acestui utilizator"
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Luna anterioara"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Sarcinile mele"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "Avertizează Partenerul"
+msgstr "Avertizati partenerul"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr "Aici introduceti orele rămase necesare pentru a inchide sarcina."
+msgstr "Aici introduceti orele ramase necesare pentru a inchide sarcina."
 
 #. module: project
 #: view:project.task:0
@@ -67,7 +67,7 @@ msgstr "Termene scadente"
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operațiune nepermisă !"
+msgstr "Operatiune nepermisa !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -76,39 +76,39 @@ msgstr "Operațiune nepermisă !"
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr "VERIFICA: "
+msgstr "VERIFICATI: "
 
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-mail utilizator"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Munca efectuată"
+msgstr "Munca efectuata"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr "Delegat Sarcină"
+msgstr "Delegat sarcina"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Ore de Validat"
+msgstr "Ore de validat"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Proiecte in asteptare"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -116,30 +116,30 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
-"Timpul total rămas poate fi estimat din nou periodic de către persoana "
-"imputernicită."
+"Timpul total ramas poate fi estimat din nou periodic de catre persoana "
+"imputernicita."
 
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Redeschideti proiectul"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr "Prezintă ordinea secventei atunci cand afisează lista proiectelor"
+msgstr "Prezinta secventa de ordonare atunci cand afiseaza lista proiectelor"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"Eroare! data de inceput a proiectului trebuie să fie mai mică decat data de "
+"Eroare! data de inceput a proiectului trebuie sa fie mai mica decat data de "
 "sfarsit a proiectului."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr "Re-evaluare sarcina"
+msgstr "Activitatea de reevaluare"
 
 #. module: project
 #: field:project.project,members:0
@@ -149,7 +149,7 @@ msgstr "Membrii proiectului"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Sarcină după delegat"
+msgstr "Sarcina dupa delegat"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -172,8 +172,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Antetul adăugat la inceputul e-mail-ului pentru mesajul de avertizare trimis "
-"clientului atunci cand o sarcină este inchisă."
+"Antetul adaugat la inceputul email-ului pentru mesajul de avertizare trimis "
+"clientului atunci cand o sarcina este inchisa."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -189,52 +189,52 @@ msgstr "Eroare ! Nu puteti crea sarcini recursive."
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Sarcini in asteptare"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr "Titlul Sarcinii dumneavoastră"
+msgstr "Titlul sarcinii dumneavoastra"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Numele Etapei"
+msgstr "Numele etapei"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "Setează in asteptare"
+msgstr "Setati in asteptare"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr "Defineste Solicitările si Setează Orele Planificate."
+msgstr "Definiti Solicitarile si Setati Orele Planificate."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr "Schimbă Starea"
+msgstr "Schimbati Etapa"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Proiect Nou bazat pe Sablon"
+msgstr "Proiect nou bazat pe un Sablon"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Eroare! Nu puteti atribui o intensificare aceluiasi proiect!"
+msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -245,7 +245,7 @@ msgstr "Foarte urgent"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr "Utilizatorul căruia doriti să ii delegati această sarcină"
+msgstr "Utilizatorul caruia doriti sa ii delegati aceasta sarcina"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -261,17 +261,17 @@ msgstr "Zi"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Proiecte si Etape"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr "Setat ca Sablon"
+msgstr "Setati ca Sablon"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "Sarcină ciornă"
+msgstr "Sarcina ciorna"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -279,7 +279,7 @@ msgstr "Sarcină ciornă"
 #: field:project.task.history.cumulative,task_id:0
 #: field:project.task.work,task_id:0 view:report.project.task.user:0
 msgid "Task"
-msgstr "Sarcină"
+msgstr "Sarcina"
 
 #. module: project
 #: view:project.project:0
@@ -298,16 +298,18 @@ msgstr "Sarcinile mele deschise"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Va rugam sa specificati Managerul de Proiect sau adresa de e-mail a "
+"Managerului de Proiect."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Pentru anularea sarcinii"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr "Sarcină de lucru Proiect"
+msgstr "Sarcina de lucru Proiect"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -317,13 +319,13 @@ msgstr "Note"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr "Proiect vs ore rămase"
+msgstr "Proiect vs ore ramase"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr "Planificare medie - Eficientă"
+msgstr "Planificare medie - Eficienta"
 
 #. module: project
 #: help:project.task,active:0
@@ -333,42 +335,42 @@ msgid ""
 "project, it will be hidden unless specifically asked."
 msgstr ""
 "Acest camp este calculat automat si are acelasi comportament ca si campul "
-"'activ' boolean: dacă sarcina este asociată unui sablon sau proiect "
-"neactivat, va fi ascunsă, cu exceptia cazului in care se cere expres să nu "
-"fie."
+"'activ' boolean: dacă sarcina este asociata unui sablon sau unui proiect "
+"neactivat, ea va fi ascunsa, cu exceptia cazului in care se cere in mod "
+"expres sa nu fie."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr "Rezumat sarcină"
+msgstr "Rezumat sarcina"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr "Nu este o Sarcină Sablon"
+msgstr "Nu este o sarcina sablon"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr "Incepe sarcina"
+msgstr "Incepeti Sarcina"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "Sarcina este incheiată"
+msgstr "Sarcina este finalizata"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
-"Variabile automate pentru antete si subsoluri. Foloseste intocmai aceeasi "
+"Variabile automate pentru antete si subsoluri. Folositi intocmai aceeasi "
 "notatie."
 
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Afisati numai sarcinile care au un termen limita"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -376,12 +378,12 @@ msgstr ""
 #: selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr "Data de sfârşit"
+msgstr "Data de sfarsit"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -391,17 +393,17 @@ msgstr "Antet e-mail"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Treceti la Etapa Urmatoare"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr "Sarcină efectuată"
+msgstr "Sarcina efectuata"
 
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Index Culori"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -411,22 +413,22 @@ msgstr "Configurare"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Luna curenta"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr "Deleagă sarcini celorlalti utilizatori"
+msgstr "Delegati sarcini celorlalti utilizatori"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr "Efectuat de către"
+msgstr "Efectuat de catre"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -434,9 +436,9 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
-"Dacă bifati această căsută, utilizatorului ii va apărea un popup atunci cand "
-"inchide o sarcină, care propune un mesaj pe care să il trimită prin e-mail "
-"cleintului."
+"Daca bifati aceasta casuta, utilizatorului ii va apărea un popup atunci cand "
+"inchide o sarcina, care propune un mesaj pe care sa il trimita prin e-mail "
+"clientului."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -447,13 +449,13 @@ msgstr "Testare"
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr "Sarcina '%s' inchisă"
+msgstr "Sarcina '%s' inchisa"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Cont analitic"
+msgstr "Cont Analitic"
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -469,22 +471,22 @@ msgstr "Planificare"
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Data scadentă"
+msgstr "Termen limita"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr "_Anulează"
+msgstr "_Anulati"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Pregatit(a)"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Schimbati culoarea"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -500,7 +502,7 @@ msgstr " (copie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Sarcini noi"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -510,7 +512,7 @@ msgstr "# de sarcini"
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr "Anterior"
+msgstr "Precedent(a)"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -520,7 +522,7 @@ msgstr "Atribuit lui"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr "Data de sfarsit: %(data)s"
+msgstr "Stop Data: %(data)s"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -530,12 +532,12 @@ msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !"
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "Resetează ca Proiect"
+msgstr "Resetati ca Proiect"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr "Șablon"
+msgstr "Sablon"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -550,12 +552,12 @@ msgstr "Eroare! Nu puteti crea companii recursive."
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr "Următorul(următoarea)"
+msgstr "Urmatorul (urmatoarea)"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "Din starea de ciornă va ajunge in starea deschisă."
+msgstr "Din starea de ciorna, va trece in starea deschisa."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
@@ -565,18 +567,18 @@ msgstr "# de Zile"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Proiecte Open"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Trebuie sa alocati membri proiectului '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Sarcini în progres"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -588,12 +590,12 @@ msgstr ""
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr "Descrierea Noii Sarcini"
+msgstr "Descrierea noii sarcini"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr "Sarcină Proiect"
+msgstr "Sarcină proiect"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -601,18 +603,18 @@ msgstr "Sarcină Proiect"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculat in felul următor: Timp petrecut + Timp rămas"
+msgstr "Calculat în felul următor: Timp petrecut + Timp rămas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flux Cumulativ"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -623,23 +625,23 @@ msgstr "Ore efective"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr "Titlul validării sarcinii"
+msgstr "Titlul Validarii Sarcinii"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr "Reevaluează"
+msgstr "Reevaluati"
 
 #. module: project
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr "Trece peste intarziere"
+msgstr "Treceti peste intarziere"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -650,7 +652,7 @@ msgstr "Mediu"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Sarcini in asteptare"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -658,23 +660,23 @@ msgstr ""
 #: field:project.vs.hours,remaining_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "Ore rămase"
+msgstr "Ore ramase"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data crearii"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Ore ramase"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -686,17 +688,17 @@ msgstr "Timp planificat"
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr "Informații"
+msgstr "Informatii"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "Sarcini nealocate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr "Sarcini neatribuite utilizatorilor"
+msgstr "Sarcini nealocate utilizatorilor"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -716,7 +718,7 @@ msgstr ""
 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Pending"
-msgstr "În așteptare"
+msgstr "In asteptare"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -732,7 +734,7 @@ msgstr "Proiectele mele"
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "Informaţii suplimentare"
+msgstr "Informatii suplimentare"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -742,12 +744,12 @@ msgstr "Iulie"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Grafic de sarcini descendent"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project
 #: code:addons/project/project.py:324
@@ -764,7 +766,7 @@ msgstr "Proiecte"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -773,7 +775,7 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
-"Defineste pasii care vor folositi in formularul proiectului, de la crearea "
+"Definiti pasii care vor folositi in formularul proiectului, de la crearea "
 "sarcinii pana la inchiderea sarcinii sau problemei. Veti folosi aceste etape "
 "pentru a tine evidenta progresului in rezolvarea unei sarcini sau a unei "
 "probleme."
@@ -782,7 +784,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr "Sarcina '%s' este deschisă."
+msgstr "Sarcina '%s' este deschisa."
 
 #. module: project
 #: view:project.task:0
@@ -801,6 +803,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Nu puteti sterge un proiect care contine sarcini. Va sugeram sa il "
+"dezactivati."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -810,7 +814,7 @@ msgstr "Proiectul vs Ore Planificate si Totale"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "Sarcină ciornă deschisă"
+msgstr "Sarcina ciorna deschisa"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -825,7 +829,7 @@ msgstr "Ore intarziere"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Foarte important"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -846,6 +850,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Daca bifati acest camp, managerul de proiect va primi un e-mail ori de cate "
+"ori o sarcina este completata de catre echipa sa."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -863,7 +869,7 @@ msgstr "Proiect"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr "_Evaluează"
+msgstr "_Evaluati"
 
 #. module: project
 #: view:board.board:0
@@ -879,13 +885,13 @@ msgstr "Etape"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Treceti la Etapa Anterioara"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Managementul proiectelor"
+msgstr "Managementul proiectului"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -895,13 +901,13 @@ msgstr "Unitate de timp Proiect"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "In desfasurare"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Delegat Sarcină Proiect"
+msgstr "Delegat Sarcina Proiect"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -917,12 +923,12 @@ msgstr "Sarcini"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr "Părinte"
+msgstr "Parinte"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcati drept Blocat"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -936,15 +942,15 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
-"O sarcină reprezintă o activitate care trebuie efectuată. Fiecare utilizator "
-"lucrează la propria listă de sarcini, unde isi poate inregistra sarcina de "
-"lucru in ore. El poate să lucreze si să inchidă sarcina el insusi sau o "
-"poate delega altui utilizator. Dacă delegati o sarcină unui alt utilizator, "
-"primiti o altă sarcină in stare de asteptare, care va fi redeschisă atunci "
-"cand trebuie verificati munca efectuată. Dacă instalati modulul "
-"project_timesheet (foaie_de_pontaj_proiect), sarcina de lucru poate fi "
-"facturată pe baza configurării proiectului. Cu modulul project_mrp "
-"(proiect_mrp), comenzile de vanzări pot crea automat sarcini atunci cand "
+"O sarcina reprezinta o activitate care trebuie efectuata. Fiecare utilizator "
+"lucreaza la propria lista de sarcini, unde isi poate inregistra sarcina de "
+"lucru in ore. El poate sa lucreze si sa inchidă sarcina el insusi sau o "
+"poate delega altui utilizator. Dacă delegati o sarcina unui alt utilizator, "
+"primiti o alta sarcina in stare de asteptare, care va fi redeschisa atunci "
+"cand trebuie sa verificati munca efectuata. Daca instalati modulul "
+"project_timesheet (fisa_de_pontaj_proiect), sarcina de lucru poate fi "
+"facturata pe baza configurarii proiectului. Cu modulul project_mrp "
+"(proiect_mrp), comenzile de vanzari pot crea automat sarcini atunci cand "
 "sunt confirmate."
 
 #. module: project
@@ -971,15 +977,16 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
-"Dacă sarcina este creată, starea este 'Ciornă'.\n"
-" Dacă sarncina este incepută, starea devine 'In desfăsurare'.\n"
-" Dacă sarcina este verificată, sarcina este in starea 'In asteptare'.\n"
-" Dacă sarcina este incheiată, starea este 'Efectuat'."
+"Daca sarcina este creata, starea este 'Ciorna'.\n"
+" Daca sarcina este inceputa, starea devine 'In desfasurare'.\n"
+" Daca sarcina este verificata, sarcina este in starea 'In asteptare'.        "
+"                          \n"
+" Daca sarcina este incheiata, starea este 'Efectuat'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr "Reevaluează Sarcina"
+msgstr "Reevaluati Sarcina"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1001,7 +1008,7 @@ msgstr "Etapa sarcinii"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Proiectare"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1014,7 +1021,7 @@ msgstr "Ore planificate"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Verificati Etapele Sarcinii"
 
 #. module: project
 #: view:project.project:0
@@ -1024,19 +1031,19 @@ msgstr "Stare: %(stare)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista de sarcini."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pregatit(a) de avansare"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1049,7 +1056,7 @@ msgstr "Sarcini principale"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blocat(a)"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1057,11 +1064,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Daca sarcina are un progres de 99.99%, ar trebui sa o inchideti daca este "
+"finalizata sau sa reevaluati timpul"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adresa de contact"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1071,6 +1080,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Starea kanban a unei sarcini indica situatiile speciale care o afecteaza:\n"
+" * Normal este situatia predefinita\n"
+" * Blocat indica faptul ca ceva impiedica avansarea acestei sarcini\n"
+" * Pregatit(a) de avansare indica faptul ca sarcina este gata sa treaca la "
+"etapa urmatoare"
 
 #. module: project
 #: view:project.project:0
@@ -1085,7 +1099,7 @@ msgstr "Facturare"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Pentru trecerea la starea 'delegat'"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1106,13 +1120,13 @@ msgstr "Administrare"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr "project.task.reevaluate (reevaluare.sarcină.proiect)"
+msgstr "reevaluare.sarcina.proiect"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "VERIFICATI: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1128,7 +1142,7 @@ msgstr "Sarcini Proiect"
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
-"Timpul estimat pentru inchiderea acestei sarcini de către utilizatorul "
+"Timpul estimat pentru inchiderea acestei sarcini de catre utilizatorul "
 "delegat"
 
 #. module: project
@@ -1136,24 +1150,24 @@ msgstr ""
 #: view:project.task:0 selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Low"
-msgstr "Scăzut(ă)"
+msgstr "Scazut(a)"
 
 #. module: project
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Starea Kanban"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr "Performanţă"
+msgstr "Performanta"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1162,15 +1176,15 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
-"Acest raport vă permite să analizati performanta proiectelor si a "
-"utilizatorilor dumneavoastră. Puteti analiza cantitatea sarcinilor, orele "
-"petrecute comparate cu orele planificate, numărul mediu de zile pentru "
+"Acest raport va permite sa analizati performanta proiectelor si a "
+"utilizatorilor dumneavoastra. Puteti analiza cantitatea sarcinilor, orele "
+"petrecute comparate cu orele planificate, numarul mediu de zile pentru "
 "deschiderea sau inchiderea unei sarcini, etc."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Schimbati Tipul"
 
 #. module: project
 #: help:project.project,members:0
@@ -1184,17 +1198,17 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Manager de proiect"
+msgstr "Managerul de proiect"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Pentru schimbarea in starea efectuat"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "Sarcini după utilizator si proiect"
+msgstr "Sarcini dupa utilizator si proiect"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1206,7 +1220,7 @@ msgstr "August"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Obisnuit"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1217,7 +1231,7 @@ msgstr "Numele proiectului"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Istoricul Sarcinilor"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1225,14 +1239,14 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
-"Starea nouă a propriei dumneavoastră sarcini. Sarcina 'In asteptare' va fi "
-"redeschisă automat atunci cand sarcina delegată este inchisă"
+"Starea noua a propriei dumneavoastra sarcini. Sarcina 'In asteptare' va fi "
+"redeschisa automat atunci cand sarcina delegata este inchisa"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Va rugam sa specificati Clientul sau adresa de e-mail a Clientului"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1259,17 +1273,17 @@ msgstr "Tablou de bord Proiect"
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "Reactivează"
+msgstr "Reactivati"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilizator"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Activ(ă)"
+msgstr "Activ(a)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1285,7 +1299,7 @@ msgstr "Noiembrie"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Creati Primele d-voastra Proiecte"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1296,12 +1310,12 @@ msgstr "Proiectul '%s' a fost inchis."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Fluxul cumulativ al sarcinilor"
 
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr "Editare sarcină"
+msgstr "Editare sarcina"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1311,7 +1325,7 @@ msgstr "Octombrie"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validati timpul planificat si deschideti sarcina"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1319,16 +1333,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculat drept diferenta dintre orele planificate de catre managerul de "
+"proiect si orele totale ale sarcinii."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Istoric Delegatii"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr "res.users (res.utilizatori)"
+msgstr "res.utilizatori"
 
 #. module: project
 #: help:project.project,active:0
@@ -1336,8 +1352,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
-"Dacă campul activ este setat pe Fals, vă va permite să ascundeti proiectul "
-"fără să il stergeti."
+"Daca campul activ este setat pe Fals, va va permite sa ascundeti proiectul "
+"fara sa il stergeti."
 
 #. module: project
 #: view:project.task:0
@@ -1352,12 +1368,12 @@ msgstr "Companii"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Proeicte la care sunt membru."
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr "Caută Proiect"
+msgstr "Cautati Proiectul"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1383,10 +1399,10 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"Acesta va seta unitatea de măsură folosită in proiecte si sarcini.\n"
-"Dacă folositi foaia de pontaj asociată proiectelor (modulul foaie de "
-"pontaj_proiect), nu uitati să setati unitatea de măsură corectă la angajatii "
-"dumneavoastră."
+"Acesta va seta unitatea de masura folosita in proiecte si sarcini.\n"
+"Daca folositi fisa de pontaj asociata proiectelor (modulul fisa de "
+"pontaj_proiect), nu uitati sa setati unitatea de masura corecta la angajatii "
+"dumneavoastra."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1403,12 +1419,12 @@ msgstr "Proiectele utilizatorului"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Delegat"
+msgstr "_Delegati"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr "Numărul de zile pentru Deschiderea sarcinii"
+msgstr "Numarul de zile pentru Deschiderea sarcinii"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1431,24 +1447,24 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
-"Timpul estimat pentru efectuarea sarcinii, de obicei setat de către "
-"managerul de proiect atunci cand sarcina se află in starea de ciornă."
+"Timpul estimat pentru efectuarea sarcinii, de obicei setat de catre "
+"managerul de proiect atunci cand sarcina se afla in starea de ciorna."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr "Titlu pentru validarea sarcinii dumneavoastră"
+msgstr "Titlu pentru validarea sarcinii dumneavoastra"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Va rugam mai intai sa stergeti proiectul asociat acestui cont."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1470,13 +1486,13 @@ msgstr "Stare"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Ar trebui specificat Utilizatorul Delegat"
 
 #. module: project
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr "Sarcina '%s' setată in curs de desfăsurare"
+msgstr "Sarcina '%s' setata in curs de desfasurare"
 
 #. module: project
 #: view:project.project:0
@@ -1490,9 +1506,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"Asociază acest proiect unui cont analitic dacă aveti nevoie de gestionarea "
-"financiară a proiectelor. Vă permite să conectati proiecte cu bugete, "
-"planificare, analiza costurilor si a veniturilor, foi de pontaj ale "
+"Asociati acest proiect unui cont analitic daca aveti nevoie de gestionarea "
+"financiara a proiectelor. Va permite sa conectati proiecte cu bugete, "
+"planificare, analiza costurilor si a veniturilor, fise de pontaj ale "
 "proiectelor, etc."
 
 #. module: project
@@ -1515,28 +1531,28 @@ msgstr "An"
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
 #: view:project.project:0 view:project.task:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr "Închide"
+msgstr "Inchideti"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr "Deschide sarcina"
+msgstr "Deschideti sarcina"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr "Deschide"
+msgstr "Deschideti"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr "ID: %(id_sarcină)s"
+msgstr "ID: %(id_sarcina)s"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1545,12 +1561,12 @@ msgstr "ID: %(id_sarcină)s"
 #: selection:project.task.history.cumulative,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "In Progress"
-msgstr "În desfăsurare"
+msgstr "In curs de desfasurare"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analiza sarcinii"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1559,17 +1575,19 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Sarcina secundara e inca deschisa.\n"
+"Va rugam sa anulati sau sa finalizati sarcina secundara mai intai."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etape comune tuturor proiectelor"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie să fie mai mare decat data de "
+"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
 "inceput"
 
 #. module: project
@@ -1581,12 +1599,12 @@ msgstr "Responsabil"
 #. module: project
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Program de lucru"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Proiecte la care sunt manager"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1602,7 +1620,7 @@ msgstr " Proiect vs ore"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr "Sarcină delegată"
+msgstr "Sarcina delegata"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1617,22 +1635,22 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very Low"
-msgstr "Foarte scăzut(ă)"
+msgstr "Foarte scazut(a)"
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Programul orelor lucrate pentru a regla raportul diagramei Gantt"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "Avertizează Managerul"
+msgstr "Avertizati Managerul"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr "Termen limită depăsit"
+msgstr "Termen limita depasit"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1642,7 +1660,7 @@ msgstr "Termenele limita pentru sarcinile mele"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr "Re-evaluează Sarcina"
+msgstr "Re-evaluati Sarcina"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1652,7 +1670,7 @@ msgstr "Dezvoltare"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr "Orele mele rămase după Proiect"
+msgstr "Orele mele ramase dupa Proiect"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1673,7 +1691,7 @@ msgstr "Mai"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr "Validare Sarcină"
+msgstr "Validare Sarcina"
 
 #. module: project
 #: field:task.by.days,total_task:0
@@ -1686,6 +1704,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Daca bifati acest camp, aceasta etapa va fi propusa implicit la fiecare "
+"proiect nou. Aceasta etapa nu va fi atribuita proiectelor existente."
 
 #. module: project
 #: view:board.board:0
@@ -1697,7 +1717,7 @@ msgstr "Sarcinile mele delegate"
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "Sarcină: %(nume)s"
+msgstr "Sarcina: %(nume)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1708,7 +1728,7 @@ msgstr "Atribuiti lui"
 #: field:project.project,progress_rate:0 view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr "Progres"
+msgstr "In desfasurare"
 
 #. module: project
 #: field:project.project,effective_hours:0 field:project.task.work,hours:0
@@ -1723,7 +1743,7 @@ msgstr "Conturile mele de facturat"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Desfasurare"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1734,7 +1754,7 @@ msgstr "Sarcini proiect"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr "Sarcina '%s' este efectuată."
+msgstr "Sarcina '%s' este efectuata."
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1748,12 +1768,12 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Comun(a) tuturor Proiectelor"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr "Atunci cand sarcina este incheiată, starea va fi 'efectuat'."
+msgstr "Atunci cand sarcina este finalizata, starea va fi 'efectuat'."
 
 #. module: project
 #: view:project.project:0
@@ -1765,7 +1785,7 @@ msgstr "Client"
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1776,42 +1796,42 @@ msgstr "Februarie"
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr "Sarcina după Zile"
+msgstr "Sarcina dupa Zile"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie sa fie unic !"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr "Editează"
+msgstr "Editati"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr "Inregistrează orele dumneavoastră de lucru."
+msgstr "Inregistrati-va orele de lucru."
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "Rezumat muncă"
+msgstr "Rezumat munca"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Luna-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr "Număr de zile pentru inchiderea sarcinii"
+msgstr "Numarul  de zile pana la inchiderea sarcinii"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Luna-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1831,12 +1851,12 @@ msgstr "Diverse"
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr "Deschide Sarcina Efectuată"
+msgstr "Deschideti Sarcina Efectuata"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comun"
 
 #. module: project
 #: view:project.task:0
@@ -1849,17 +1869,19 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapele pot fi comune tuturor proiectelor sau specifice unui proiect. "
+"Fiecare sarcina va urma diferitele etape pentru a putea fi inchise."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr "Prezintă ordinea secventei atunci cand afisează o listă cu Proiecte."
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista cu Proiecte."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr "Sarcina '%s' inchisă"
+msgstr "Sarcina '%s' inchisa"
 
 #. module: project
 #: field:project.task,id:0
@@ -1870,12 +1892,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Grafic descendent"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Sarcini Alocate"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1885,24 +1907,24 @@ msgstr "Sarcini omise"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Anul curent"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
 #: field:project.task,sequence:0 field:project.task.type,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr "Orele rămase per Proiect"
+msgstr "Orele ramase per Proiect"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1910,8 +1932,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Subsol adăugat la inceputul e-mail-ului cu mesajul de avertizare trimis "
-"clientului atunci cand o sarcină este inchisă."
+"Subsol adaugat la inceputul e-mail-ului cu mesajul de avertizare trimis "
+"clientului atunci cand o sarcina este inchisa."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1926,30 +1948,30 @@ msgid ""
 "be invoiced in the billing section."
 msgstr ""
 "Un proiect contine un set de sarcini sau probleme care vor fi efectuate de "
-"către resursele atribuite. Un proiect poate fi structurat ierarhic, ca fiind "
-"subordonat unui Proiect Principal (Părinte). Astfel dumneavoastră puteti "
-"proiecta structuri mari de proiect cu diferite etape răspandite pe ciclul "
+"catre resursele atribuite. Un proiect poate fi structurat ierarhic, ca fiind "
+"subordonat unui Proiect Principal (Parinte). Astfel dumneavoastra puteti "
+"proiecta structuri mari de proiect cu diferite etape raspandite pe ciclul "
 "duratei proiectului. Fiecare utilizator isi poate seta proiectul implicit in "
 "propriile preferinte pentru a filtra automat sarcinile sau problemele la "
-"care lucrează de obicei. Dacă alegeti să facturati timpul petrecut cu o "
-"sarcină a proiectului, puteti găsi facturarea sarcinilor proiectului in "
+"care lucreaza de obicei. Daca alegeti sa facturati timpul petrecut cu o "
+"sarcina a proiectului, puteti gasi facturarea sarcinilor proiectului in "
 "sectiunea facturare."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr "Sarcină de lucru"
+msgstr "Sarcina de lucru"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr "Starea Validării"
+msgstr "Starea Validarii"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr "Sarcina '%s' a fost anulată."
+msgstr "Sarcina '%s' a fost anulata."
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1957,8 +1979,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
-"Timpul estimat pentru validarea de către dumneavoastră a muncii efectuate de "
-"către utilizatorul căruia i-ati delegat această sarcină."
+"Timpul estimat pentru validarea de catre dumneavoastra a muncii efectuate de "
+"catre utilizatorul caruia i-ati delegat aceasta sarcina."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1968,18 +1990,18 @@ msgstr "Manager"
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr "Creează data"
+msgstr "Creati Data"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr "Sarcina '%s' este anulată."
+msgstr "Sarcina '%s' este anulata."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Pentru schimbarea in starea 'deschis'"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1992,7 +2014,7 @@ msgstr "Partener"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr "Trimite e-mail după inchiderea sarcinii"
+msgstr "Trimite e-mail dupa inchiderea sarcinii"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
@@ -2003,7 +2025,7 @@ msgstr "Etapele Sarcinilor"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr "Deleagă sarcina dumneavoastră unui alt utilizator"
+msgstr "Delegati-va sarcina altor utilizatori"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
@@ -2013,7 +2035,7 @@ msgstr "Subsol e-mail"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Sarcini in desfasurare"
 
 #~ msgid "Assigned tasks"
 #~ msgstr "Sarcini atribuite"
@@ -2261,3 +2283,6 @@ msgstr ""
 
 #~ msgid "Budgets"
 #~ msgstr "Bugete"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 6303a4ee635..e67cfb00200 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/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: 2012-06-09 05:38+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -331,6 +331,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Это поле вычислено автоматически и имеет примерно тоже значение, что и "
+"булевое поле \"Активный\": если задача имеет ссылку на шаблон или не "
+"активированный проект, оно будет скрыто, если не вызвано специально"
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -340,7 +343,7 @@ msgstr "Описание задания"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Не шаблон задания"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -474,7 +477,7 @@ msgstr "Отмена"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr "Готов"
+msgstr "Готово"
 
 #. module: project
 #: view:project.task:0
@@ -596,7 +599,7 @@ msgstr "Задание проекта"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr "Создать"
+msgstr "Новые"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -607,7 +610,7 @@ msgstr "Вычисляется по формуле: Затраченное вр
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Совокупный поток"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -634,7 +637,7 @@ msgstr "%s (копия)"
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Задержка завершения"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -657,8 +660,8 @@ msgstr "Оставшееся время"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Мастер создания электронной почты"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -737,7 +740,7 @@ msgstr "Июль"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Ниспадающая диаграмма задач"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -768,6 +771,9 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Определите шаги, которые будут использованы в проекте от создания до "
+"закрытия задачи или проблемы. Вы будете использовать эти шаги для "
+"отслеживания прогресса в разрешении задач."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -783,7 +789,7 @@ msgstr "Даты"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Новый заголовок порученной задачи"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -792,11 +798,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Вы не можете удалить проект, содержащий задачи. Лучше  его остановить."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Проект по запланированным и всем часам"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -806,7 +813,7 @@ msgstr "Открыть черновик задания"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -823,7 +830,7 @@ msgstr "Очень важно"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Анализ задач"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -856,7 +863,7 @@ msgstr "Проект"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Оценить"
 
 #. module: project
 #: view:board.board:0
@@ -872,7 +879,7 @@ msgstr "Стадии"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Вернуться на предыдущий шаг"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -894,7 +901,7 @@ msgstr "Выполняется"
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Назначить задание"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -910,7 +917,7 @@ msgstr "Задания"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Материнский"
 
 #. module: project
 #: view:project.task:0
@@ -943,17 +950,17 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "Выполнение (%)"
+msgstr "Выполнено (%)"
 
 #. module: project
 #: help:project.task,state:0
@@ -964,6 +971,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Созданная задача имеет статус \"Черновик\".\n"
+" Если задача начата, присваивается статус \"В работе\".\n"
+" Если необходим контроль, присваивается статус \"В ожидании\".\n"
+" Если задание завершено, устанавливается статус \"Выполнено\"."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -990,7 +1001,7 @@ msgstr "Стадия Задачи"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Проектирование"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1013,24 +1024,24 @@ msgstr "Статус: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Позволяет отображать задания в списке задач последовательно."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Начальная дата"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Готово к переходу"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Родительские задания"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1038,7 +1049,7 @@ msgstr ""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Блокировано"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1062,6 +1073,10 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Канбан имеент собственные статусы задач, обозначающие специальные ситуации:\n"
+" * \"В норме\" - ситуация по умолчанию.\n"
+" * \"Блокировано\" - что-то препятствует выполнению данной задачи.\n"
+" * \"Готово к переходу\" - задание готово к переходу на следующую стадию."
 
 #. module: project
 #: view:project.project:0
@@ -1071,12 +1086,12 @@ msgstr "Польователь: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Счета"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Для смены до назначенного статуса"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1108,7 +1123,7 @@ msgstr "ПРОВЕРЬ: %s"
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr "Участник"
+msgstr "Мои"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1139,12 +1154,12 @@ msgstr "Низкий"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Канбан статус"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Быстродействие"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1153,6 +1168,10 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Этот отчет позволяет вам анализировать производительность ваших проектов и "
+"пользователей. Вы можете анализировать количество задач, затраченное время "
+"по сравнению с планируемым, среднее число дней для того чтобы открыть или "
+"закрыть задачу."
 
 #. module: project
 #: view:project.task:0
@@ -1186,14 +1205,14 @@ msgstr "Задачи по пользователю и проекту"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "В норме"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1212,6 +1231,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Новый статус вашего задания. Задание будет открыто автоматически, когда "
+"назначенное задание будет выполнено."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1222,7 +1243,7 @@ msgstr "Пожалуйста укажите Заказчика или email ад
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1239,7 +1260,7 @@ msgstr "Дней до закрытия"
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Панель Проекта"
+msgstr "Мои проекты"
 
 #. module: project
 #: view:project.task:0
@@ -1249,7 +1270,7 @@ msgstr "Возобновить"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: project
 #: field:project.project,active:0
@@ -1265,7 +1286,7 @@ msgstr "Дней до открытия"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1281,7 +1302,7 @@ msgstr "Проект %s только что был закрыт."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Совокупный поток"
 
 #. module: project
 #: view:project.task:0
@@ -1291,7 +1312,7 @@ msgstr "Редакция задания"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: project
 #: view:project.task:0
@@ -1304,6 +1325,8 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Вычисляется как разность между запланированными менеджером проекта часами и "
+"общими часами заданий."
 
 #. module: project
 #: view:project.task:0
@@ -1327,12 +1350,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Исполнитель"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Организации"
 
 #. module: project
 #: view:project.project:0
@@ -1359,7 +1382,7 @@ msgstr "Дата"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Инфо-панель"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1387,7 +1410,7 @@ msgstr "Проекты пользователя"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Назначить"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1402,12 +1425,12 @@ msgstr "Поручено"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Журнал"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
 msgid "Assigned to"
-msgstr "Назначено на"
+msgstr "Исполнитель"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -1422,7 +1445,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Заголовок вашего проверочного задания"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1493,7 +1516,7 @@ msgstr "Выполнено"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1505,7 +1528,7 @@ msgstr "Отменить"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1516,7 +1539,7 @@ msgstr "Открыть задание"
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr "Открыть"
+msgstr "Открытые"
 
 #. module: project
 #: view:project.project:0
@@ -1535,7 +1558,7 @@ msgstr "В работе"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Анализ заданий"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1544,6 +1567,8 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Подопечное задание по прежнему открыто.\n"
+"Сначала завершите или отмените его."
 
 #. module: project
 #: view:project.task.type:0
@@ -1576,12 +1601,12 @@ msgstr "Проекты, в которых я менеджер"
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Задание '%s' в ожидании."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Проект по часам"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1616,27 +1641,27 @@ msgstr "Предупредить руководителя"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Сроки моих заданий"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Пересмотреть задачу"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Разработка"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr "Мои оставшиеся часы по проекту"
+msgstr "Оставшиеся часы по проектам"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1652,7 +1677,7 @@ msgstr "Срочно"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1710,7 +1735,7 @@ msgstr "Мои счета для выставления"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Развертывание"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1728,12 +1753,12 @@ msgstr "Задание '%s' выполнено"
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Сумма часов всех заданий и дочерних проектов данного проекта."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Общее для всех проектов"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1743,35 +1768,35 @@ msgstr "После завершения задания установить дл
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Заказчик"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Задания по дням"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1786,22 +1811,22 @@ msgstr "Обзор работы"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Месяц-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Количество дней для завершения задания"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1811,7 +1836,7 @@ msgstr "Затраченное время"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Разное"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1821,12 +1846,12 @@ msgstr "Открыть выполненные задания"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Общие"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Затраченные часы"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1834,48 +1859,51 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Шаги могут быть общими для всех проектов или специфичными для определенного "
+"проекта. Каждое задание пройдет различные стадии для того что бы быть "
+"завершенным."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Позволяет отображать упорядоченный список проектов."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Задание '%s' закрыто"
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Ниспадающая диаграмма"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Назначенные задания"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Просроченные задания"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Текущий год"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1887,7 +1915,7 @@ msgstr "Последовательность"
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Оставшееся время на каждый проект"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1910,6 +1938,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Проект содержит список задач и проблем, которые будут выполнены вашими "
+"сотрудниками, назначенными на них. Проект может быть иерархически "
+"структурирован как дочерний проект от основного (материнского) проекта. Это "
+"позволяет вам создавать большие структуры проекта с различными фазами "
+"распространяющимися на всю длительность проекта. Каждый пользователь может "
+"установить себе основной проект в параметрах, для автоматической фильтрации "
+"задач и проблем, над которыми он работает в данный момент. Если вы выберете "
+"оплату времени, ушедшего на проект, вы сможете найти задачи, которые "
+"необходимо оплатить в секции счетов."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1933,27 +1970,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Время, оставшееся вам для проверки законченной работы пользователем, "
+"которому вы назначали задание."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Руководитель"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Задание '%s' отменено"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Для открытия статуса"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1966,13 +2005,13 @@ msgstr "Партнер"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Отправить e-mail после закрытия задания"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Шаги задания"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1987,7 +2026,7 @@ msgstr "Нижняя часть письма"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Задания в работе"
 
 #~ msgid "Assigned tasks"
 #~ msgstr "Назначенные задания"
@@ -2347,3 +2386,6 @@ msgstr ""
 
 #~ msgid "project.installer"
 #~ msgstr "project.installer"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 08dd4258037..ac59dd0875b 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index 7263162a556..e25f1b73ca6 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr "Preostale ure"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 456e9efaf45..6f5933bd00a 100644
--- a/addons/project/i18n/sq.po
+++ b/addons/project/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: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 3ed7728c4ff..dc540ba196c 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,39 +13,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nya aktiviteter"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Återinföra beskrivningen av aktiviteten i arbetet för användaren"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Aktiviteten '%s' har delegerats till %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Detta bolag är inte tillåtet för den här användaren"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Föregående månad"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -55,18 +55,18 @@ msgstr "Varna företag"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Ange kvarvarande timmar som krävs för att avsluta aktiviteten"
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Tidsfrister"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operation Not Permitted !"
+msgstr "Funktionen ej tillåten !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -80,7 +80,7 @@ msgstr "CHECK: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Användarens e-post"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,12 +92,12 @@ msgstr "Avslutat arbete"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Aktivitetsdelegering"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -107,7 +107,7 @@ msgstr "Timmar som ska valideras"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Vilande projekt"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,22 +121,22 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Återstarta projekt"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Ger ordningsföljden vid listning av projekt"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Omvärdering av aktiviteten"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,12 +146,12 @@ msgstr "Projektmedlemmar"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Aktiviteter per delegerare"
+msgstr "Aktiviteter per deltagare"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: project
 #: view:project.task:0
@@ -170,7 +170,7 @@ msgid ""
 "the customer when a task is closed."
 msgstr ""
 "Huvud som läggs till i början av det epost-meddelande som skickas till "
-"kunden när en aktivtet är avslutad."
+"uppdragsgivaren när en aktivtet är avslutad."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -180,18 +180,18 @@ msgstr "Mina aktiviteter"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bolag"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Vilande aktiviteter"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -201,7 +201,7 @@ msgstr "Din aktivitets titel"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etappnamn"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -211,7 +211,7 @@ msgstr "Sätt till vilande"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Viktigt"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -221,17 +221,17 @@ msgstr "Definiera behov och planerade timmar"
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Byt etapp"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Nytt projekt baserat på en mall"
+msgstr "Nytt projekt från mall"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fel! Du kan inte eskalera till samma projekt"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -242,23 +242,23 @@ msgstr "Mycket bråttom"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "En användare vill delegera detta ärende till"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projekt och etapper"
 
 #. module: project
 #: view:project.project:0
@@ -281,7 +281,7 @@ msgstr "Aktivitet"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Medlemmar"
 
 #. module: project
 #: view:board.board:0
@@ -294,17 +294,17 @@ msgstr "Mina öppna aktiviteter"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Ange projektledare eller projektledarens e-postadress."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "För att avbryta aktiviteten"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projektaktivitetsarbete"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -314,13 +314,13 @@ msgstr "Anteckningar"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Planerad tid jämfört med återstående"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gen.plan.-eff."
 
 #. module: project
 #: help:project.task,active:0
@@ -329,16 +329,19 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Detta fält beräknas automatiskt och har samma beteende som \"aktiva\" "
+"fältet: om aktiviteten är kopplad till en mall eller inaktiverat projektet "
+"kommer det att döljas om den inte uttryckligen erterfrågas."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Aktivitetssammanfattning"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Inte en aktivitetsmall"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -360,7 +363,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Visa endast aktiviteter med tidsfrist"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -373,17 +376,17 @@ msgstr "Avbruten"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr "Epost huvud"
+msgstr "Epost-huvud"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Byt till nästa etapp"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -393,7 +396,7 @@ msgstr "Avslutade aktiviteter"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Färgindex"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -403,7 +406,7 @@ msgstr "Konfiguration"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Innevarande månad"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -413,7 +416,7 @@ msgstr "Delegerar aktiviteter till den andra användaren"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -427,18 +430,18 @@ msgid ""
 "propose a message to send by email to the customer."
 msgstr ""
 "Om du kryssar i denna kommer användaren att för möjlighet att skicka ett "
-"epostmeddelande till kunden när en aktivitet avslutas."
+"epostmeddelande till uppdragsgivaren när en aktivitet avslutas."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Test"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr "Task '%s' closed"
+msgstr "Aktivitet '%s' stängd"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -460,63 +463,63 @@ msgstr "Planering"
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Slutdatum"
+msgstr "Tidsfrist"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Klara"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Byt färg"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva objekt."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopia)"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Ny aktivitet"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# aktiviteter"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Bakåt"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Tilldelad"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Avslutsdatum: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Du kan inte ha två användare med samma användarid !"
 
 #. module: project
 #: view:project.project:0
@@ -536,12 +539,12 @@ msgstr "Mina projekt"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Nästa"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -551,23 +554,23 @@ msgstr "Från status preliminär, det kommer att få status öppen"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dagar"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Öppna projekt"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Du måste tilldela medarbetare till projektet '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -591,7 +594,7 @@ msgstr "Projektaktivitet"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -602,34 +605,34 @@ msgstr "Beräknas som: Nedlagd tid + Återstående tid."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Kummulativt flöde"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Faktisk tid"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Utvärdera aktivitetsrubrik"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Omvärdera"
 
 #. module: project
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Övertrasserad försening"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -640,7 +643,7 @@ msgstr "Medel"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Vilande aktiviteter"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -652,19 +655,19 @@ msgstr "Återstående timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Registeringsdatum"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Återstående tid"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -686,7 +689,7 @@ msgstr "Ej tilldelade aktiviteter"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Icke tilldelade aktiviteter"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -694,6 +697,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Summan av planerad tid för alla aktiviteter relaterade till detta projekt "
+"och underliggande."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -704,7 +709,7 @@ msgstr ""
 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Pending"
-msgstr "Väntande"
+msgstr "Vilande"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -725,12 +730,12 @@ msgstr "Tilläggsinformation"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Burndowndiagram över aktiviteter"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -744,7 +749,7 @@ msgstr "Startdatum"
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr "Projects"
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -752,7 +757,7 @@ msgstr "Projects"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapp"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -761,12 +766,16 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Definiera de etapper som kommer att användas i projektet från skapandet av "
+"aktiviteten fram till avslutandet av aktiviteten, uppgiften eller ärendet. "
+"Du kommer att använda dessa etapper för att följa utvecklingen för att "
+"utföra en aktivitet eller ett ärende."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Aktivieteten '%s' är startad."
 
 #. module: project
 #: view:project.task:0
@@ -776,7 +785,7 @@ msgstr "Datum"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Ny rubrik på aktiviteten delegerad till användaren"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -785,11 +794,13 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Du kan inte radera projekt med aktiviteter. Försök i stället att deaktivera "
+"det."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projekt vs planerade och totalt antal timmar"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -799,7 +810,7 @@ msgstr "Utkast öppna ärenden"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "januari"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -809,14 +820,14 @@ msgstr "Fördröjda timmar"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Mycket viktigt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Aktivietetsanalys"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -830,6 +841,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Om du kryssar denna ruta, kommer projektledaren att få e-post vid varje "
+"tillfälle en aktivitet slutförs av detta projektlag."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -847,7 +860,7 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Utvärdera"
 
 #. module: project
 #: view:board.board:0
@@ -858,18 +871,18 @@ msgstr "Min dashboard"
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Backa en etapp"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Projekt"
+msgstr "Projekthantering"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -879,13 +892,13 @@ msgstr "Projektets tidsenhet"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Pågående"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projektaktivitetsdelegering"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -901,12 +914,12 @@ msgstr "Aktiviteter"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Överliggande"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Märk som blockerad"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -920,16 +933,25 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"En aktivitet är ett arbete eller uppgift som måste genomföras. Varje "
+"användare arbetar i sin egen lista över aktiviteter där användaren själv kan "
+"rapportera nedlagd tid och framsteg. Han kan arbeta och stänga uppgiften "
+"själv eller delegera den till en annan användare. När en aktivitet "
+"delegeras, försätts aktiviteten i vänteläge och öppnas igen när resultatet "
+"av delegeringen är granskat och målet med aktiviteten uppnått.  Om du "
+"installerar project_timesheet-modulen kan nedlagt arbete faktureras på "
+"grundval av projektet. Med project_mrp-modulen kan säljorder skapa uppgifter "
+"automatiskt när de bekräftas."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "september"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: project
 #: field:project.task,progress:0
@@ -945,17 +967,21 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Om aktiviteten är skapad, är status 'Preleminär'.\n"
+" Då aktiviteten startas, övergår status till 'Pågående'.\n"
+" Om granskning är påkallad är status 'Vilande'.\n"
+" Då aktiviteten är slutförd, är status 'Klar'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Omvärdera aktivitet"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -966,12 +992,12 @@ msgstr "Projektets aktiviteter"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Aktivitetsetapper"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Design"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -984,7 +1010,7 @@ msgstr "Planerade timmar"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Granska aktivitetsetapperna"
 
 #. module: project
 #: view:project.project:0
@@ -994,24 +1020,24 @@ msgstr "Status: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Ger sorteringsordning vid listning av aktiviteter."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Klart för fortsättning"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Överliggande aktiviteter"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1019,7 +1045,7 @@ msgstr ""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Hindrade"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1027,11 +1053,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Aktiviteter med förloppet 99.99 % kan stängas om den är klar eller omvärdera "
+"tiden"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontaktadress"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1041,6 +1069,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"En aktivitets kanbanstatus anger speciella situationer som påverkar "
+"aktiviteten:\n"
+"  * Normal är standardsituationen\n"
+"  * Blockerad indikerar något hindrar utförandet av denna aktivitet\n"
+"  * Klar att avsluta indikerar aktiviteten är redo för nästa etapp"
 
 #. module: project
 #: view:project.project:0
@@ -1050,23 +1083,23 @@ msgstr "Användare: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "För att byta till delegerat läge"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Mallprojekt"
 
 #. module: project
 #: view:project.project:0
@@ -1076,18 +1109,18 @@ msgstr "Administration"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "KONTROLL: %s"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Medlem"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1098,6 +1131,7 @@ msgstr "Projektaktiviteter"
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Uppskatta tid som krävs för att stänga ärendet av den delegerade användaren"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1116,12 +1150,12 @@ msgstr "Låg"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanbanstatus"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Prestanda"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1130,11 +1164,15 @@ msgid ""
 "users. You can analyse the quantities of tasks, the hours spent compared to "
 "the planned hours, the average number of days to open or close a task, etc."
 msgstr ""
+"Med denna rapport kan du analysera effektiviteten för dina projekt och dina "
+"projektdeltagare. Du kan analysera stora mängder av aktiviteter, nedlagd tid "
+"jämfört med de planerade timmar, det genomsnittliga antalet dagar för att "
+"öppna eller stänga en aktivitet etc."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Byt typ"
 
 #. module: project
 #: help:project.project,members:0
@@ -1142,6 +1180,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Projektmedlemmar är användare som får tillgång till relaterade aktiviteter "
+"till detta projekt."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1151,24 +1191,24 @@ msgstr "Projektledare"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "För att ändra till klarstatus"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Aktiviteter per användare och projekt"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1179,7 +1219,7 @@ msgstr "Projektnamn"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Aktivitetshistorik"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1187,17 +1227,19 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Ny status för din egen aktivietet. Vilande aktiviteter aktiveras automatiskt "
+"när den delegerade aktiviteten stängs."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Vänligen ange uppdragsgivare eller uppdragsgivarens e-postadress."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "juni"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1208,13 +1250,13 @@ msgstr "Total tid"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagar i behandling"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Projekt dashboard"
+msgstr "Projektinfopanel"
 
 #. module: project
 #: view:project.task:0
@@ -1224,39 +1266,39 @@ msgstr "Återaktivera"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Active"
+msgstr "Aktiv"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagar för att öppna"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Skapa ditt första projekt"
 
 #. module: project
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projektet '%s' har stängts."
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Aktiviteters kummulativa flöde"
 
 #. module: project
 #: view:project.task:0
@@ -1266,12 +1308,12 @@ msgstr "Aktivitetsutgåva"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Granska planerad tid och öppna aktiviteter"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1279,16 +1321,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Beräknas som skillnaden mellan projektledarens planerade timmar och "
+"aktivitetens totala antal timmar."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Delegeringshistorik"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1296,32 +1340,33 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Om det aktiva fältet är Falskt, kan du gömma projektet utan att radera det."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bolag"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projekt där jag medverkar"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Sök projekt"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Projektet '%s' har öppnats."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1332,7 +1377,7 @@ msgstr "Datum"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Infopanel"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1341,16 +1386,16 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects (project_timesheet module), "
-"don't forget to setup the right unit of measure in your employees."
+"Detta ställer in den måttenhet som används i projekt och aktiviteter.\n"
+"Om du använder tidrapporten kopplad till projekt (project_timesheet "
+"modulen), glöm inte att ställa in rätt måttenhet för dina medarbetare."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Error"
-msgstr "Error"
+msgstr "Fel"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -1360,12 +1405,12 @@ msgstr "Användarens projekt"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegera"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Antal dagar innan aktiviteten startas"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1375,7 +1420,7 @@ msgstr "Delegerad till"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historik"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
@@ -1394,18 +1439,18 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Rubrik för din aktivitetsgranskning"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Vänligen radera projektet som är länkat till detta konto först."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1427,13 +1472,13 @@ msgstr "Status"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Användaren som ärendet delegeras till måste anges"
 
 #. module: project
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr "Task '%s' set in progress"
+msgstr "Aktivitet '%s' satt i status framsteg"
 
 #. module: project
 #: view:project.project:0
@@ -1464,7 +1509,7 @@ msgstr "Klar"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1476,7 +1521,7 @@ msgstr "Avbryt"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1506,7 +1551,7 @@ msgstr "Pågår"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Aktivitetsanalys"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1515,22 +1560,24 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Fortfarande öppna underliggande aktiviteter\n"
+"Vänligen avbryt eller avsluta underliggande aktiviteter först."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapper gemensamma med alla projekt"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1540,18 +1587,18 @@ msgstr "Arbetstid"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projekt där jag är ansvarig"
 
 #. module: project
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Aktiviteten '%s' är vilande"
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projekt vs timmar"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1564,6 +1611,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Totalt antal timmar förbrukade på alla aktiviteter relaterade till detta "
+"projekt och underliggande."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1584,27 +1633,27 @@ msgstr "Varna projektledaren"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Passerad tidsfrist"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr "Mina aktiviteters deadlines"
+msgstr "Tidsfrist för mina aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Ovärdera aktivitet"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Utveckling"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Min återstående tid per projekt"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1620,7 +1669,7 @@ msgstr "Viktigt"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1630,7 +1679,7 @@ msgstr "Granska ärende"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Totalt för alla aktiviteter"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1638,18 +1687,20 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Om du markerar detta fält kommer denna etapp att föreslås som standard på "
+"varje nytt projekt. Befintliga projekt påverkas inte av detta."
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Mina delegerade aktiviteter"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "Uppgift: %(name)s"
+msgstr "Aktivitet: %(name)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1675,7 +1726,7 @@ msgstr "Mina konton som skall fakturerar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Driftsättning"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1686,7 +1737,7 @@ msgstr "Projektaktiviteter"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Aktiviteten '%s' är klar"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1694,11 +1745,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Summan av alla timmar för aktiviteter relaterat till detta projekt och "
+"underliggande."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Gemensamt med alla projekt"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1708,35 +1761,35 @@ msgstr "När aktiviteten är avslutad sätts status till klar."
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Uppdragsgivare"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Aktiviteter per dag"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Bolagsnamnet måste vara unikt !"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Ändra"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1751,22 +1804,22 @@ msgstr "Sammanställning av arbete"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Månad-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Dagar för att genomföra aktiviteten"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Månad-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1776,7 +1829,7 @@ msgstr "Nedlagda timmar"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1786,12 +1839,12 @@ msgstr "Öppna avslutade aktiviteter"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Vanlig"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Förbrukade timmar"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1799,48 +1852,51 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapperna kan vara gemensamma med alla projekt eller knytas till ett visst "
+"projekt. Varje enskild aktivitet kommer följa de olika etapperna för att "
+"kunna fullföljas."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Ger ordningsföljden vid listning av projekt."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Aktivitet '%s' är avslutad"
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndowndiagram"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tilldelade aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Övertrasserade aktiviteter"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1852,7 +1908,7 @@ msgstr "Sekvens"
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Återstående tid per projekt"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1860,8 +1916,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"For tillagd i slutet av det epostmeddelande som skickas till kunden när en "
-"aktivitet är avslutad."
+"Fot tillagd i slutet av det epostmeddelande som skickas till uppdragsgivaren "
+"när en aktivitet är avslutad."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1875,6 +1931,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Ett projekt innehåller en uppsättning aktiviteter eller ärenden som kommer "
+"att utföras av dina tilldelade resurser. Ett projekt kan vara hierarkiskt "
+"uppbyggt med över-/underliggande-relationer mellan projekten. Detta gör att "
+"du kan beskriva stora och komplexa projektstrukturer med olika faser "
+"fördelade över projektets löptid. Varje användare kan ställa in sitt "
+"standardprojekt i sina egna inställningar för att automatiskt filtrera "
+"uppgifter eller frågor som just han brukar fungera på. Om du väljer att "
+"fakturera nedlagd tid, kan du hitta projektuppgifter som ska faktureras i "
+"faktureringsfliken."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1890,7 +1955,7 @@ msgstr "Granskningsstatus"
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr "Task '%s' cancelled"
+msgstr "Aktivitet '%s' avbruten"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1898,27 +1963,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Estimerad tid för dig att utvärdera genomfört arbete av användaren som fick "
+"sig aktiviteten delegerad"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Registreringsdatum"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Aktiviteten '%s' är avbruten."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "För att byta till öppen status"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1931,13 +1998,13 @@ msgstr "Företag"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Skicka e-post vid avslutade aktiviteter"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Aktivitetsetapper"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1947,12 +2014,12 @@ msgstr "Delegera din aktivitet till den andra användaren"
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr "Epost fot"
+msgstr "Epost-fot"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #~ msgid "Subproject"
 #~ msgstr "Underprojekt"
@@ -2282,12 +2349,16 @@ msgstr ""
 #~ msgid "Planned"
 #~ msgstr "Planned"
 
-#, python-format
-#~ msgid "Couldn't send mail because your email address is not configured!"
-#~ msgstr "Couldn't send mail because your email address is not configured!"
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-post editor"
 
 #, python-format
 #~ msgid ""
 #~ "You can not delete a project with tasks. I suggest you to deactivate it."
 #~ msgstr ""
-#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ "Projekt med aktiviteter går inte att raderas, avaktivera det i stället."
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Kunde inte skicka e-post eftersom e-postadress inte är konfigurerad !"
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index c7be3d49b24..3da06fa3dc8 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index b7bb1be2b67..c93a666c720 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Kalan Saatler"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index a0e22426770..67d7ec1e338 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index e2715c85615..f76abbfc84d 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "Số giờ còn lại"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index e7cbbecc253..bcbbd62c34e 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/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: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -50,7 +50,7 @@ msgstr "我的任务"
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "警告业务伙伴"
+msgstr "通知业务伙伴"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -645,8 +645,8 @@ msgstr "剩余的小时数"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2441,3 +2441,6 @@ msgstr "进行中的任务"
 
 #~ msgid "Timesheets"
 #~ msgstr "工作时间表"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index e883a489a05..cd3ec585938 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/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: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/project.py b/addons/project/project.py
index ef096a3bdba..f5fb203ec55 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -165,14 +165,29 @@ class project(osv.osv):
             res[task.project_id.id] += 1
         return res
 
+    def _get_followers(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Functional field that computes the users that are 'following' a thread.
+        '''
+        res = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            l = set()
+            for message in project.message_ids:
+                l.add(message.user_id and message.user_id.id or False)
+            res[project.id] = list(filter(None, l))
+        return res
+
+    def _search_followers(self, cr, uid, obj, name, args, context=None):
+        project_obj = self.pool.get('project.project')
+        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
+        return [('id', 'in', project_ids)]
+
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
-        'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
@@ -197,19 +212,18 @@ class project(osv.osv):
                 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
-        'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'use_tasks': fields.boolean('Use Tasks', help="Check this field if this project is aimed at managing tasks"),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
+        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
+                        type='many2many', relation='res.users', string='Followers'),
      }
     
     def dummy(self, cr, uid, ids, context):
         return True
-       
+
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -217,10 +231,11 @@ class project(osv.osv):
     _order = "sequence"
     _defaults = {
         'active': True,
+        'type': 'contract',
+        'state': 'open',
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
-        'use_tasks': True,
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -894,28 +909,12 @@ class task(base_stage, osv.osv):
         return True
 
     def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task, then opens the wizard to send an 
-            email to the partner or the project manager.
+        """ This action closes the task 
         """
         task_id = len(ids) and ids[0] or False
         self._check_child_task(cr, uid, ids, context=context)
         if not task_id: return False
-        task = self.browse(cr, uid, task_id, context=context)
-        project = task.project_id
-        res = self.do_close(cr, uid, [task_id], context=context)
-        if project.warn_manager or project.warn_customer:
-            return {
-                'name': _('Send Email after close task'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True,
-                'context': {'active_id': task.id,
-                            'active_model': 'project.task'}
-           }
-        return res
+        return self.do_close(cr, uid, [task_id], context=context)
 
     def do_close(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_close. """
@@ -1217,16 +1216,49 @@ class project_work(osv.osv):
 
 
 class account_analytic_account(osv.osv):
-
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
+    _columns = {
+        'use_tasks': fields.boolean('Tasks Management',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+    }
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        '''
+        This function is used to decide if a project needs to be automatically created or not when an analytic account is created. It returns True if it needs to be so, False otherwise.
+        '''
+        return vals.get('use_tasks')
+
+    def project_create(self, cr, uid, analytic_account_id, vals, context=None):
+        '''
+        This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
+        '''
+        project_pool = self.pool.get('project.project')
+        project_id = project_pool.search(cr, uid, [('analytic_account_id','=', analytic_account_id)])
+        if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
+            project_values = {
+                'name': vals.get('name'),
+                'analytic_account_id': analytic_account_id,
+            }
+            return project_pool.create(cr, uid, project_values, context=context)
+        return False
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
-        return super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        self.project_create(cr, uid, analytic_account_id, vals, context=context)
+        return analytic_account_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        name = vals.get('name')
+        for account in self.browse(cr, uid, ids, context=context):
+            if not name:
+                vals['name'] = account.name
+            self.project_create(cr, uid, account.id, vals, context=context)
+        return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f685f14c85b..07951280dc7 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -286,14 +286,12 @@
         
 
         <record id="project_project_9" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
         </record>
         <record id="project_project_21" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="priority">10</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Study + Prototype</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index aaaa9ec3a96..49d114fd315 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -10,7 +10,16 @@
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -33,7 +42,7 @@
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
-                        <field name="name"/>
+                        <field name="name" string="Project Name"/>
                     </h1>
                     <label for="parent_id" class="oe_edit_only" string="Parent Project"/>
                     <h2>
@@ -41,16 +50,28 @@
                     </h2>
                     <group>
                         <group>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        </group><group>
-                            <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="progress_rate" widget="progressbar"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                            <field name="privacy_visibility"/>
+                        </group>
+                        <group>
+                            <table>
+                                <tr name="use_tasks_row">
+                                    <td><group><field name="use_tasks"/></group></td>
+                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <td/>
+                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Members">
-                            <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
+                    <notebook>
+                        <page string="Team" name="team">
+                            <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
                                     <templates>
@@ -68,55 +89,24 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page string="Administration">
+                        <page string="Other Info">
                             <group>
-                                <group name="kanban" string="Project Management">
-                                    <field name="use_tasks"/>
-                                </group>
-                                <group string="Performance">
+                                <group string="Administration">
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time" />
                                     <field name="resource_calendar_id"/>
                                 </group>
-                                <newline/>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
-                                    <field name="warn_manager"/>
+                                <group string="Miscellaneous" name="misc">
+                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="Billing" groups="account.group_account_invoice">
-                            <group col="4">
-                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
-                                <field name="warn_customer"/>
-                                <field name="currency_id" groups="base.group_multi_company" required="1"/>
-                            </group>
-                            <group col="4">
-                                <separator colspan="2" string="Mail Header"/>
-                                <separator colspan="2" string="Mail Footer"/>
-                                <field name="warn_header" nolabel="1" colspan="2"/>
-                                <field name="warn_footer" nolabel="1" colspan="2"/>
-                            </group>
-                            <group col="3">
-                                <b>
-                                    <label string="Variables you can use for headers and footer." colspan="3"/>
-                                </b>
-                                <label string="Task: %%(name)s"/>
-                                <label string="User: %%(user_id)s"/>
-                                <label string="ID: %%(task_id)s"/>
-                                <label string="Status: %%(state)s"/>
-                                <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date)s"/>
-                            </group>
-                        </page>
                         <page string="Tasks Stages">
                              <field name="type_ids"/>
                         </page>
-                        <page string="Notes">
-                            <field name="description"/>
-                        </page>
                     </notebook>
                 </sheet>
                 <footer>
@@ -623,6 +613,22 @@
                 </search>
             </field>
         </record>
+        
+        <record id="analytic_account_inherited_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_tasks" />
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">Tasks</field>
@@ -734,11 +740,11 @@
             <field name="help">Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
@@ -750,9 +756,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    <newline/>
+                    <group string="Project Management">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 0d3c548c913..b112506e073 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class project_configuration(osv.osv_memory):
     _name = 'project.config.settings'
@@ -46,6 +47,8 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True,
+            help="""This will set the unit of measure used in projects and tasks."""),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
@@ -55,9 +58,18 @@ class project_configuration(osv.osv_memory):
         'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("Manage Taks Delegation",
+        'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
             implied_group='project.group_delegate_task',
-            help="Allows you to delegate tasks to other users."),                                
+            help="Allows you to delegate tasks to other users."),
     }
 
+    def get_default_time_unit(self, cr, uid, fields, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return {'time_unit': user.company_id.project_time_mode_id.id}
+
+    def set_time_unit(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user.company_id.write({'project_time_mode_id': config.time_unit.id})
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 18c7875fcdc..28258c483ce 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -1,6 +1,5 @@
 <openerp>
     <data>
-
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">project settings</field>
             <field name="model">project.config.settings</field>
@@ -9,26 +8,31 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <separator string="Project" colspan="4"/>
-                        <field name="module_project_mrp"/>
-                        <field name="module_project_timesheet"/>
-                        <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
-                        <field name="group_manage_delegation_task"/>
-
-                        <separator string="Planning" colspan="4"/>
-                        <field name="module_project_long_term"/>
-
-                        <separator string="Helpdesk and Support" colspan="4"/>
-                        <field name="module_project_issue"/>
-                        <field name="module_project_issue_sheet"/>
-                        <group name="support" colspan="4"/>
-                    </group>
+                    <sheet>
+                        <group string="Project">
+                            <group>
+                                <field name="module_project_mrp"/>
+                                <field name="module_project_timesheet"/>
+                                <field name="module_pad"/>
+                            </group>
+                            <group>
+                                <field name="group_tasks_work_on_tasks"/>
+                                <field name="group_time_work_estimation_tasks"/>
+                                <field name="group_manage_delegation_task"/>
+                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
+                            </group>
+                        </group>
+                        <group string="Planning">
+                            <field name="module_project_long_term"/>
+                        </group>
+                        <group string="Helpdesk and Support" name="support">
+                            <field name="module_project_issue"/>
+                            <field name="module_project_issue_sheet"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 199d3c0c422..829ec6c6971 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,7 +14,7 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="ir.ui.menu" id="menu_definitions">
+    <record model="ir.ui.menu" id="base.menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
 
@@ -41,6 +41,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule" id="project_public_members_rule">
+        <field name="name">public Members</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
+    </record>
+
     <record model="ir.rule" id="task_comp_rule">
         <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index f5324d2b6aa..7a9a734b2bd 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
deleted file mode 100644
index 1609cc04c1c..00000000000
--- a/addons/project/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- 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
-        '''
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'project.task' and resource_id:
-            task_pool = self.pool.get('project.task')
-            task_data = task_pool.browse(cr, uid, resource_id, context=context)
-            partner = task_data.partner_id or task_data.project_id.partner_id
-            if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
-                raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
-            elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)):
-                raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
-
-            result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
-            val = {
-                    'name': task_data.name,
-                    'user_id': task_data.user_id.name,
-                    'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
-                    'date_start': task_data.date_start,
-                    'date': task_data.date_end,
-                    'state': task_data.state
-            }
-            header = (task_data.project_id.warn_header or '') % val
-            footer = (task_data.project_id.warn_footer or '') % val
-            description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
-            if partner :
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email})
-            result.update({
-                       'body_text': description or False,
-                       'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
-                       'subject':  _("Task '%s' Closed") % task_data.name,
-                       'model': model,
-                       'res_id': resource_id,
-                    })
-
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ad6e7afdbcc..976a706ac54 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -591,14 +591,9 @@ class project(osv.osv):
     _columns = {
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'reply_to' : fields.char('Reply-To Email Address', size=256),
-        'use_issues' : fields.boolean('Use Issues', help="Check this field if this project manages issues"),
         'issue_count': fields.function(_issue_count, type='integer'),
     }
 
-    _defaults = {
-        'use_issues': True,
-    }
-
     def _check_escalation(self, cr, uid, ids, context=None):
         project_obj = self.browse(cr, uid, ids[0], context=context)
         if project_obj.project_escalation_id:
@@ -611,4 +606,18 @@ class project(osv.osv):
     ]
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    
+    _columns = {
+        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
+    }
+    
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or vals.get('use_issues')
+
+account_analytic_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fe44be8ab17..58a9c3dea12 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
+        <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -343,9 +343,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_issues"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_issues"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                     <field name="reply_to"/>
@@ -370,5 +373,20 @@
                 </xpath>
             </field>
         </record>
+      <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.issue.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_issues" />
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 21e50b21e8d..ec7080708ac 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", readonly=True,
+        'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 0a470205c24..1c9702e3d38 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -8,9 +8,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <group name="support" position="after">
-                    <field name="fetchmail_issue"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
+                <group name="support" position="inside">
+                    <label for="fetchmail_issue"/>
+                    <div>
+                        <field name="fetchmail_issue"/>
+                        <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..a4df1eb6917 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,19 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or vals.get('use_phases')
+
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f7e9f11020c..aa8aabd84e4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -97,6 +97,13 @@
     # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
@@ -104,21 +111,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
@@ -375,6 +376,22 @@
         view_mode="tree,form"
         />
 
+    <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_phases"/>
+                </xpath>
+            </field>
+        </record>
+
     # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
@@ -391,7 +408,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 2dccbb2e38b..f1a82867a6f 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -36,7 +36,13 @@ the Timesheet line entries for particular date and particular user  with the eff
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
     'init_xml': ['project_timesheet_data.xml'],
-    'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
+    'update_xml': [
+        "security/ir.model.access.csv",
+        "security/project_timesheet_security.xml",
+        "process/project_timesheet_process.xml", 
+        "report/task_report_view.xml", 
+        "project_timesheet_view.xml",
+        ],
     'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 585b3cd6ec8..31b169d3c0f 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -50,14 +50,10 @@ class project_project(osv.osv):
         return res
 
     _columns = {
-        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
         'amount_to_invoice': fields.function(_to_invoice, string="Amount to Invoice", multi="sums"),
         'time_to_invoice': fields.function(_to_invoice, string="Time to Invoice", multi="sums"),
         'timesheet_count': fields.function(_timesheet_count, type='integer', string="Issue"),
     }
-    _defaults = {
-        'use_timesheets': True,
-    }
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
@@ -69,28 +65,6 @@ class project_project(osv.osv):
                 factor_id = data_obj.browse(cr, uid, data_id).res_id
                 res['value'].update({'to_invoice': factor_id})
         return res
-    
-    def open_timesheets(self, cr, uid, ids, context=None):
-        """ open Timesheets view """
-        project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
-        view_context = {
-            'search_default_account_id': [project.analytic_account_id.id],
-            'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
-        }
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': view_context,
-            'nodestroy': True,
-        }
 
 project_project()
 
@@ -131,7 +105,7 @@ class project_work(osv.osv):
         project_obj = self.pool.get('project.project')
         task_obj = self.pool.get('project.task')
         uom_obj = self.pool.get('product.uom')
-        
+
         vals_line = {}
         context = kwargs.get('context', {})
         if not context.get('no_analytic_entry',False):
@@ -141,7 +115,7 @@ class project_work(osv.osv):
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
             vals_line['date'] = vals['date'][:10]
-            
+
             #calculate quantity based on employee's product's uom 
             vals_line['unit_amount'] = vals['hours']
 
@@ -179,7 +153,7 @@ class project_work(osv.osv):
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
         result = {}
-        
+
         if isinstance(ids, (long, int)):
             ids = [ids,]
 
@@ -198,7 +172,7 @@ class project_work(osv.osv):
                 for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
                     if result.get(fld, False):
                         vals_line[fld] = result[fld]
-                        
+
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
@@ -208,7 +182,7 @@ class project_work(osv.osv):
 
                 if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
                     vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-                    
+
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
                     prod_id=prod_id, company_id=False,
@@ -218,7 +192,7 @@ class project_work(osv.osv):
                     vals_line['amount'] = amount_unit['value']['amount']
 
             self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
-            
+
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 8b6aa992366..0acf639b507 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="project_invoice_form" model="ir.ui.view">
-            <field name="name">Inherit project form : Invoicing Data</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <field name="use_tasks" position='after'>
-                    <field name="use_timesheets"/>
-                    <field name="amount_to_invoice" invisible="True"/>
-                    <field name="time_to_invoice" invisible="True"/>
-                </field>
-                <field name="warn_customer" position="after">
-                    <group colspan="4" col="4">
-                        <separator colspan="4" string="Invoicing Data"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
-                        <field name="amount_max"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </field>
-            </field>
-        </record>
 
         <record id="view_project_kanban_inherited" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
@@ -55,10 +33,10 @@
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="project_invoice_form"/>
+            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
                 </field>
             </field>
         </record>
@@ -115,7 +93,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_to_invoice': 1}</field>
             <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help">You will find here all works made on tasks that you can invoice.
 In order to invoice the time spent on a project, you must define the
diff --git a/addons/project_timesheet/security/project_timesheet_security.xml b/addons/project_timesheet/security/project_timesheet_security.xml
new file mode 100644
index 00000000000..ea1f0a98b4c
--- /dev/null
+++ b/addons/project_timesheet/security/project_timesheet_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record model="res.groups" id="base.group_user">
+            <field name="implied_ids" eval="[(4, ref('project.group_tasks_work_on_tasks'))]"/>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 4792388c664..4277647110e 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-08-03 23:22+0000\n"
-"Last-Translator: Stefan Lind <Unknown>\n"
+"PO-Revision-Date: 2012-06-26 07:07+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-05-11 04:41+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -54,13 +54,13 @@ msgstr "Datum när detta dokument blev skapat"
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -86,7 +86,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Godkänd inköpsorder"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -99,12 +99,12 @@ msgstr "Supplier"
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Prislistor"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Att fakturera"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -128,7 +128,7 @@ msgstr "Leverantörsfakturor"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Inköpsorderstatistik"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -145,7 +145,7 @@ msgstr "No Pricelist !"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -155,7 +155,7 @@ msgstr "Offertförfrågan"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "Baserad på mottagning"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
@@ -172,7 +172,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Månatlig försäljning per kategori"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -187,7 +187,7 @@ msgstr "Invoice Exception"
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr "Default Purchase Pricelist"
+msgstr "Standardinköpslista"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -217,12 +217,12 @@ msgstr "Fax :"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Att godkänna"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Inköpsegenskaper"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -242,22 +242,22 @@ msgstr "Approve Purchase"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Baserad på genererad preleminär faktura"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "Dagens ordrar"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Månatliga inköp per kategori"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -267,7 +267,7 @@ msgstr "Inköp"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Preleminära inköpsorder"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -283,7 +283,7 @@ msgstr "Anteckningar"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "september"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
@@ -341,7 +341,7 @@ msgstr "Cancelled"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "Konvertera till inköpsorder"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
@@ -356,7 +356,7 @@ msgstr "Shipping Exception"
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Fakturarader"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -382,13 +382,14 @@ msgstr "Reference"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Lagertransaktion"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Du måste först avbryta all fakturering med anknytning till denna inköpsorder"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -404,7 +405,7 @@ msgstr "TVA :"
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "Inköpsorder '%s' har åter fått status utkast."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -414,7 +415,7 @@ msgstr "Analytic Account"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Rader"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -422,7 +423,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: purchase
 #: field:purchase.order,validator:0 view:purchase.report:0
@@ -432,7 +433,7 @@ msgstr "Validerad av"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Ordrar under senaste månaden"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
@@ -443,7 +444,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -458,7 +459,7 @@ msgstr "Order Line"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Anger att plockningen är klar."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -479,7 +480,7 @@ msgstr "Confirmed"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Snittpris"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -502,17 +503,17 @@ msgstr "Bekräfta"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "Baserad på mottagning"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Leverantörens referens"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -563,7 +564,7 @@ msgstr "Skriv ut"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Sammanslagna inköpsordrar"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -584,32 +585,32 @@ msgstr "Fax:"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Totalt belopp"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Skapa eller importera leverantörer"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "Tillgänglig"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Kontaktadressnamn"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr "Shipping address :"
+msgstr "Leveransadress :"
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Fakturor skapade för en inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -639,6 +640,8 @@ msgstr ""
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Det finns ingen inköpssjournal definierad för det här företaget: \"%s\" "
+"(id:%d)"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -664,7 +667,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Allmänt"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
@@ -692,7 +695,7 @@ msgstr "Create invoice"
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
@@ -713,13 +716,13 @@ msgstr "Fiscal Position"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -756,22 +759,22 @@ msgstr "RFQ"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI-prislista (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Väntar på godkännande"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "januari"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "Automatisk e-post bekräftade inköpsorder"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -783,18 +786,18 @@ msgstr ""
 #: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0 view:stock.picking:0
 msgid "Order Date"
-msgstr ""
+msgstr "Orderdatum"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Du måste tilldela ett produktionsbatch för denna produkt"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0 view:stock.picking:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -810,7 +813,7 @@ msgstr "Qty"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Månad-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -824,17 +827,17 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Inköpsorderradsammanslagning"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Ordrar i innevarande månad"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Dagar för att leverera"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -845,22 +848,22 @@ msgstr "Ta emot Produkter"
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Anskaffning"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Fakturor"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: purchase
 #: field:purchase.config.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -870,17 +873,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Godkända inköpsordrar"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -895,12 +898,12 @@ msgstr "Inköpsorder för godkännande"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Totalt ex moms"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
@@ -922,18 +925,18 @@ msgstr ""
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Är en restorder"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Skall granskas av bokföraren."
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Den totala summan"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -943,18 +946,18 @@ msgstr "Taxes :"
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "Invoiced"
+msgstr "Fakturerad"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Status för inköpsordern."
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -964,12 +967,12 @@ msgstr "Destination Address"
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Orderstatus"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "Produktkategorier"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
@@ -979,12 +982,12 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Skapa fakturor"
 
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Bolagsnamnet måste vara unikt !"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
@@ -1005,7 +1008,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Summa utan moms."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754
@@ -1017,7 +1020,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "IO: %s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1035,22 +1038,22 @@ msgstr "Untaxed Amount"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Anger att en faktura är betald."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Utlevererade produkter att fakturera"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -1060,12 +1063,12 @@ msgstr "Date on which this document has been created."
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Försäljning och inköp"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "juni"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1079,17 +1082,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-postmallar"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Inköpsorder"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Manuella fakturor"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -1100,17 +1103,17 @@ msgstr "Invoice Control"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Enhetskategorier"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1130,21 +1133,24 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Skapa eller Importera leverantörer och deras kontakter manuellt från detta "
+"formulär eller så kan du importera dina befintliga företag med CSV-filer "
+"från \"Importera data\" guiden."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Plocklista skapad"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Undantag"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1154,17 +1160,17 @@ msgstr "Compute"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Inkommande leveranser tillgängliga."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Adressbok"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bolag"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1194,12 +1200,12 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Infopanel"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referensen måste vara unik per bolag!"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
@@ -1209,17 +1215,17 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "Företagskategorier"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Moms"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Offerter"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -1233,7 +1239,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adresser"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
@@ -1306,7 +1312,7 @@ msgstr ""
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr ""
+msgstr "Tillstånd"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -1318,7 +1324,7 @@ msgstr "Approved"
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Allmän information"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1351,7 +1357,7 @@ msgstr "Faktura"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Bekräftade inköpsorder att fakturera"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1384,12 +1390,12 @@ msgstr "Inköpsordrar"
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Orderreferensen måste vara unik per bolag!"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1404,7 +1410,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Inkommande leveranser"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -1425,7 +1431,7 @@ msgstr "Tél. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Ordrar denna månad"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1484,7 +1490,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: purchase
 #: field:purchase.order,product_id:0 view:purchase.order.line:0
@@ -1497,7 +1503,7 @@ msgstr "Product"
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Bekräftan"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,name:0
@@ -1508,7 +1514,7 @@ msgstr "Beskrivning"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "Ordrar i år"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1518,7 +1524,7 @@ msgstr "Expected Delivery address:"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1529,7 +1535,7 @@ msgstr "Mottagningsanalys"
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Leverantörens ledtid"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1547,7 +1553,7 @@ msgstr "Delivery"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "Klara inköpsordrar"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1567,7 +1573,7 @@ msgstr "Väntar"
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adress"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
@@ -1592,7 +1598,7 @@ msgstr "Untaxed amount"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Plockning att fakturera"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1611,13 +1617,13 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Inköpsanalys"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1647,17 +1653,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr "Purchase Control"
+msgstr "Inköpskontroll"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1689,7 +1695,7 @@ msgstr ""
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr "Purchase Pricelist"
+msgstr "Inköpsprislista"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -1699,7 +1705,7 @@ msgstr "Invoicing Control"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Restordrar"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1709,7 +1715,7 @@ msgstr "Approve"
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr "Default Purchase Pricelist Version"
+msgstr "Standardinköpsprislisteversion"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1732,7 +1738,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "Inköpsorder '%s' är avbruten."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1742,12 +1748,12 @@ msgstr "Total"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Prislisteversioner"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1839,32 +1845,32 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Ordrar i innevarande år"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Inköp"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -1892,7 +1898,7 @@ msgstr "Välj en öppen säljorder"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Ordrar"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1906,7 +1912,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Inköpsorder infopanel"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -2177,3 +2183,6 @@ msgstr ""
 
 #~ msgid "Products Categories"
 #~ msgstr "Produktkategorier"
+
+#~ msgid "Not invoiced"
+#~ msgstr "Icke fakturerat"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 47ff616b548..775aebfaa8f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
 
         # - determine product_qty and date_planned based on seller info
         if not date_order:
-            date_order = fields.date.context_today(cr,uid,context=context)
+            date_order = fields.date.context_today(self,cr,uid,context=context)
 
         qty = qty or 1.0
         supplierinfo = False
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 23914769c0d..c5e72db9f1a 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -32,7 +32,7 @@ class purchase_config_settings(osv.osv_memory):
             [('manual', 'Based on Purchase Order Lines'),
              ('picking', 'Based on Receptions'),
              ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'Invoicing Method', required=True, default_model='purchase.order'),
+            ], 'Default Invoicing Control Method', required=True, default_model='purchase.order'),
         'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
@@ -48,24 +48,18 @@ class purchase_config_settings(osv.osv_memory):
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
         'module_warning': fields.boolean("Alerts by Products or Supplier",
-            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier. 
+            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
-            help="""This allows you to define the following for a product:
-                    * Manufacturer
-                    * Manufacturer Product Name
-                    * Manufacturer Product Code
-                    * Product Attributes.
-                This installs the module product_manufacturer."""),
+
         'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Use Purchase Requisition",
-            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products. 
-            You can configure per product if you directly do a Request for Quotation 
+        'module_purchase_requisition': fields.boolean("Manage Purchase Requisitions",
+            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
+            You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
-        'decimal_precision': fields.integer('Decimal Precision on Price'),                
+        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
     }
 
     _defaults = {
@@ -87,10 +81,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
         'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
-            help="""This allows install module purchase_analytic_plans."""),                 
+            help="""This allows install module purchase_analytic_plans."""),
         'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
 
+    def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+        """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """
+        return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index e7be392b0c2..1afd2d04a90 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,26 +8,28 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <separator string="Invoicing" colspan="4"/>
-                        <field name="default_invoice_method"/>
-                        <field name="decimal_precision"/>
-
-                        <separator string="Purchase Order" colspan="4"/>
-                        <field name="group_purchase_pricelist"/>
-                        <field name="group_uom"/>
-                        <field name="group_purchase_delivery_address"/>
-                        <field name="module_purchase_double_validation"/>
-                        <field name="module_purchase_requisition"/>
-                        <field name="module_warning"/>
-                        <field name="module_purchase_analytic_plans"/>
-
-                        <separator string="Products" colspan="4"/>
-                        <field name="module_product_manufacturer"/>
-                    </group>
+                    <sheet>
+                        <group string="Invoicing">
+                            <field name="default_invoice_method"/>
+                            <field name="decimal_precision"/>
+                        </group>
+                        <group string="Purchase Order">
+                            <group>
+                                <field name="group_purchase_pricelist"/>
+                                <field name="group_uom"/>
+                                <field name="group_purchase_delivery_address"/>
+                            </group>
+                            <group>
+                                <field name="module_purchase_double_validation"/>
+                                <field name="module_purchase_requisition"/>
+                                <field name="module_warning"/>
+                                <field name="module_purchase_analytic_plans"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -55,7 +57,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_purchases"/>
-                    <field name="module_purchase_analytic_plans"/>
+                    <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 9bf03474e86..cff984c473f 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Double Validation Limit',required=True,
+        'limit_amount': fields.integer('Limit to Require a Second Approval',required=True,
             help="Amount after which validation of purchase is required."),
     }
 
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 566497df729..ec7bc005d04 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -31,6 +31,7 @@ import decimal_precision as dp
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
     _description="Purchase Requisition"
+    _inherit = ['ir.needaction_mixin', 'mail.thread']
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Source', size=32),
@@ -43,10 +44,10 @@ class purchase_requisition(osv.osv):
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
-        'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'Status', required=True)
+        'state': fields.selection([('draft','New'),('in_progress','Sent to Suppliers'),('cancel','Cancelled'),('done','Purchase Done')], 'Status', required=True)
     }
     _defaults = {
-        'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
         'state': 'draft',
         'exclusive': 'multiple',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition', context=c),
@@ -63,6 +64,7 @@ class purchase_requisition(osv.osv):
             'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
         })
         return super(purchase_requisition, self).copy(cr, uid, id, default, context)
+    
     def tender_cancel(self, cr, uid, ids, context=None):
         purchase_order_obj = self.pool.get('purchase.order')
         for purchase in self.browse(cr, uid, ids, context=context):
@@ -70,20 +72,36 @@ class purchase_requisition(osv.osv):
                 if str(purchase_id.state) in('draft','wait'):
                     purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
         self.write(cr, uid, ids, {'state': 'cancel'})
+        self.cancel_send_note(cr, uid, ids, context=context)
         return True
 
     def tender_in_progress(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
+        self.in_progress_send_note(cr, uid, ids, context=context)
         return True
 
     def tender_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
+        self.reset_send_note(cr, uid, ids, context=context)
         return True
 
     def tender_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        self.done_to_send_note(cr, uid, ids, context=context)
         return True
 
+    def in_progress_send_note(self, cr, uid, ids, context=None):
+        self.message_append_note(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
+    
+    def reset_send_note(self, cr, uid, ids, context=None):
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
+     
+    def done_to_send_note(self, cr, uid, ids, context=None):
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
+        
+    def cancel_send_note(self, cr, uid, ids, context=None):
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
+
     def _planned_date(self, requisition, delay=0.0):
         company = requisition.company_id
         date_planned = False
@@ -164,9 +182,45 @@ class purchase_requisition(osv.osv):
                 }, context=context)
                 
         return res
+    
+    def get_needaction_user_ids(self, cr, uid, ids, context=None):
+        result = dict.fromkeys(ids, [])
+        for obj in self.browse(cr, uid, ids, context=context):
+            if (obj.state == 'draft') and obj.user_id:
+                result[obj.id] = [obj.user_id.id]
+        return result
+    
+    def create_send_note(self, cr, uid, ids, context=None):
+        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
+
+    def create(self, cr, uid, vals, context=None):
+        requisition =  super(purchase_requisition, self).create(cr, uid, vals, context=context)
+        if requisition:
+            self.create_send_note(cr, uid, [requisition], context=context)
+        return requisition
 
 purchase_requisition()
 
+class mail_message(osv.osv):
+    _inherit = 'mail.message'
+    
+    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
+                             email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
+                             res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
+                             context=None):
+        purchase_order_obj = self.pool.get('purchase.order')
+        requisition_id = purchase_order_obj.browse(cr, uid, res_id, context=context).requisition_id.id
+        result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
+                     email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+                     res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                     context=context)
+        if requisition_id:
+            result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
+                             email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+                             res_id=requisition_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                             context=context)
+        return result
+
 class purchase_requisition_line(osv.osv):
 
     _name = "purchase.requisition.line"
@@ -203,13 +257,14 @@ class purchase_order(osv.osv):
     _columns = {
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
     }
+
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
         proc_obj = self.pool.get('procurement.order')
         for po in self.browse(cr, uid, ids, context=context):
             if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
                 for order in po.requisition_id.purchase_ids:
-                    if order.id<>po.id:
+                    if order.id != po.id:
                         proc_ids = proc_obj.search(cr, uid, [('purchase_id', '=', order.id)])
                         if proc_ids and po.state=='confirmed':
                             proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
@@ -224,7 +279,7 @@ class product_product(osv.osv):
     _inherit = 'product.product'
 
     _columns = {
-        'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
+        'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box to generates purchase requisition instead of generating requests for quotation from procurement.")
     }
     _defaults = {
         'purchase_requisition': False
@@ -239,27 +294,31 @@ class procurement_order(osv.osv):
         'requisition_id' : fields.many2one('purchase.requisition','Latest Requisition')
     }
     def make_po(self, cr, uid, ids, context=None):
+        res = {}
         sequence_obj = self.pool.get('ir.sequence')
-        res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
-        for proc_id, po_id in res.items():
-            procurement = self.browse(cr, uid, proc_id, context=context)
-            requisition_id=False
-            if procurement.product_id.purchase_requisition:
-                requisition_id=self.pool.get('purchase.requisition').create(cr, uid, {
-                    'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'),
+        requisition_obj = self.pool.get('purchase.requisition')
+        warehouse_obj = self.pool.get('stock.warehouse')
+        procurement = self.browse(cr, uid, ids, context=context)[0]
+        if procurement.product_id.purchase_requisition:
+             seq_name = sequence_obj.get(cr, uid, 'purchase.order.requisition')
+             warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
+             res[procurement.id] = requisition_obj.create(cr, uid, 
+                   {
+                    'name': seq_name,
                     'origin': procurement.origin,
                     'date_end': procurement.date_planned,
-                    'warehouse_id':procurement.purchase_id and procurement.purchase_id.warehouse_id.id,
+                    'warehouse_id':warehouse_id and warehouse_id[0] or False,
                     'company_id':procurement.company_id.id,
                     'line_ids': [(0,0,{
                         'product_id': procurement.product_id.id,
                         'product_uom_id': procurement.product_uom.id,
                         'product_qty': procurement.product_qty
 
-                    })],
-                    'purchase_ids': [(6,0,[po_id])]
+                   })],
                 })
-            self.write(cr,uid,[proc_id],{'requisition_id':requisition_id},context=context)
+             self.write(cr,uid,[procurement.id],{'state': 'running','requisition_id': res[procurement.id]},context=context)
+        else:
+            res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
         return res
 
 procurement_order()
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 41491cc64ca..99cec039731 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -13,7 +13,7 @@
     <!--Resource: purchase.requisition-->
 
 		<record id="requisition1" model="purchase.requisition">
-            <field name="user_id" model="res.users"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="exclusive">exclusive</field>
             <field name="date_start" eval="time.strftime('%Y/%m/%d %H:%M:%S')"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 9aa8265628b..59ee2857445 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
 
-
     <record model="ir.ui.view" id="purchase_order_form_inherit">
         <field name="name">purchase.order.form.inherit</field>
         <field name="type">form</field>
@@ -34,14 +33,17 @@
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
             <header>
-                <button name="tender_in_progress" states="draft" string="Start" type="object" />
+                <button name="tender_in_progress" states="draft" string="Send to Suppliers" type="object" />
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
-                <button name="tender_done" states="in_progress" string="Done" type="object" />
+                <button name="tender_done" states="in_progress" string=" Purchase Done" type="object" />
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <label for="name" class="oe_edit_only"/>
+                <div class="oe_edit_only">
+                    <label for="name" class="oe_inline"/>,
+                    <label for="origin" class="oe_inline"/>
+                </div>
                 <h1>
                     <field name="name" class="oe_inline"/>, 
                     <field name="origin" class="oe_inline"/>
@@ -50,23 +52,24 @@
                     <group>
                         <field name="user_id"/>
                         <field name="exclusive"/>
-                    </group><group>
+                    </group>
+                    <group>
                         <field name="date_start"/>
                         <field name="date_end"/>
-                        <field name="warehouse_id" widget="selection"/>
+                        <field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                     <page string="Products">
                         <field name="line_ids">
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom_id"/>
+                                <field name="product_uom_id" groups="product.group_uom"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <group col="4">
+                                <group>
                                     <field name="product_id" />
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" />
@@ -74,17 +77,19 @@
                                 </group>
                             </form>
                         </field>
-                        <separator string="Terms and Conditions"/>
-                        <field name="description"/>
-                    </page>
-                    <page string="Quotations">
-                        <field name="purchase_ids">
+                        <div class="oe_right oe_button_box" style="margin-top: 10px">
+                            <button name="%(action_purchase_requisition_partner)d" type="action"
+                                string="Request a Quotation" icon="gtk-execute"
+                                attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}"/>
+                        </div>
+                        <separator string="Quotations"/>
+                        <field name="purchase_ids" readonly="1">
                             <tree string="Purchase Order">
                                 <field name="name" string="Reference"/>
                                 <field name="date_order" string="Order Date"/>
                                 <field name="partner_id"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="location_id"/>
+                                <field name="location_id" groups="stock.group_locations"/>
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
@@ -92,12 +97,15 @@
                                 <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
                             </tree>
-                         </field>
-                         <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
-                           attrs="{'readonly': [('state', '=', 'done')]}" />
-                   </page>
+                        </field>
+                        <separator string="Terms and Conditions"/>
+                        <field name="description"/>
+                    </page>
                 </notebook>
             </sheet>
+            <footer>
+                  <field name="message_ids" widget="ThreadView"/>
+            </footer> 
             </form>
         </field>
     </record>
@@ -106,15 +114,17 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree colors="grey:state == 'done';red:date_end&lt;current_date and state not in ('done','cancel');black:date_end&gt;=current_date;" string="Purchase Requisition">
+            <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="name"/>
-                <field name="user_id"/>
                 <field name="date_start"/>
+                <field name="user_id"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <field name="date_end"/>
                 <field name="origin"/>
                 <field name="state"/>
             </tree>
-        </field>
+      </field>
     </record>
 
     <record id="view_purchase_requisition_filter" model="ir.ui.view">
@@ -123,19 +133,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
-                 <group>
+                <group>
                     <field name="name" string="Purchase Requisition"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
-                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
+                    <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
+                    <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <separator orientation="vertical"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -144,7 +155,7 @@
                     <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
                 </group>
-              </search>
+                </search>
             </field>
         </record>
 
@@ -186,7 +197,7 @@
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
-             <xpath expr="//field[@name='close_move']" position="after">
+            <xpath expr="//field[@name='close_move']" position="after">
                 <field name="requisition_id"/>
             </xpath>
         </field>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index a6b806471ef..b18f6f3836e 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -28,7 +28,7 @@ class purchase_requisition_partner(osv.osv_memory):
     _name = "purchase.requisition.partner"
     _description = "Purchase Requisition Partner"
     _columns = {
-        'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
+        'partner_id': fields.many2one('res.partner', 'Supplier', required=True,domain=[('supplier', '=', True)]),
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 0df7182c8c0..9b7c0d9e131 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-21 15:07+0000\n"
+"PO-Revision-Date: 2012-06-26 21:48+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2012-06-22 04:44+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -111,7 +111,7 @@ msgstr "Fakturadatum"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr "Juni"
+msgstr "juni"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -194,7 +194,7 @@ msgstr "Land"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr "September"
+msgstr "september"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit/i18n/sv.po b/addons/report_webkit/i18n/sv.po
new file mode 100644
index 00000000000..54a16dc3bec
--- /dev/null
+++ b/addons/report_webkit/i18n/sv.po
@@ -0,0 +1,546 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-27 10:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Webkitmall (används då rapportfil saknas)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr "Tabloid 29 279.4 x 431.8 mm"
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr "Ledger  28  431.8 x 279.4 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:223
+#, python-format
+msgid "No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Bildformat (png,jpeg,gif)"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,precise_mode:0
+msgid ""
+"This mode allow more precise element                                         "
+"                    position as each object is printed on a separate HTML.   "
+"                                                         but memory and disk "
+"usage is wider"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:100
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Company and Page Setup"
+msgstr "Bolag och sidinställning"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr "DLE 26 110 x 220 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr "B7  21  88 x 125 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:252
+#: code:addons/report_webkit/webkit_report.py:263
+#: code:addons/report_webkit/webkit_report.py:272
+#: code:addons/report_webkit/webkit_report.py:285
+#: code:addons/report_webkit/webkit_report.py:296
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Sidhuvuden"
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Bildnamn"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:94
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:167
+#, python-format
+msgid "Webkit raise an error"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Webkit Headers/Footers"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr "ir.header_webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:82
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company "
+"form.'+\n"
+"                             'Minimal version is 0.9.9"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr "B6  20  125 x 176 mm"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr "B2  17  500 x 707 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.header_img"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,precise_mode:0
+msgid "Precise Mode"
+msgstr ""
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr "A0  5   841 x 1189 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr "C5E 24  163 x 229 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:137
+#, python-format
+msgid "Client Actions Connections"
+msgstr ""
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr "B1  15  707 x 1000 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr "A1  6   594 x 841 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:81
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "Webkit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Välj korret pappersstorlek"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr "A7  11  74 x 105 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr "A6  10  105 x 148 mm"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr "Folio 27  210 x 330 mm"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Toppmarginal (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:224
+#, python-format
+msgid "Please set a header in company settings"
+msgstr ""
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr "B3  18  353 x 500 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "Webkit Header"
+msgstr "Webkit-rubrik"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Tillgänglig html"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Bilder"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Stående"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Liggande"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr "B8  22  62 x 88 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr "A2  7   420 x 594 mm"
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Lägg till utskriftsknapp"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr "A9  13  37 x 52 mm"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Footer"
+msgstr "Sidfot"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr ""
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Högermarginal (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orientering"
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid ""
+"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+"Install a static version of the library if you experience missing "
+"header/footers on Linux."
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Pappersstorlek"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Header"
+msgstr "Sidhuvud"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ":B10    16  31 x 44 mm"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "CSS Style"
+msgstr "CSS-stil"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr "B4  19  250 x 353 mm"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Webkit Logos"
+msgstr "Webkit-loggor"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr "A3  8   297 x 420 mm"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Webkit-mall"
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "webkit-fot"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr "B0  14  1000 x 1414 mm"
+
+#. module: report_webkit
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr "A5  9   148 x 210 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr "A8  12  52 x 74 mm"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "Lägg på utskriftsknapp"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Vänstermarginal (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr "B9  23  33 x 62 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 4d0bd6295c6..04980695f8f 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -51,7 +51,7 @@ import tools
 from tools.translate import _
 from osv.osv import except_osv
 
-logger = logging.getLogger('report_webkit')
+_logger = logging.getLogger(__name__)
 
 def mako_template(text):
     """Build a Mako template.
@@ -248,7 +248,7 @@ class WebKitParser(report_sxw):
                     htmls.append(html)
                 except Exception, e:
                     msg = exceptions.text_error_template().render()
-                    logger.error(msg)
+                    _logger.error(msg)
                     raise except_osv(_('Webkit render'), msg)
         else:
             try :
@@ -259,7 +259,7 @@ class WebKitParser(report_sxw):
                 htmls.append(html)
             except Exception, e:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
         head_mako_tpl = mako_template(header)
         try :
@@ -281,7 +281,7 @@ class WebKitParser(report_sxw):
                                             **self.parser_instance.localcontext)
             except:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
         if report_xml.webkit_debug :
             try :
@@ -292,7 +292,7 @@ class WebKitParser(report_sxw):
                                            **self.parser_instance.localcontext)
             except Exception, e:
                 msg = exceptions.text_error_template().render()
-                logger.error(msg)
+                _logger.error(msg)
                 raise except_osv(_('Webkit render'), msg)
             return (deb, 'html')
         bin = self.get_lib(cursor, uid)
diff --git a/addons/report_webkit_sample/i18n/ar.po b/addons/report_webkit_sample/i18n/ar.po
index 697b1b633ce..360f96983ad 100644
--- a/addons/report_webkit_sample/i18n/ar.po
+++ b/addons/report_webkit_sample/i18n/ar.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
 msgid "Refund"
-msgstr ""
+msgstr "رد"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
@@ -35,7 +35,7 @@ msgstr "نسبة الخصم (%)"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
 msgid "Tel"
-msgstr ""
+msgstr "تليفون"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
@@ -50,7 +50,7 @@ msgstr "فاتورة المورد"
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
 msgid "WebKit invoice"
-msgstr ""
+msgstr "فاتورة ويب"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
@@ -74,8 +74,8 @@ msgstr "الكمية"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "البريد الإلكتروني"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -95,7 +95,7 @@ msgstr "فاتورة"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
 msgid "Supplier Refund"
-msgstr ""
+msgstr "رد للمورد"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
@@ -110,7 +110,7 @@ msgstr "سعر الوحدة"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Partner Ref."
-msgstr ""
+msgstr "مرجع الشريك"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
@@ -121,3 +121,6 @@ msgstr "ضريبة القيمة المضافة"
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr "الإجمالي"
+
+#~ msgid "E-mail"
+#~ msgstr "البريد الإلكتروني"
diff --git a/addons/report_webkit_sample/i18n/bg.po b/addons/report_webkit_sample/i18n/bg.po
index e19a4917c1a..ab45f151ec5 100644
--- a/addons/report_webkit_sample/i18n/bg.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "КОЛ."
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Имейл"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -121,3 +121,6 @@ msgstr "ДДС"
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr "Общо"
+
+#~ msgid "E-mail"
+#~ msgstr "Имейл"
diff --git a/addons/report_webkit_sample/i18n/ca.po b/addons/report_webkit_sample/i18n/ca.po
index 90d44ef3f93..54e97f79ce6 100644
--- a/addons/report_webkit_sample/i18n/ca.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "QTAT"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Correu electrònic"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -125,6 +125,9 @@ msgstr "Total"
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Informes Webkit d'exemple"
 
+#~ msgid "E-mail"
+#~ msgstr "Correu electrònic"
+
 #~ msgid ""
 #~ "Samples for Webkit Report Engine (report_webkit module).\n"
 #~ "\n"
diff --git a/addons/report_webkit_sample/i18n/da.po b/addons/report_webkit_sample/i18n/da.po
index 624243ba68e..4b118e517a1 100644
--- a/addons/report_webkit_sample/i18n/da.po
+++ b/addons/report_webkit_sample/i18n/da.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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,7 +74,7 @@ msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
index f20452a2519..a2d49135f1d 100644
--- a/addons/report_webkit_sample/i18n/de.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "Anz."
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-Mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -148,3 +148,6 @@ msgstr "Summe"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Beispiele Webkit Reports"
+
+#~ msgid "E-mail"
+#~ msgstr "E-Mail"
diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
index b4b285296b8..e94e22f23f3 100644
--- a/addons/report_webkit_sample/i18n/es.po
+++ b/addons/report_webkit_sample/i18n/es.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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -75,8 +75,8 @@ msgstr "CTDAD"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -126,6 +126,9 @@ msgstr "Total"
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Informes Webkit de ejemplo"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid ""
 #~ "Samples for Webkit Report Engine (report_webkit module).\n"
 #~ "\n"
diff --git a/addons/report_webkit_sample/i18n/es_CR.po b/addons/report_webkit_sample/i18n/es_CR.po
index 53854026378..60dfb6a23e8 100644
--- a/addons/report_webkit_sample/i18n/es_CR.po
+++ b/addons/report_webkit_sample/i18n/es_CR.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: 2012-02-18 04:59+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: report_webkit_sample
@@ -76,8 +76,8 @@ msgstr "CTDAD"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -124,6 +124,9 @@ msgstr "CIF/NIF"
 msgid "Total"
 msgstr "Total"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Informes Webkit de ejemplo"
 
diff --git a/addons/report_webkit_sample/i18n/fi.po b/addons/report_webkit_sample/i18n/fi.po
index 4f69d50569d..794ca43e94b 100644
--- a/addons/report_webkit_sample/i18n/fi.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "Määrä"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Sähköposti"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -124,3 +124,6 @@ msgstr "Kokonaismäärä"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Webkit esimerkkiraportit"
+
+#~ msgid "E-mail"
+#~ msgstr "Sähköposti"
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
index e05058f91ec..4c674135734 100644
--- a/addons/report_webkit_sample/i18n/fr.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "QTÉ"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Courriel"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -122,6 +122,9 @@ msgstr "TVA"
 msgid "Total"
 msgstr "Total"
 
+#~ msgid "E-mail"
+#~ msgstr "Courriel"
+
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Exemples de rapports Webkit"
 
diff --git a/addons/report_webkit_sample/i18n/gl.po b/addons/report_webkit_sample/i18n/gl.po
index 1565d6087ef..104143f1c29 100644
--- a/addons/report_webkit_sample/i18n/gl.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "CANT."
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -125,6 +125,9 @@ msgstr "Total"
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Informes Webkit de exemplo"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid ""
 #~ "Samples for Webkit Report Engine (report_webkit module).\n"
 #~ "\n"
diff --git a/addons/report_webkit_sample/i18n/hr.po b/addons/report_webkit_sample/i18n/hr.po
index ab10bf2d88b..55b3f408433 100644
--- a/addons/report_webkit_sample/i18n/hr.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "Kol."
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-pošta"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -147,3 +147,6 @@ msgstr "Ukupno"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Primjeri Webkit izvještaja"
+
+#~ msgid "E-mail"
+#~ msgstr "E-pošta"
diff --git a/addons/report_webkit_sample/i18n/hu.po b/addons/report_webkit_sample/i18n/hu.po
index 4ebfcfbf52e..55defe1c568 100644
--- a/addons/report_webkit_sample/i18n/hu.po
+++ b/addons/report_webkit_sample/i18n/hu.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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "Db"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -124,3 +124,6 @@ msgstr "Bruttó érték"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "WebKit jelentés minták"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/it.po b/addons/report_webkit_sample/i18n/it.po
index a7b65c64c63..b1710d19bab 100644
--- a/addons/report_webkit_sample/i18n/it.po
+++ b/addons/report_webkit_sample/i18n/it.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
@@ -74,8 +74,8 @@ msgstr "Q.ta"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Email"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -121,3 +121,6 @@ msgstr "IVA"
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr "Totale"
+
+#~ msgid "E-mail"
+#~ msgstr "Email"
diff --git a/addons/report_webkit_sample/i18n/ja.po b/addons/report_webkit_sample/i18n/ja.po
index 9d1d8fa1813..cf1e7f4853f 100644
--- a/addons/report_webkit_sample/i18n/ja.po
+++ b/addons/report_webkit_sample/i18n/ja.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: 2012-06-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "数量"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "Eメール"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -121,3 +121,6 @@ msgstr "消費税"
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr "合計"
+
+#~ msgid "E-mail"
+#~ msgstr "Eメール"
diff --git a/addons/report_webkit_sample/i18n/nl.po b/addons/report_webkit_sample/i18n/nl.po
index 6e23cb21867..076cabee521 100644
--- a/addons/report_webkit_sample/i18n/nl.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "AANT"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -148,3 +148,6 @@ msgstr "Totaal"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Webkit overzicht voorbeelden"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/pt.po b/addons/report_webkit_sample/i18n/pt.po
index a5fc721ab0b..2c6b4503ff4 100644
--- a/addons/report_webkit_sample/i18n/pt.po
+++ b/addons/report_webkit_sample/i18n/pt.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
 msgid "Refund"
-msgstr ""
+msgstr "Reembolsar"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
@@ -30,12 +30,12 @@ msgstr "Fax"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
 msgid "Tel"
-msgstr "Telefone"
+msgstr "Tel"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
@@ -45,12 +45,12 @@ msgstr "Descrição"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
 msgid "Supplier Invoice"
-msgstr "Factura de fornecedor"
+msgstr "Fatura do Fornecedor"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
 msgid "WebKit invoice"
-msgstr ""
+msgstr "Fatura WebKit"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
@@ -60,32 +60,32 @@ msgstr "Preço"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Invoice Date"
-msgstr "Data da fatura"
+msgstr "Data da Fatura"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "QTY"
-msgstr ""
+msgstr "QTD"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Amount"
-msgstr ""
+msgstr "Montante"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
@@ -95,7 +95,7 @@ msgstr "Fatura"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
 msgid "Supplier Refund"
-msgstr "Reembolso de Fornecedor"
+msgstr "Reembolso do Fornecedor"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
@@ -105,19 +105,22 @@ msgstr "Documento"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Unit Price"
-msgstr "Preço unitário"
+msgstr "Preço Unitário"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Partner Ref."
-msgstr "Ref. do parceiro"
+msgstr "Ref. do Parceiro"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr "Total"
+
+#~ msgid "E-mail"
+#~ msgstr "Email"
diff --git a/addons/report_webkit_sample/i18n/pt_BR.po b/addons/report_webkit_sample/i18n/pt_BR.po
index da8826947db..9e2877eedfe 100644
--- a/addons/report_webkit_sample/i18n/pt_BR.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,7 +74,7 @@ msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index e8d6e60bd1d..83a2b97cac0 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -72,7 +72,7 @@ msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/i18n/ro.po b/addons/report_webkit_sample/i18n/ro.po
index 6782b7f4dea..3c276f7922d 100644
--- a/addons/report_webkit_sample/i18n/ro.po
+++ b/addons/report_webkit_sample/i18n/ro.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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -30,7 +30,7 @@ msgstr "Fax"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Disc.(%)"
-msgstr "Discount (%)"
+msgstr "Disc.(%) (Discount)"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
@@ -45,17 +45,17 @@ msgstr "Descriere"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
 msgid "Supplier Invoice"
-msgstr "Factură furnizor"
+msgstr "Factura furnizor"
 
 #. module: report_webkit_sample
 #: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
 msgid "WebKit invoice"
-msgstr "Factură WebKit"
+msgstr "Factura WebKit"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Price"
-msgstr "Preț"
+msgstr "Pret"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
@@ -74,23 +74,23 @@ msgstr "Cantitate"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "E-mail"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Amount"
-msgstr "Sumă"
+msgstr "Suma"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Base"
-msgstr "Bază"
+msgstr "Baza"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
 msgid "Invoice"
-msgstr "Factură"
+msgstr "Factura"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
@@ -105,7 +105,7 @@ msgstr "Document"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Unit Price"
-msgstr "Preţ unitar"
+msgstr "Pret unitar"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
@@ -147,3 +147,6 @@ msgstr "Total"
 
 #~ msgid "Webkit Report Samples"
 #~ msgstr "Mostre Raport Webkit"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/sv.po b/addons/report_webkit_sample/i18n/sv.po
new file mode 100644
index 00000000000..47bf47cf6c6
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/sv.po
@@ -0,0 +1,126 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-27 11:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+msgid "Refund"
+msgstr "Återbetalning"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+msgid "Fax"
+msgstr "Fax"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+msgid "Tel"
+msgstr "Tel"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+msgid "Supplier Invoice"
+msgstr "Leverantörsfaktura"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "WebKit-faktura"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Price"
+msgstr "Pris"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Invoice Date"
+msgstr "Fakturadatum"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Taxes"
+msgstr "Skatter"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "QTY"
+msgstr "Antal"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+msgid "Email"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Amount"
+msgstr "Belopp"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Base"
+msgstr "Bas"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+msgid "Supplier Refund"
+msgstr "Återbetalning från leverantör"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Document"
+msgstr "Dokument"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Unit Price"
+msgstr "Styckpris"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Partner Ref."
+msgstr "Företagsreferense"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+msgid "VAT"
+msgstr "Moms"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+msgid "Total"
+msgstr "Totalt"
+
+#~ msgid "E-mail"
+#~ msgstr "E-post"
diff --git a/addons/report_webkit_sample/i18n/tr.po b/addons/report_webkit_sample/i18n/tr.po
index 0e9949915fb..e9ff8330055 100644
--- a/addons/report_webkit_sample/i18n/tr.po
+++ b/addons/report_webkit_sample/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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,7 +74,7 @@ msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/i18n/zh_CN.po b/addons/report_webkit_sample/i18n/zh_CN.po
index 8307ec974be..371e8f9e16f 100644
--- a/addons/report_webkit_sample/i18n/zh_CN.po
+++ b/addons/report_webkit_sample/i18n/zh_CN.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: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
@@ -74,8 +74,8 @@ msgstr "数量"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
-msgstr "电子邮件"
+msgid "Email"
+msgstr ""
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
@@ -122,6 +122,9 @@ msgstr "增值税"
 msgid "Total"
 msgstr "总计"
 
+#~ msgid "E-mail"
+#~ msgstr "电子邮件"
+
 #~ msgid ""
 #~ "Samples for Webkit Report Engine (report_webkit module).\n"
 #~ "\n"
diff --git a/addons/report_webkit_sample/report/report_webkit_html.mako b/addons/report_webkit_sample/report/report_webkit_html.mako
index 909e254fa40..164a697f386 100644
--- a/addons/report_webkit_sample/report/report_webkit_html.mako
+++ b/addons/report_webkit_sample/report/report_webkit_html.mako
@@ -22,7 +22,7 @@
         <tr><td>${_("Fax")}: ${inv.address_invoice_id.fax|entity}</td></tr>
         %endif
         %if inv.address_invoice_id.email :
-        <tr><td>${_("E-mail")}: ${inv.address_invoice_id.email|entity}</td></tr>
+        <tr><td>${_("Email")}: ${inv.address_invoice_id.email|entity}</td></tr>
         %endif
         %if inv.partner_id.vat :
         <tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 1007107f1a0..715564150ff 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Based on Sales Orders',
+        'group_invoice_so_lines': fields.boolean('Based on Sale Orders',
             implied_group='sale.group_invoice_so_lines',
             help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
         'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
@@ -44,24 +44,24 @@ class sale_configuration(osv.osv_memory):
                 This installs the module account_analytic_analysis."""),
         'module_account_analytic_analysis': fields.boolean('Manage Customer Contracts',
             help = """Allows to define your customer contracts conditions: invoicing
-            method (fixed price, on timesheet, advance invoice), the exact pricing 
-            (650€/day for a developer), the duration (one year support contract). 
-            You will be able to follow the progress of the contract and invoice automatically. 
+            method (fixed price, on timesheet, advance invoice), the exact pricing
+            (650€/day for a developer), the duration (one year support contract).
+            You will be able to follow the progress of the contract and invoice automatically.
             It installs the account_analytic_analysis module."""),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
             'Default Method', default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('Charge Shipping Cost',
+        'module_delivery': fields.boolean('Allow Charging Shipping Costs',
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
         'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
-        'default_picking_policy' : fields.boolean("Deliver all Products at Once",
-            help = "You can set picking policy on sale order that will allow you to deliver all products at once."),
+        'default_picking_policy' : fields.boolean("Configurable Shipping Policy",
+            help = "You will be able to configure, per sale order, if you deliver all  products at once or if you deliver each product when it is available.  This may have an impact on the shipping price."),
         'group_sale_pricelist':fields.boolean("Pricelist per Customer",
             implied_group='product.group_sale_pricelist',
-            help="""Allows to manage different prices based on rules per category of customers. 
+            help="""Allows to manage different prices based on rules per category of customers.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
         'group_uom':fields.boolean("Allow Different Units of Measure",
             implied_group='product.group_uom',
@@ -74,12 +74,12 @@ class sale_configuration(osv.osv_memory):
             help="Allows you to apply some discount per sale order line."),
         'group_multiple_shops': fields.boolean("Manage Multiple Shops",
             implied_group='stock.group_locations',
-            help="This allows to configure and use multiple shops."),                
+            help="This allows to configure and use multiple shops."),
         'module_sale_layout': fields.boolean("Notes & Subtotals per Line",
             help="""Allows to format sale order lines using notes, separators, titles and subtotals.
                 This installs the module sale_layout."""),
         'module_warning': fields.boolean("Alerts by Products or Customers",
-            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer. 
+            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
             Example: Product: this product is deprecated, do not purchase more than 5.
             Supplier: don't forget to ask for an express delivery."""),
         'module_sale_margin': fields.boolean("Display Margins on Sale Orders",
@@ -95,14 +95,20 @@ class sale_configuration(osv.osv_memory):
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
                 This installs the module analytic_user_function."""),
-        'module_analytic_journal_billing_rate': fields.boolean("Billing Rates by Contract",
-            help="""Allows you to define the default invoicing rate for a specific journal on a given account.
-                This installs the module analytic_journal_billing_rate."""),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
-        'decimal_precision': fields.integer('Decimal Precision on Price'),
+        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices  like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like:  0.0231 EUR per unit."),
     }
+    def _check_decimal(self, cr, uid, ids, context=None):
+        for decimal in self.browse(cr, uid, ids, context=context):
+            if decimal.decimal_precision > 20:
+                return False
+        return True
+
+    _constraints = [
+        (_check_decimal, 'Digits must be between 0 to 20 ', ['decimal_precision']),
+    ]
 
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
@@ -185,10 +191,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
         'module_sale_analytic_plans': fields.boolean('Several Analytic Accounts on Sales',
-            help="""This allows install module sale_analytic_plans."""),                 
+            help="""This allows install module sale_analytic_plans."""),
         'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
 
+    def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None):
+        """ change group_analytic_account_for_sales following module_sale_analytic_plans """
+        return {'value': {'group_analytic_account_for_sales': module_sale_analytic_plans}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index fa8aa2baa8e..e1910b035bc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -6,47 +6,54 @@
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
-                    <separator string="Invoicing Policy" colspan="4"/>
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <newline/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                    <newline/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <newline/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    <group string="Invoicing Policy">
+                        <group>
+                            <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                            <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                        </group>
+                        <group>
+                            <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                            <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                                attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                        </group>
+                    </group>
 
-                    <separator string="Sale Order" colspan="4"/>
-                    <field name="group_sale_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="group_sale_delivery_address"/>
-                    <field name="group_discount_per_so_line"/>
-                    <field name="module_sale_margin"/>
-                    <field name="module_sale_layout"/>
-                    <field name="module_warning"/>
-                    <field name="module_sale_journal"/>
-                    <field name="group_multiple_shops"/>
-                    <field name="decimal_precision"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                    <group string="Sale Order">
+                        <group>
+                            <field name="group_uom"/>
+                            <field name="group_sale_delivery_address"/>
+                            <field name="group_sale_pricelist"/>
+                            <field name="group_multiple_shops"/>
+                            <field name="module_warning"/>
+                            <field name="decimal_precision"/>
+                        </group>
+                        <group>
+                            <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="group_discount_per_so_line"/>
+                            <field name="module_sale_margin"/>
+                            <field name="module_sale_layout"/>
+                            <field name="module_sale_journal"/>
+                        </group>
+                    </group>
 
-                    <separator string="Contracts" colspan="4"/>
-                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    <group string="Contracts">
+                        <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+                        <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    </group>
                 </group>
             </field>
         </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base.action_sale_config"/>
+            sequence="1" action="base_setup.action_sale_config"/>
 
         <record id="view_account_config" model="ir.ui.view">
             <field name="name">account settings</field>
@@ -60,7 +67,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_sales"/>
-                    <field name="module_sale_analytic_plans"/>
+                    <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2b9deddb76c..0238f28d4da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -136,7 +136,8 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group><group>
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
new file mode 100644
index 00000000000..54218e6d919
--- /dev/null
+++ b/addons/sale_margin/i18n/sv.po
@@ -0,0 +1,51 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-25 16:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferensen måste vara unik per bolag!"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "Kundorder"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr ""
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Marginal"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
new file mode 100644
index 00000000000..2cba8adf832
--- /dev/null
+++ b/addons/sale_mrp/i18n/sv.po
@@ -0,0 +1,53 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-25 16:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2012-06-26 05:22+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "Indikerar kundreferense från kundorder"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "Säljreferense"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produktionsorder"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "Säljare"
+
+#. module: sale_mrp
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referensen måste vara unik per bolag!"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Orderkvantitet kan inte vara negativt eller noll!"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "Indikerar kundordernamn"
diff --git a/addons/share/i18n/ar.po b/addons/share/i18n/ar.po
index fc27dce44d3..997a324099c 100644
--- a/addons/share/i18n/ar.po
+++ b/addons/share/i18n/ar.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -356,7 +356,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -456,7 +456,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -496,7 +496,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/bg.po b/addons/share/i18n/bg.po
index 82127b66f9e..43c816a5398 100644
--- a/addons/share/i18n/bg.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 7ae94629767..9fab8492cbe 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -368,7 +368,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -401,7 +401,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -471,7 +471,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -513,7 +513,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 23ede08d6c4..fb05c117ca2 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/i18n/cs.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: share
@@ -35,7 +35,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -367,7 +367,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -468,7 +468,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -510,7 +510,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
index daca6b6b475..4097b5f4083 100644
--- a/addons/share/i18n/da.po
+++ b/addons/share/i18n/da.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index 7408ccdd0b7..6917879a417 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -33,8 +33,8 @@ msgstr "Freigabe Methode"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Freigabe für diese Personen (eine EMail pro Zeile)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -386,9 +386,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "Eine EMail mit Anleitung wurde an folgende Personen versandt"
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -418,10 +418,8 @@ msgstr "Kann verändern"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Eine optionale persönliche Nachricht, die in der EMail Verständigung "
-"gedruckt wird."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -492,8 +490,8 @@ msgstr "Zeige Such Ansicht"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Keine EMail Adresse konfiguriert"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -534,11 +532,9 @@ msgstr "Freigabe: Voerbereitung"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Sie müssen Ihre EMail-Adresse in Ihren Einstellungen definieren, bevor Sie "
-"den Freigabe Schaltfläche verwenden können."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -699,5 +695,28 @@ msgstr "Teile mit ...."
 #~ msgid "Share with these people (one e-mail per line)"
 #~ msgstr "Freigabe für diese Personen (eine EMail pro Zeile)"
 
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "Eine EMail mit Anleitung wurde an folgende Personen versandt"
+
 #~ msgid "Use this link"
 #~ msgstr "Verwenden Sie diesen Link"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Eine optionale persönliche Nachricht, die in der EMail Verständigung "
+#~ "gedruckt wird."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Keine EMail Adresse konfiguriert"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Sie müssen Ihre EMail-Adresse in Ihren Einstellungen definieren, bevor Sie "
+#~ "den Freigabe Schaltfläche verwenden können."
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index 6be18e56c1e..111f8e9ec1a 100644
--- a/addons/share/i18n/es.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -371,7 +371,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -474,7 +474,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -516,7 +516,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po
index a5ae3a95a63..c8ab1a20820 100644
--- a/addons/share/i18n/es_CR.po
+++ b/addons/share/i18n/es_CR.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: es\n"
 
 #. module: share
@@ -35,7 +35,7 @@ msgstr "Compartir el método"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -389,11 +389,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Una notificación por correo electrónico con las instrucciones que ha sido "
-"enviado a las siguientes personas:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -424,10 +422,8 @@ msgstr "Puede Editar"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Un mensaje personal opcional, que se incluirá en la notificación por correo "
-"electrónico."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -500,8 +496,8 @@ msgstr "Mostrar Vista de búsqueda"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "No hay dirección de correo electrónico configurado"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -542,11 +538,9 @@ msgstr "Compartir: la preparación"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Usted debe configurar su dirección de correo electrónico en las preferencias "
-"del usuario antes de utilizar el botón Compartir."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -711,5 +705,30 @@ msgstr "Compartir con ..."
 #~ msgstr ""
 #~ "Compartir con estas personas (un mensaje de correo electrónico por línea)"
 
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Una notificación por correo electrónico con las instrucciones que ha sido "
+#~ "enviado a las siguientes personas:"
+
 #~ msgid "Use this link"
 #~ msgstr "Use este enlace"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Un mensaje personal opcional, que se incluirá en la notificación por correo "
+#~ "electrónico."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "No hay dirección de correo electrónico configurado"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Usted debe configurar su dirección de correo electrónico en las preferencias "
+#~ "del usuario antes de utilizar el botón Compartir."
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index d70e0964e6c..db2c1d76098 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Jakometodi"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -372,9 +372,9 @@ msgstr "Tai liitä seuraaava koodi kun haluat upottaa dokumenttisi"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "Sähköpostitiedote ohjeineen on lähetetty seuraaville henkilöille:"
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -404,10 +404,8 @@ msgstr "Voi muokata"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Vaihtoehtoinen henkilökohtainen viesti, joka liitetään sähköposti-"
-"ilmoitukseen."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -476,8 +474,8 @@ msgstr "Näytä hakunäkymä"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Sähköpostiosoitetta ei ole konfiguroitu"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -518,11 +516,9 @@ msgstr "Jakaminen: valmistelu"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Sinun pitää määritellä sähköpostiosoitteesi käyttäjän asetuksiin ennenkuin "
-"voit käyttää Jaa nappia."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -681,3 +677,26 @@ msgstr "Jaa henkilöiden kanssa..."
 
 #~ msgid "Use this link"
 #~ msgstr "Käytä tätä linkkiä"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Vaihtoehtoinen henkilökohtainen viesti, joka liitetään sähköposti-"
+#~ "ilmoitukseen."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Sähköpostiosoitetta ei ole konfiguroitu"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Sinun pitää määritellä sähköpostiosoitteesi käyttäjän asetuksiin ennenkuin "
+#~ "voit käyttää Jaa nappia."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "Sähköpostitiedote ohjeineen on lähetetty seuraaville henkilöille:"
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index 536e3fa0c52..80e56d59370 100644
--- a/addons/share/i18n/fr.po
+++ b/addons/share/i18n/fr.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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -33,7 +33,7 @@ msgstr "Méthode de partage"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -386,11 +386,9 @@ msgstr "Ou insérez le code suivant où vous souhaitez intégrer vos documents"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Une notification par courriel avec les instructions a été envoyée aux "
-"personnes suivantes:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -422,9 +420,8 @@ msgstr "Peut éditer"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Un message personnel optionnel à inclure dans la notification par courriel."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -497,8 +494,8 @@ msgstr "Affiche lu vue de recherche"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Aucune adresse de courriel configurée"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -539,11 +536,9 @@ msgstr "Partage : préparation"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Vous devez configurer votre adresse de courriel dans les préférences de "
-"l'utilisateur avant d'utiliser le bouton partager."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -707,3 +702,27 @@ msgstr "Partager avec..."
 
 #~ msgid "Use this link"
 #~ msgstr "Utiliser ce lien"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Un message personnel optionnel à inclure dans la notification par courriel."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Une notification par courriel avec les instructions a été envoyée aux "
+#~ "personnes suivantes:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Aucune adresse de courriel configurée"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Vous devez configurer votre adresse de courriel dans les préférences de "
+#~ "l'utilisateur avant d'utiliser le bouton partager."
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index f9116a35b92..762444c27ce 100644
--- a/addons/share/i18n/gl.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -366,7 +366,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -469,7 +469,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -511,7 +511,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index 2372597fa5c..c5dab6cc24f 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Način dijeljenja"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Dijeli sa ovim korisnicima (jedan e-mail po liniji)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -368,7 +368,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -400,7 +400,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -470,7 +470,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -512,7 +512,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index 6b1609268c5..beb1eceb262 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index c8b5193f92e..ced913214df 100644
--- a/addons/share/i18n/it.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Metodi di condivisione"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -362,7 +362,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -394,7 +394,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -464,8 +464,8 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Nessun indirizzo e-mail configurato"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -506,7 +506,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
@@ -666,3 +666,7 @@ msgstr ""
 
 #~ msgid "Use this link"
 #~ msgstr "Usa questo collegamento"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Nessun indirizzo e-mail configurato"
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
index 0db52a2c09e..a2c3401458c 100644
--- a/addons/share/i18n/ja.po
+++ b/addons/share/i18n/ja.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: 2012-06-22 04:47+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "共有方法"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "人々と共有（行毎に１つのEメール）"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -359,9 +359,9 @@ msgstr "またはドキュメントを埋め込みたい場所に、次のコー
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
-msgstr "指示によるEメール通知は次の人々に送信されました："
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -391,8 +391,8 @@ msgstr "編集可能"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -461,8 +461,8 @@ msgstr "検索ビューを表示"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Eメールアドレスが設定されていません。"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -501,9 +501,9 @@ msgstr "共有操作"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
-msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
+msgstr ""
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -519,3 +519,22 @@ msgstr "リンクまたは埋め込み"
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
 msgid "Share with..."
 msgstr "共有先"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "指示によるEメール通知は次の人々に送信されました："
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Eメールアドレスが設定されていません。"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index 448d9c9fd88..affc27756f1 100644
--- a/addons/share/i18n/mn.po
+++ b/addons/share/i18n/mn.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 51632a56be3..4dc9fac9906 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/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: 2012-05-11 05:10+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Deel methode"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Deel dit met mensen (één e-mail per regel)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -381,10 +381,9 @@ msgstr "Of voeg te volgende code toe waar u, uw documenten wilt insluiten"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Een e-mail bericht met instructies is verstuurt naar de volgende mensen:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -414,9 +413,8 @@ msgstr "Kan bewerken"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Een optioneel bericht welke kan worden toegevoegd aan de e-mail notificatie."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -489,8 +487,8 @@ msgstr "Zoek weergave tonen"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Geen e-mail adres geconfigureerd"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -531,11 +529,9 @@ msgstr "Delen: voorbereiding"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Voordat u de deel knop kunt gebruiken dient u een e-mail adres te "
-"configureren in uw gebruikersinstellingen."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -697,3 +693,26 @@ msgstr "Deel met..."
 
 #~ msgid "Use this link"
 #~ msgstr "Gebruik deze link"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Geen e-mail adres geconfigureerd"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Voordat u de deel knop kunt gebruiken dient u een e-mail adres te "
+#~ "configureren in uw gebruikersinstellingen."
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Een optioneel bericht welke kan worden toegevoegd aan de e-mail notificatie."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Een e-mail bericht met instructies is verstuurt naar de volgende mensen:"
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index f6ed100f75f..a32c9e09251 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index 56add3e1561..6fc86a1cdb2 100644
--- a/addons/share/i18n/pt.po
+++ b/addons/share/i18n/pt.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "A compartilhar método"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -233,6 +233,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP é uma poderosa e intuitiva suite de Aplicações de Gestão(CRM, "
+"Vendas, RH, etc.)\n"
+"É open source e pode ser encontrado em http://www.openerp.com."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -377,11 +380,9 @@ msgstr "Ou insira o seguinte código onde quer inserir os seus documentos"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Uma notificação por email com instruções foi enviada para as seguintes "
-"pessoas:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -412,9 +413,8 @@ msgstr "Pode editar"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
-"Uma mensagem pessoal opcional, a ser incluída na notificação de email."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -482,13 +482,13 @@ msgstr "Emails"
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Mostrar vista de pesquisa"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Sem endereço de email configurado"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -529,11 +529,9 @@ msgstr "Compartilhamento: preparação"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Deve configurar o seu endereço de email nas preferências do utilizador antes "
-"de usar o botão Partilhar."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -638,3 +636,27 @@ msgstr "Partilhar com..."
 
 #~ msgid "Use this link"
 #~ msgstr "Utilize este link"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Uma notificação por email com instruções foi enviada para as seguintes "
+#~ "pessoas:"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr ""
+#~ "Uma mensagem pessoal opcional, a ser incluída na notificação de email."
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Sem endereço de email configurado"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Deve configurar o seu endereço de email nas preferências do utilizador antes "
+#~ "de usar o botão Partilhar."
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index d3fbf3585d4..8203cf06437 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -356,7 +356,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -458,7 +458,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -500,7 +500,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po
index d13b92a6f35..00f3c5738b3 100644
--- a/addons/share/i18n/ro.po
+++ b/addons/share/i18n/ro.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Metoda de partajare"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -390,10 +390,9 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"A fost trimis un e-mail de notificare cu instructiuni urmatoarelor persoane:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -424,8 +423,8 @@ msgstr "Puteti edita"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "Un mesaj personal optional va fi inclus in e-mail-ul de notificare."
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -497,8 +496,8 @@ msgstr "Afiseaza vizualizarea cautarii"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Nu este configurata nicio adresa de e-mail"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -539,11 +538,9 @@ msgstr "Partajare: pregatire"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Trebuie sa va configurati adresa de e-mail in preferintele utilizatorului "
-"inainte de a folosi butonul Partajeaza."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -705,3 +702,25 @@ msgstr "Partajeaza cu..."
 
 #~ msgid "Use this link"
 #~ msgstr "Folositi acest link"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "Un mesaj personal optional va fi inclus in e-mail-ul de notificare."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "A fost trimis un e-mail de notificare cu instructiuni urmatoarelor persoane:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Nu este configurata nicio adresa de e-mail"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Trebuie sa va configurati adresa de e-mail in preferintele utilizatorului "
+#~ "inainte de a folosi butonul Partajeaza."
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index 4bfe538b8f7..9e8e7ed7b12 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -370,7 +370,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -474,7 +474,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -516,7 +516,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index c9c9e09cd2f..8d4c4c57024 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -52,7 +52,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -372,7 +372,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -472,7 +472,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -512,7 +512,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
index c704c8373eb..1aa3b6f0ee9 100644
--- a/addons/share/i18n/sv.po
+++ b/addons/share/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: 2012-06-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr "Delningsmetod"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -358,7 +358,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr "Kan ändra"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -458,7 +458,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -498,7 +498,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index af5a0030ac5..ff39759e71d 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/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: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,8 +34,8 @@ msgstr "Paylaşım Metodu"
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
-msgstr "Şu kişilerle paylaş (her satırda bir e-posta)"
+msgid "Share with these People (one email per line)"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,name:0
@@ -376,10 +376,9 @@ msgstr "ya da dökümanlarınızı gömmek istediğiniz yere kodu yerleştirin"
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
-"Talimatları içeren bir e-posta mesajı, aşağıdaki kişilere gönderildi:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -409,8 +408,8 @@ msgstr "Düzenleyebilir"
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
-msgstr "E-posta mesajına eklemek için, kişisel mesaj (opsiyonel)"
+"An optional personal message, to be included in the email notification."
+msgstr ""
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -481,8 +480,8 @@ msgstr "Arama Ekranını Göster"
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
-msgstr "Hiç bir E-posta adresi tanımlanmamış"
+msgid "No email address configured"
+msgstr ""
 
 #. module: share
 #: field:share.wizard,message:0
@@ -523,11 +522,9 @@ msgstr "Paylaşım: Hazırlama"
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
-"Share (Paylaş) düğmesi kullanmadan önce, kullanıcı tercihleri ​​e-posta "
-"adresini yapılandırmanız gerekir."
 
 #. module: share
 #: help:share.wizard,access_mode:0
@@ -549,3 +546,25 @@ msgstr "Paylaş..."
 
 #~ msgid "Use this link"
 #~ msgstr "Bu adrese gidin"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "E-posta mesajına eklemek için, kişisel mesaj (opsiyonel)"
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr ""
+#~ "Talimatları içeren bir e-posta mesajı, aşağıdaki kişilere gönderildi:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Hiç bir E-posta adresi tanımlanmamış"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Share (Paylaş) düğmesi kullanmadan önce, kullanıcı tercihleri ​​e-posta "
+#~ "adresini yapılandırmanız gerekir."
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 136584284dd..b292a973205 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.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: 2012-06-08 04:40+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -34,7 +34,7 @@ msgstr ""
 
 #. module: share
 #: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
 msgstr ""
 
 #. module: share
@@ -355,7 +355,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
 msgstr ""
 
 #. module: share
@@ -455,7 +455,7 @@ msgstr ""
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
 msgstr ""
 
 #. module: share
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:198
 #, python-format
 msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
 
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
index 2cab9c6d2f2..997c070fe54 100644
--- a/addons/share/static/src/css/share.css
+++ b/addons/share/static/src/css/share.css
@@ -1,7 +1,7 @@
-button.oe-share-mail {
+button.oe_share_mail {
     display: none;
 }
 
-a.oe-share_link, a.oe-share {
+a.oe_share_link, a.oe_share {
     display: none;
 }
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 3563a4bb859..e88616546a3 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -58,7 +58,7 @@ openerp.share = function(session) {
                 self.add_items('other', [{
                     label: 'Share',
                     callback: self.on_sidebar_click_share,
-                    classname: 'oe-share',
+                    classname: 'oe_share',
                 }]);
             });
         },
@@ -72,7 +72,7 @@ openerp.share = function(session) {
         start: function() {
             start_res = this._super.apply(this, arguments);
             if (has_action_id) {
-                this.$element.find('button.oe-share-mail').show();
+                this.$element.find('button.oe_share_mail').show();
             }
             return start_res;
         }
@@ -83,12 +83,12 @@ openerp.share = function(session) {
             var self = this;
             this.check_if_action_is_defined();
             has_share(function() {
-                self.$element.find('a.oe-share_link').click(self.on_click_share_link);
-                self.$element.find('a.oe-share').click(self.on_click_share);
-                self.$element.delegate('button.oe-share-mail', 'click', self.on_click_share_mail);
+                self.$element.find('a.oe_share_link').click(self.on_click_share_link);
+                self.$element.find('a.oe_share').click(self.on_click_share);
+                self.$element.delegate('button.oe_share_mail', 'click', self.on_click_share_mail);
             }, function() {
-                self.$element.find('a.oe-share_link').remove();
-                self.$element.find('a.oe-share').remove();
+                self.$element.find('a.oe_share_link').remove();
+                self.$element.find('a.oe_share').remove();
             });
             return this._super.apply(this, arguments);
         },
@@ -96,8 +96,8 @@ openerp.share = function(session) {
         check_if_action_is_defined: function() {
             if (this.action && this.action.id) {
                 has_action_id = true;
-                this.$element.find('a.oe-share_link').show();
-                this.$element.find('a.oe-share').show();            
+                this.$element.find('a.oe_share_link').show();
+                this.$element.find('a.oe_share').show();
             }
             else {
                 has_action_id = false;
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
index df9cb165c36..e51dc135c0b 100644
--- a/addons/share/static/src/xml/share.xml
+++ b/addons/share/static/src/xml/share.xml
@@ -4,15 +4,15 @@
 <templates id="template" xml:space="preserve">
 
     <t t-extend="ViewManagerAction">
-        <t t-jquery=".oe-shortcut-toggle" t-operation="after">
-            <a class="oe-share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
-            <a class="oe-share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
+        <t t-jquery=".oe_shortcuts_toggle" t-operation="after">
+            <a class="oe_share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
+            <a class="oe_share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a>
         </t>
     </t>
 
     <t t-extend="RecordThread">
         <t t-jquery="button.oe_mail_button_unfollow" t-operation="after">
-            <button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button>
+            <button type="button" class="oe_share_mail oe_mail_button_mouseout">Invite</button>
         </t>
     </t>
 
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 07004f333a8..274570e9169 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -32,6 +32,7 @@ from osv import expression
 from tools.translate import _
 from tools.safe_eval import safe_eval
 import openerp
+_logger = logging.getLogger(__name__)
 
 FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
 READ_WRITE_ACCESS = ('perm_read', 'perm_write')
@@ -48,7 +49,6 @@ def generate_random_pass():
     return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10))
 
 class share_wizard(osv.osv_memory):
-    _logger = logging.getLogger('share.wizard')
     _name = 'share.wizard'
     _description = 'Share Wizard'
 
@@ -176,7 +176,7 @@ class share_wizard(osv.osv_memory):
                                 help='Main access page for users that are granted shared access'),
         'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
         'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"),
-        'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
+        'message': fields.text("Personal Message", help="An optional personal message, to be included in the email notification."),
 
         'embed_code': fields.function(_embed_code, type='text'),
         'embed_option_title': fields.boolean("Display title"),
@@ -200,8 +200,8 @@ class share_wizard(osv.osv_memory):
     def go_step_1(self, cr, uid, ids, context=None):
         wizard_data = self.browse(cr,uid,ids,context)[0]
         if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context):
-            raise osv.except_osv(_('No e-mail address configured'),
-                                 _('You must configure your e-mail address in the user preferences before using the Share button.'))
+            raise osv.except_osv(_('No email address configured'),
+                                 _('You must configure your email address in the user preferences before using the Share button.'))
         model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
         action = self.pool.get(model).read(cr, uid, res_id, context=context)
         action['res_id'] = ids[0]
@@ -335,7 +335,7 @@ class share_wizard(osv.osv_memory):
             except Exception:
                 # Note: must catch all exceptions, as UnquoteEvalContext may cause many
                 #       different exceptions, as it shadows builtins.
-                self._logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True)
+                _logger.debug("Failed to cleanup action context as it does not parse server-side", exc_info=True)
                 result = context_str
         return result
 
@@ -496,8 +496,8 @@ class share_wizard(osv.osv_memory):
             [x.id for x in current_user.groups_id], target_model_ids, context=context)
         group_access_map = self._get_access_map_for_groups_and_models(cr, uid,
             [group_id], target_model_ids, context=context)
-        self._logger.debug("Current user access matrix: %r", current_user_access_map)
-        self._logger.debug("New group current access matrix: %r", group_access_map)
+        _logger.debug("Current user access matrix: %r", current_user_access_map)
+        _logger.debug("New group current access matrix: %r", group_access_map)
 
         # Create required rights if allowed by current user rights and not
         # already granted
@@ -520,7 +520,7 @@ class share_wizard(osv.osv_memory):
                     need_creation = True
             if need_creation:
                 model_access_obj.create(cr, UID_ROOT, values)
-                self._logger.debug("Creating access right for model %s with values: %r", model.model, values)
+                _logger.debug("Creating access right for model %s with values: %r", model.model, values)
 
     def _link_or_copy_current_user_rules(self, cr, current_user, group_id, fields_relations, context=None):
         rule_obj = self.pool.get('ir.rule')
@@ -542,13 +542,13 @@ class share_wizard(osv.osv_memory):
                                 'groups': [(6,0,[group_id])],
                                 'domain_force': rule.domain, # evaluated version!
                             })
-                            self._logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
                             rule_obj.write(cr, 1, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
-                            self._logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+                            _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
 
     def _check_personal_rule_or_duplicate(self, cr, group_id, rule, context=None):
         """Verifies that the given rule only belongs to the given group_id, otherwise
@@ -567,7 +567,7 @@ class share_wizard(osv.osv_memory):
                                        'groups': [(6,0,[group_id])],
                                        'domain_force': rule.domain_force, # non evaluated!
                                })
-        self._logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force)
+        _logger.debug("Duplicating rule %s (%s) (domain: %s) for modified access ", rule.name, rule.id, rule.domain_force)
         # then disconnect from group_id:
         rule.write({'groups':[(3,group_id)]}) # disconnects, does not delete!
         return rule_obj.browse(cr, UID_ROOT, new_id, context=context)
@@ -602,7 +602,7 @@ class share_wizard(osv.osv_memory):
                     if restrict:
                         continue
                     else:
-                        self._logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain)
+                        _logger.debug("Ignoring sharing rule on model %s with domain: %s the same rule exists already", model_id, domain)
                         return
                 if restrict:
                     # restricting existing rules is done by adding the clause
@@ -614,7 +614,7 @@ class share_wizard(osv.osv_memory):
                     new_clause = expression.normalize(eval(domain, eval_ctx))
                     combined_domain = expression.AND([new_clause, org_domain])
                     rule.write({'domain_force': combined_domain, 'name': rule.name + _('(Modified)')})
-                    self._logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)
+                    _logger.debug("Combining sharing rule %s on model %s with domain: %s", rule.id, model_id, domain)
         if not rule_ids or not restrict:
             # Adding the new rule in the group is ok for normal cases, because rules
             # in the same group and for the same model will be combined with OR
@@ -625,7 +625,7 @@ class share_wizard(osv.osv_memory):
                 'domain_force': domain,
                 'groups': [(4,group_id)]
                 })
-            self._logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain)
+            _logger.debug("Created sharing rule on model %s with domain: %s", model_id, domain)
 
     def _create_indirect_sharing_rules(self, cr, current_user, wizard_data, group_id, fields_relations, context=None):
         rule_name = _('Indirect sharing filter created by user %s (%s) for group %s') % \
@@ -648,7 +648,7 @@ class share_wizard(osv.osv_memory):
                          group_id, model_id=model.id, domain=str(related_domain),
                          rule_name=rule_name, restrict=True, context=context)
         except Exception:
-            self._logger.exception('Failed to create share access')
+            _logger.exception('Failed to create share access')
             raise osv.except_osv(_('Sharing access could not be created'),
                                  _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
 
@@ -852,7 +852,7 @@ class share_wizard(osv.osv_memory):
             notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context)
     
     def send_emails(self, cr, uid, wizard_data, context=None):
-        self._logger.info('Sending share notifications by email...')
+        _logger.info('Sending share notifications by email...')
         mail_message = self.pool.get('mail.message')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.user_email:
@@ -885,7 +885,7 @@ class share_wizard(osv.osv_memory):
             msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.user_email, [email_to], subject, body, model='share.wizard', context=context))
         # force direct delivery, as users expect instant notification
         mail_message.send(cr, uid, msg_ids, context=context)
-        self._logger.info('%d share notification(s) sent.', len(msg_ids))
+        _logger.info('%d share notification(s) sent.', len(msg_ids))
 
     def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
         wizard = self.browse(cr, uid, ids[0], context)
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1c9bb011432..311422f1c07 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -37,10 +37,10 @@
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
                     <group>
-                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
                         </group>
-                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)">
                             <field name="email_1"/>
                             <field name="email_2"/>
                             <field name="email_3"/>
@@ -69,7 +69,7 @@
                         <field name="access_mode" invisible="1"/>
                     </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}">
-                        <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                        <separator string="An email notification with instructions has been sent to the following people:"/>
                         <field name="result_line_ids" nolabel="1" mode="tree">
                             <tree string="Summary">
                                 <field name="login"/>
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index d73bbf6d106..9f7cd8194f8 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-24 02:23+0000\n"
+"PO-Revision-Date: 2012-06-28 00:26+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-06-25 05:14+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -886,7 +886,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "スクラップ"
+msgstr "廃棄"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -1256,12 +1256,12 @@ msgstr "梱包の識別"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "梱包リスト："
 
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "他の移動待ち"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1269,25 +1269,25 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by production "
 "orders"
-msgstr ""
+msgstr "現在の製品のため、製造オーダーにより在庫移動は生成されるための元の場所として、デフォルトの代わりにこの在庫場所は使用されます。"
 
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "予想在庫変動"
 
 #. module: stock
 #: help:stock.move,price_unit:0
 msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
-msgstr ""
+msgstr "集荷確認（平均価格コスト方式が使われる時）の間に、ユーザによる製品コストの設定を記録するために使用される技術的な項目"
 
 #. module: stock
 #: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "ドラフト状態です。"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1299,12 +1299,12 @@ msgstr "これはあなたの全ての梱包リストです。梱包を選択す
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "返金 / 請求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr ""
+msgstr "店 1"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -1313,50 +1313,50 @@ msgstr ""
 #: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
 #: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
 msgid "_Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Ready"
-msgstr ""
+msgstr "準備完了"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr ""
+msgstr "カレンダービュー"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr ""
+msgstr "付加情報"
 
 #. module: stock
 #: field:stock.partial.move.line,move_id:0
 #: field:stock.partial.picking.line,move_id:0
 #: field:stock.return.picking.memory,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "移動"
 
 #. module: stock
 #: field:stock.location.product,from_date:0
 msgid "From"
-msgstr ""
+msgstr "開始"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "内部出荷は処理済です。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr ""
+msgstr "確認済、利用可能、完了の集荷のみ返却できます。"
 
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -1366,49 +1366,49 @@ msgstr "製造ロットのリビジョン"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr ""
+msgstr "内部集荷リスト"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0 view:stock.picking:0
 msgid "Waiting"
-msgstr ""
+msgstr "待機中"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Split"
-msgstr ""
+msgstr "分割"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "在庫集荷の検索"
 
 #. module: stock
 #: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "会社が場所に指定されていません。"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "利用可能集荷"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "一般的なIT仕入先"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "受領する在庫"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1419,61 +1419,63 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"リアルタイム在庫評価のために使用されます。仮想の場所（非内部タイプ）に設定されている場合、このアカウントは製品にセットされる一般的な在庫出力アカウントの代"
+"わりに、この場所から内部の場所に移動される製品の価値を保持するために使用されます。"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "集荷リスト："
 
 #. module: stock
 #: field:stock.inventory,date:0 field:stock.move,create_date:0
 #: field:stock.production.lot,date:0 field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr ""
+msgstr "在庫行ID"
 
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr ""
+msgstr "顧客または仕入先住所"
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr ""
+msgstr "梱包"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr ""
+msgstr "顧客の場所"
 
 #. module: stock
 #: code:addons/stock/stock.py:2312
 #, python-format
 msgid "You can only delete draft moves."
-msgstr ""
+msgstr "ドラフト移動のみ削除ができます。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "在庫分割行"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "在庫の場所の概観"
+msgstr "在庫場所の概要"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr ""
+msgstr "一般情報"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1489,34 +1491,34 @@ msgstr "下流追跡能力"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "請求書は作成されませんでした。"
 
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
-msgstr ""
+msgstr "棚（Y）"
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
-msgstr ""
+msgstr "アクティブな項目のチェックを外すことで、インコタームズを削除することなく非表示にできます。"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "請求書：%s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr ""
+msgstr "親の場所"
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1529,34 +1531,40 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"・ ドラフト：まだ確認されておらず、そして確認されるまでスケジュールされません。\n"
+"・ 確認済：製品が利用可能になるのを待っています。\n"
+"・ 利用可能：製品が確保され、単純に確認を待っています。\n"
+"・ 待機中：自動的に利用可能になる前に（例えばオーダー作成フロー）、処理のために他の移動を待っています。\n"
+"・ 完了：処理されたもの。もはや変更もキャンセルもできません。\n"
+"・ キャンセル済：キャンセルされたのもの。もはや確認できません。"
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
-msgstr ""
+msgstr "この場所が全ての会社間で共有される場合は、この項目を空にしましょう。"
 
 #. module: stock
 #: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr ""
+msgstr "廃棄するには正の数量を与えて下さい。"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "連鎖的なリードタイム"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
-msgstr ""
+msgstr "この製品を含む全ての移動と顧客の場所に行くのための製造ロットを強制的に定義します。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "出荷される在庫の請求書"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1568,63 +1576,68 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"在庫移動が作成された時にはドラフト状態です。\n"
+"　その後、スケジューラが製品を持つける事ができなかった場合は利用不可にセットされます。\n"
+"　製品が確保されると、利用可能にセットされます。\n"
+"　集荷が完了すると、状態は完了になります。\n"
+"移動が他の移動のために待ち状態になると、状態は待機中となります。"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr ""
+msgstr "仕入先の場所"
 
 #. module: stock
 #: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "廃棄されました。"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
 #: help:stock.partial.picking.line,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "単価が表現される通貨"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
 msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
-msgstr ""
+msgstr "集荷が分割される場合、この項目は既に処理された他の部分を含む集荷にリンクします。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr ""
+msgstr "在庫の統計値"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "計画月"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "製造ロットの検索"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "在庫評価アカウント（出庫）"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1633,81 +1646,81 @@ msgstr ""
 #: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "送付商品"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr ""
+msgstr "製品分類"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr ""
+msgstr "利用可能性のキャンセル"
 
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "この移動処理のためにスケジュールされた日"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr ""
+msgstr "移動の作成"
 
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "在庫評価アカウント（入庫）"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "棚 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "ロットの追跡"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "対応物の場所の属性"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "ローカル化"
 
 #. module: stock
 #: code:addons/stock/product.py:429
 #, python-format
 msgid "Delivered Qty"
-msgstr ""
+msgstr "配送数量"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
 #: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr ""
+msgstr "ロットに分割"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr ""
+msgstr "製造ロット番号"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -1723,7 +1736,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "計画日"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1732,79 +1745,79 @@ msgstr ""
 #: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
 #: view:stock.picking:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr ""
+msgstr "在庫場所"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr ""
+msgstr "統合はドラフトの棚卸でのみ許されます。"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "ダッシュボード"
 
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "ロット番号"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr ""
+msgstr "倉庫ダッシュボード"
 
 #. module: stock
 #: code:addons/stock/stock.py:513
 #, python-format
 msgid "You can not remove a lot line !"
-msgstr ""
+msgstr "たくさんの行を削除できません。"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
 #: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "廃棄製品"
 
 #. module: stock
 #: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr ""
+msgstr "%s 状態である集荷を削除できません。"
 
 #. module: stock
 #: view:stock.inventory.line.split:0 view:stock.move.consume:0
 #: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "集荷の戻し"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "製造ロットに分割"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
@@ -1821,17 +1834,17 @@ msgstr ""
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "場所"
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "情報"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "送付先住所："
 
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
@@ -1848,12 +1861,12 @@ msgstr ""
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Provide the quantities of the returned products."
-msgstr ""
+msgstr "返品製品の数量を与えます。"
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "原価"
 
 #. module: stock
 #: view:product.product:0 field:product.product,valuation:0
@@ -1863,24 +1876,24 @@ msgstr "在庫評価"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "本日の計画オーダー"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Process Later"
-msgstr ""
+msgstr "処理後"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr ""
+msgstr "現在のパートナから受領した製品の元の場所として、デフォルトの代わりにこの在庫場所が使用されます。"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr ""
+msgstr "所有者の住所"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1897,17 +1910,17 @@ msgstr ""
 msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
-msgstr ""
+msgstr "仕訳帳エントリーが作成できません。この製品に定義された出力アカウントとこの製品の分類の検証アカウントが同一です。"
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "計画リードタイム（日数）"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr ""
+msgstr "価格"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -1922,7 +1935,7 @@ msgstr "在庫の検索"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "ロット追跡による在庫レポート"
 
 #. module: stock
 #: code:addons/stock/stock.py:2122
@@ -1930,25 +1943,25 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
-msgstr ""
+msgstr "この製品またはその分類のために定義された在庫入力アカウントがありません：%s（ID：%d）"
 
 #. module: stock
 #: code:addons/stock/product.py:419
 #, python-format
 msgid "Received Qty"
-msgstr ""
+msgstr "受領済数量"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "内部参照"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
 msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
-msgstr ""
+msgstr "このシリアル番号が表示された時に付加されるオプションのプレフィックス：PREFIX/SERIAL [INT_REF]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
@@ -1961,12 +1974,12 @@ msgstr "在庫のインポート"
 #: field:stock.incoterms,name:0 field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr ""
+msgstr "在庫"
 
 #. module: stock
 #: help:stock.partial.move,hide_tracking:0
@@ -1974,7 +1987,7 @@ msgstr ""
 msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
-msgstr ""
+msgstr "この項目は内部目的のためのものです。製品シリアル番号列を move_ids項目上に表示するかどうかを決定するために使用されます。"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1987,33 +2000,33 @@ msgstr "棚卸を行う時に、在庫移動のための元の場所が生成さ
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "在庫可能"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "リアルタイム（自動）"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "物流出荷単位：パレット、箱、包み…"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "顧客の場所"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr ""
+msgstr "適用"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "]"
-msgstr ""
+msgstr "］"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
@@ -2023,19 +2036,19 @@ msgstr "在庫場所"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "合計価値"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
 msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
-msgstr "連鎖タイプが透明でない場合（空のままの時は仕訳帳は使用されません）、連鎖移動の中の在庫仕訳帳が書かれます。"
+msgstr "連鎖タイプが明確でない場合（空のままの時は仕訳帳は使用されません）、連鎖移動の中の在庫仕訳帳が書かれます。"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "作成"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2047,59 +2060,59 @@ msgstr "現在在庫の分析（既に処理された移動のみ）"
 #: field:stock.partial.move.line,cost:0
 #: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "コスト"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
-msgstr ""
+msgstr "在庫入力アカウント"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "出荷タイプの定義、商品は入ってくるのか出て行くのか"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr ""
+msgstr "倉庫管理"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "部分配達"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "自動段階追加なし"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "在庫場所分析"
 
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
-msgstr ""
+msgstr "移動日：移動が完了するまでの予定日。実際の移動処理の日付。"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr ""
+msgstr "連鎖した場所"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -2110,90 +2123,90 @@ msgstr "棚卸損失"
 #: code:addons/stock/stock.py:1341
 #, python-format
 msgid "Document"
-msgstr ""
+msgstr "ドキュメント"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr ""
+msgstr "集荷リストの入力"
 
 #. module: stock
 #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
 #: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: stock
 #: code:addons/stock/product.py:175
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "製品： "
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
-msgstr ""
+msgstr "この製品を含む全ての移動と製造オーダーによって生成のための製造ロットの指定を強制します。"
 
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "更新"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "ドラフトに設定"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr ""
+msgstr "在庫仕訳帳"
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr ""
+msgstr "その他"
 
 #. module: stock
 #: code:addons/stock/product.py:89
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
-msgstr ""
+msgstr "標準価格と新価格の間に違いが見つかりません。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr ""
+msgstr "廃棄済"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr ""
+msgstr "製品 "
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "入庫ロットの追跡"
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "倉庫のボード"
 
 #. module: stock
 #: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "将来の数量"
 
 #. module: stock
 #: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2488,7 +2501,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr ""
+msgstr "廃棄移動"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -3330,7 +3343,7 @@ msgstr ""
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
-msgstr ""
+msgstr "廃棄 / 破損品を置くためにこの場所を使用する場合は、このボックスをチェックします。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3938,7 +3951,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "廃棄場所"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 7e18809fc1a..3ad4b8e5914 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -65,15 +65,15 @@ class stock_config_settings(osv.osv_memory):
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
         'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
             implied_group='stock.group_inventory_valuation',
-            help="""This allows to split stock inventory lines according to serial numbers."""),
+            help="""Allows to configure inventory valuations on products and product categories."""),
         'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
             implied_group='stock.group_locations',
             help="""This allows to configure and use multiple stock locations and warehouses,
                 instead of having a single default one."""),
-        'group_product_variant': fields.boolean("Product Variant",
+        'group_product_variant': fields.boolean("Support Multiple Variants per Product",
             implied_group='product.group_product_variant',
-            help="""This allows to configure and use Product Variant."""),                
-        'decimal_precision': fields.integer('Decimal Precision on Weight'),
+            help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),                
+        'decimal_precision': fields.integer('Decimal Precision on Weights', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 77bf887c13d..2f3a4214af8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -9,33 +9,41 @@
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
-                    <group col="4">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="group_stock_production_lot"/>
-                        <field name="module_product_expiry"
-                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                        <newline/>
-                        <field name="group_stock_tracking_lot"/>
-
-                        <separator string="Logistics" colspan="4"/>
-                        <field name="group_stock_multiple_locations"/>
-                        <field name="module_stock_location"/>
-                        <field name="module_stock_invoice_directly"/>
-                        <field name="decimal_precision"/>
-
-                        <separator string="Products" colspan="4"/>
-                        <field name="group_stock_packaging"/>
-                        <field name="group_stock_inventory_valuation"/>
-                        <field name="group_uom"/>
-                        <field name="group_uos"/>
-                        <field name="group_product_variant"/>
-
-                        <separator string="Partners" colspan="4"/>
-                        <field name="module_claim_from_delivery"/>
-                    </group>
+                    <sheet>
+                        <group string="Traceability">
+                            <field name="group_stock_production_lot"/>
+                            <field name="group_stock_tracking_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        </group>
+                        <group string="Logistics">
+                            <group>
+                                <field name="group_stock_multiple_locations"/>
+                                <field name="module_stock_invoice_directly"/>
+                            </group>
+                            <group>
+                                <field name="module_stock_location"/>
+                                <field name="decimal_precision"/>
+                            </group>
+                        </group>
+                        <group string="Products">
+                            <group>
+                                <field name="group_stock_packaging"/>
+                                <field name="group_uom"/>
+                                <field name="group_uos"/>
+                            </group>
+                            <group>
+                                <field name="group_stock_inventory_valuation"/>
+                                <field name="group_product_variant"/>
+                            </group>
+                        </group>
+                        <group string="Partners">
+                            <field name="module_claim_from_delivery"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a391f117393..593dc7eb9f3 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -12,7 +12,11 @@ access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_
 access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,0,0,0
 access_stock_tracking_sales_user,stock.tracking sales.user,model_stock_tracking,base.group_sale_salesman,1,1,1,0
 access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1
+access_stock_picking_in_user,stock.picking.in,model_stock_picking_in,stock.group_stock_user,1,1,1,1
+access_stock_picking_out_user,stock.picking.out,model_stock_picking_out,stock.group_stock_user,1,1,1,1
 access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,0,0
+access_stock_picking_in_manager,stock.picking.in manager,model_stock_picking_in,stock.group_stock_manager,1,0,0,0
+access_stock_picking_out_manager,stock.picking.out manager,model_stock_picking_out,stock.group_stock_manager,1,0,0,0
 access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,0,0,0
 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87cf9ade130..a279b8bea6c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -33,7 +33,7 @@ import tools
 from tools import float_compare
 import decimal_precision as dp
 import logging
-
+_logger = logging.getLogger(__name__)
 
 #----------------------------------------------------------
 # Incoterms
@@ -419,9 +419,8 @@ class stock_location(osv.osv):
                     # so we ROLLBACK to the SAVEPOINT to restore the transaction to its earlier
                     # state, we return False as if the products were not available, and log it:
                     cr.execute("ROLLBACK TO stock_location_product_reserve")
-                    logger = logging.getLogger('stock.location')
-                    logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
-                    logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
+                    _logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
+                    _logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
                     return False
 
             # XXX TODO: rewrite this with one single query, possibly even the quantity conversion
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 324aeb0dcd2..e6f3b8d4218 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -29,7 +29,7 @@ from tools.translate import _
 import logging
 import decimal_precision as dp
 
-_logger = logging.getLogger('mps') 
+_logger = logging.getLogger(__name__) 
 
 
 def rounding(fl, round_value):
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index 6242a328e26..28ea57f11f6 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -996,7 +996,7 @@ msgstr ""
 
 #. module: survey
 #: field:survey,send_response:0
-msgid "E-mail Notification on Answer"
+msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
@@ -1211,7 +1211,7 @@ msgstr ""
 
 #. module: survey
 #: field:survey.request,email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: survey
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index cc65a2ec2e5..71f6686a67f 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -66,7 +66,7 @@ class survey(osv.osv):
         'note': fields.text('Description', size=128),
         'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
-        'send_response': fields.boolean('E-mail Notification on Answer'),
+        'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
@@ -699,7 +699,7 @@ class survey_request(osv.osv):
     _columns = {
         'date_deadline': fields.date("Deadline date"),
         'user_id': fields.many2one("res.users", "User"),
-        'email': fields.char("E-mail", size=64),
+        'email': fields.char("Email", size=64),
         'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response': fields.many2one('survey.response', 'Answer'),
         'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1)
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 8c7fabca427..15e2b56a1be 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -435,7 +435,7 @@ class survey_question_wiz(osv.osv_memory):
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
-        If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
+        If any user give answer of survey then last create report of this answer and if 'Email Notification on Answer' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
         """
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index ad055c70c19..3df1f2af713 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -191,7 +191,7 @@ class survey_send_invitation(osv.osv_memory):
         if skipped:
             note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
         if error:
-            note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
+            note += 'Email not send successfully:\n====================\n%s\n' % (error)
         context.update({'note' : note})
         return {
             'view_type': 'form',
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index 1d0c1e3acb9..e4615907c79 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -27,6 +27,7 @@ import pooler
 import tools
 from osv import fields, osv
 from openerp import SUPERUSER_ID
+_logger = logging.getLogger(__name__)
 
 class CompanyLDAP(osv.osv):
     _name = 'res.company.ldap'
@@ -107,8 +108,7 @@ class CompanyLDAP(osv.osv):
         except ldap.INVALID_CREDENTIALS:
             return False
         except ldap.LDAPError, e:
-            logger = logging.getLogger('orm.ldap')
-            logger.error('An LDAP exception occurred: %s', e)
+            _logger.error('An LDAP exception occurred: %s', e)
         return entry
         
     def query(self, conf, filter, retrieve_attributes=None):
@@ -135,7 +135,6 @@ class CompanyLDAP(osv.osv):
         """
 
         results = []
-        logger = logging.getLogger('orm.ldap')
         try:
             conn = self.connect(conf)
             conn.simple_bind_s(conf['ldap_binddn'] or '',
@@ -144,9 +143,9 @@ class CompanyLDAP(osv.osv):
                                      filter, retrieve_attributes, timeout=60)
             conn.unbind()
         except ldap.INVALID_CREDENTIALS:
-            logger.error('LDAP bind failed.')
+            _logger.error('LDAP bind failed.')
         except ldap.LDAPError, e:
-            logger.error('An LDAP exception occurred: %s', e)
+            _logger.error('An LDAP exception occurred: %s', e)
         return results
 
     def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry):
@@ -188,8 +187,7 @@ class CompanyLDAP(osv.osv):
             if res[1]:
                 user_id = res[0]
         elif conf['create_user']:
-            logger = logging.getLogger('orm.ldap')
-            logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
+            _logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
             user_obj = self.pool.get('res.users')
             values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
             if conf['user']:
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
index e2deff8d406..e39f7870249 100644
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -2,7 +2,7 @@
 .oe_systray_shortcuts {
     margin: 3px;
 }
-.oe-shortcut-toggle {
+.oe_shortcuts_toggle {
     height: 20px;
     margin-top: 3px;
     padding: 0;
@@ -12,10 +12,10 @@
     background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
     float: left;
 }
-.oe-shortcut-remove{
+.oe_shortcuts_remove{
     background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
 }
-.oe-shortcuts {
+.oe_shortcuts {
     position: absolute;
     margin: 0;
     padding: 6px 15px;
@@ -25,7 +25,7 @@
     height: 17px;
     line-height: 1.2;
 }
-.oe-shortcuts ul {
+.oe_shortcuts ul {
     display: block;
     overflow: hidden;
     list-style: none;
@@ -33,7 +33,7 @@
     padding: 0;
     margin: 0;
 }
-.oe-shortcuts li {
+.oe_shortcuts li {
     cursor: pointer;
     display: -moz-inline-stack;
     display: inline-block;
@@ -47,10 +47,10 @@
     vertical-align: top;
 }
 
-.oe-shortcuts li:hover {
+.oe_shortcuts li:hover {
     background-color: #666;
 }
-.oe-shortcuts li:first-child {
+.oe_shortcuts li:first-child {
     border-left: none;
     padding-left: 0;
 }
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index ecd07e35c72..a64675c5211 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -118,16 +118,16 @@ instance.web.ViewManagerAction.include({
         var shortcuts_menu = instance.webclient.user_menu.shortcuts;
         var grandparent = this.getParent() && this.getParent().getParent();
         // display shortcuts if on the first view for the action
-        var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
+        var $shortcut_toggle = this.$element.find('.oe_shortcuts_toggle');
         if (!this.action.name ||
                 !(view.view_type === this.views_src[0].view_type
                     && view.view_id === this.views_src[0].view_id)) {
             $shortcut_toggle.hide();
             return;
         }
-        $shortcut_toggle.toggleClass('oe-shortcut-remove', shortcuts_menu.has(self.session.active_id));
+        $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
         $shortcut_toggle.unbind("click").click(function() {
-            if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
+            if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
                 shortcuts_menu.trigger('remove', self.session.active_id);
             } else {
                 shortcuts_menu.trigger('add', {
@@ -137,7 +137,7 @@ instance.web.ViewManagerAction.include({
                     'name': self.action.name
                 });
             }
-            $shortcut_toggle.toggleClass("oe-shortcut-remove");
+            $shortcut_toggle.toggleClass("oe_shortcuts_remove");
         });
     }
 });
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index 8236b43cea9..ce4d61e66bd 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -17,7 +17,7 @@
 </t>
 <t t-extend="ViewManagerAction">
     <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+        <a t-if="widget.flags.display_title !== false" class="oe_shortcuts_toggle" title="Add / Remove Shortcut..."
             href="javascript: void(0)"> </a>
     </t>
 </t>