diff --git a/addons/account/account.py b/addons/account/account.py
index c37cc7dfb5e..86e8ddfaee5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -708,7 +708,7 @@ class account_journal(osv.osv):
 
         return self.name_get(cr, user, ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, type, currency):
+    def onchange_type(self, cr, uid, ids, type, currency, context=None):
         obj_data = self.pool.get('ir.model.data')
         user_pool = self.pool.get('res.users')
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 51f0d43c350..f8f482dfdda 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -310,7 +310,7 @@
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Invoices" type="action" icon="gtk-print"/>
+                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print"/>
                                 </group>
                             </group>
                         </page>
@@ -466,7 +466,7 @@
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
-            <field name="name">Credit Memo</field>
+            <field name="name">Customer Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -474,7 +474,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Credit Memo helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
+            <field name="help">This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 932a8799c36..2b12b6f91c5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2446,7 +2446,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection" groups="base.group_extended"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 2a9f24e953c..a71884e6d54 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -163,6 +163,12 @@ msgstr ""
 msgid "If the active field is set to False, it will allow you to hide the payment term without removing it."
 msgstr ""
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
@@ -195,16 +201,6 @@ msgstr ""
 msgid "Tax Templates"
 msgstr ""
 
-#. module: account
-#: view:account.invoice.report:0
-msgid "supplier"
-msgstr ""
-
-#. module: account
-#: model:account.journal,name:account.refund_expenses_journal
-msgid "Expenses Credit Notes Journal - (test)"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
@@ -647,9 +643,13 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+msgid "Receivable Accounts"
 msgstr ""
 
 #. module: account
@@ -829,11 +829,6 @@ msgstr ""
 msgid "Due"
 msgstr ""
 
-#. module: account
-#: report:account.overdue:0
-msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
-msgstr ""
-
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total_tax:0
@@ -862,6 +857,11 @@ msgstr ""
 msgid "Consolidation"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.entries.report:0
@@ -1220,6 +1220,9 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.menu_partners
+#: model:ir.ui.menu,name:account.menu_partners_partners
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1374,6 +1377,11 @@ msgstr ""
 msgid "Template for Fiscal Position"
 msgstr ""
 
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
@@ -1798,16 +1806,6 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-msgid "Receivable Accounts"
-msgstr ""
-
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
@@ -1852,11 +1850,6 @@ msgstr ""
 msgid "Open Entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
-msgstr ""
-
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
@@ -1886,11 +1879,6 @@ msgstr ""
 msgid "Validations"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.close_journal
-msgid "End of Year"
-msgstr ""
-
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
@@ -2147,6 +2135,11 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
+msgstr ""
+
 #. module: account
 #: field:account.tax,base_sign:0
 #: field:account.tax,ref_base_sign:0
@@ -3291,6 +3284,12 @@ msgstr ""
 msgid "#Entries"
 msgstr ""
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
@@ -3346,11 +3345,6 @@ msgstr ""
 msgid "Journal for analytic entries"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree3
-msgid "Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form."
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 #: model:process.node,name:account.process_node_accountingentries0
@@ -3641,6 +3635,7 @@ msgstr ""
 #: selection:account.common.partner.report,target_move:0
 #: selection:account.common.report,target_move:0
 #: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
 #: selection:account.partner.balance,target_move:0
 #: selection:account.partner.ledger,target_move:0
 #: selection:account.pl.report,target_move:0
@@ -3770,6 +3765,11 @@ msgstr ""
 msgid "Account Journal Select"
 msgstr ""
 
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
@@ -3897,20 +3897,9 @@ msgid "Closing balance based on cashBox"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/wizard/account_invoice_state.py:0
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
-#: code:addons/account/wizard/account_state_open.py:0
-#: code:addons/account/wizard/account_validate_account_move.py:0
-#, python-format
-msgid "Warning"
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
 msgstr ""
 
 #. module: account
@@ -4022,6 +4011,13 @@ msgstr ""
 msgid "Invoices"
 msgstr ""
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,user_id:0
@@ -4255,6 +4251,7 @@ msgstr ""
 #: field:account.general.journal,target_move:0
 #: report:account.general.ledger:0
 #: report:account.journal.period.print:0
+#: field:account.move.journal,target_move:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,target_move:0
 #: field:account.partner.ledger,target_move:0
@@ -4291,12 +4288,6 @@ msgstr ""
 msgid "Python Code (reverse)"
 msgstr ""
 
-#. module: account
-#: view:account.journal.column:0
-#: model:ir.model,name:account.model_account_journal_column
-msgid "Journal Column"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
 msgid "Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them."
@@ -4560,11 +4551,6 @@ msgstr ""
 msgid "Bank Journal "
 msgstr ""
 
-#. module: account
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
@@ -4887,6 +4873,8 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:0
+#, python-format
 msgid "Write-Off"
 msgstr ""
 
@@ -4901,16 +4889,17 @@ msgid "account.analytic.line.extended"
 msgstr ""
 
 #. module: account
-#: selection:account.bank.statement.line,type:0
-#: view:account.invoice:0
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Supplier"
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Bilanzkonten - Aktiva - Vermögenskonten"
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Supplier"
 msgstr ""
 
 #. module: account
@@ -5853,6 +5842,7 @@ msgstr ""
 #: selection:account.common.partner.report,target_move:0
 #: selection:account.common.report,target_move:0
 #: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
 #: selection:account.partner.balance,target_move:0
 #: selection:account.partner.ledger,target_move:0
 #: selection:account.pl.report,target_move:0
@@ -5963,11 +5953,6 @@ msgstr ""
 msgid "Child Codes"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.refund_sales_journal
-msgid "Sales Credit Note Journal - (test)"
-msgstr ""
-
 #. module: account
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
@@ -5992,8 +5977,9 @@ msgid "Sales"
 msgstr ""
 
 #. module: account
-#: model:account.journal,name:account.cash_journal
-msgid "Cash Journal - (test)"
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
 msgstr ""
 
 #. module: account
@@ -6045,12 +6031,6 @@ msgstr ""
 msgid "Taxes:"
 msgstr ""
 
-#. module: account
-#: help:account.invoice,partner_bank_id:0
-msgid "The partner bank account to pay\n"
-"Keep empty to use the default"
-msgstr ""
-
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
@@ -6100,11 +6080,6 @@ msgstr ""
 msgid "Lines"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.bank_journal
-msgid "Bank Journal - (test)"
-msgstr ""
-
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
@@ -6131,11 +6106,6 @@ msgstr ""
 msgid "Parent Account Template"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Erfolgskonten - Erlöse"
-msgstr ""
-
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
@@ -6212,6 +6182,11 @@ msgstr ""
 msgid "Unknown Partner"
 msgstr ""
 
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr ""
+
 #. module: account
 #: help:account.journal,centralisation:0
 msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
@@ -6247,6 +6222,11 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid "Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number."
+msgstr ""
+
 #. module: account
 #: help:account.tax,domain:0
 #: help:account.tax.template,domain:0
@@ -6354,6 +6334,11 @@ msgstr ""
 msgid "You can not have two open register for the same journal"
 msgstr ""
 
+#. module: account
+#: report:account.invoice:0
+msgid "Must be after setLang()"
+msgstr ""
+
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
@@ -6447,11 +6432,6 @@ msgstr ""
 msgid "No piece number !"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.expenses_journal
-msgid "Expenses Journal - (test)"
-msgstr ""
-
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
@@ -6526,11 +6506,6 @@ msgstr ""
 msgid "Sale Taxes"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.sales_journal
-msgid "Sales Journal - (test)"
-msgstr ""
-
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
 #: selection:account.analytic.journal,type:0
@@ -6600,6 +6575,16 @@ msgstr ""
 msgid "  number of days: 14"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
@@ -6691,11 +6676,6 @@ msgstr ""
 msgid "Amount (in words) :"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_other
-msgid "Jahresabschlusskonten u. Statistik"
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: view:account.entries.report:0
@@ -6928,11 +6908,6 @@ msgstr ""
 msgid "Accounting and Financial Management"
 msgstr ""
 
-#. module: account
-#: model:process.node,name:account.process_node_manually0
-msgid "Manually"
-msgstr ""
-
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
 #: view:account.bank.statement:0
@@ -7055,6 +7030,11 @@ msgstr ""
 msgid "Account Common Report"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid "This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form."
+msgstr ""
+
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
@@ -7315,6 +7295,16 @@ msgstr ""
 msgid "Unique number of the invoice, computed automatically when the invoice is created."
 msgstr ""
 
+#. module: account
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
@@ -8566,8 +8556,13 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
 msgstr ""
 
 #. module: account
@@ -8704,8 +8699,8 @@ msgid "Account Tax Code Template"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_expense
-msgid "Erfolgskonten - Aufwendungen"
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
 msgstr ""
 
 #. module: account
@@ -8760,11 +8755,6 @@ msgstr ""
 msgid "Billing"
 msgstr ""
 
-#. module: account
-#: model:account.journal,name:account.check_journal
-msgid "Checks Journal - (test)"
-msgstr ""
-
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 7787a7e9b1c..a583f811d09 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:21+0000\n"
+"PO-Revision-Date: 2010-12-17 13:40+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: 2010-12-17 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 100355eca62..6611129c867 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 22:01+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 14:42+0000\n"
+"Last-Translator: Carlos-smile <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: 2010-12-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 862817238aa..d8dba57a0ba 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-23 02:15+0000\n"
+"PO-Revision-Date: 2010-12-20 03:27+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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: 2010-12-17 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4065,8 +4065,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"Esto configurara automaticamente su plan de cuentas, cuentas de banco "
-"impuestos y diarios deacuerdo con la plantilla seleccionada."
+"Esto configurará automaticamente tu plan de cuentas, cuentas de banco, "
+"impuestos y diarios deacuerdo con la plantilla seleccionada"
 
 #. module: account
 #: field:account.tax,price_include:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 6aedf0c4d09..801d0671f52 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.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: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:17+0000\n"
+"PO-Revision-Date: 2010-12-18 23:18+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: 2010-12-17 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -425,7 +425,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2187,6 +2187,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Le plan de comptes par défaut correspond au pays sélectionné. Si aucun plan "
+"de comptes certifiés n'existe pour le pays spécifié, un plan de compte "
+"générique pourra être installé et sera sélectionné par défaut."
 
 #. module: account
 #: view:account.account.type:0
@@ -3728,7 +3731,7 @@ msgstr "Nom"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Rapport du solde de la balance agée"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -5528,7 +5531,7 @@ msgstr "Correspondance fiscale"
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "État ouvert du compte"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5749,6 +5752,12 @@ msgid ""
 "all lines of your statement. When you are in the Payment column of the a "
 "line, you can press F1 to open the reconciliation form."
 msgstr ""
+"Un relevé bancaire est un résumé de toutes les transactions financières qui "
+"ont été émises durant une période donnée sur un compte de dépôt, une carte "
+"de crédit, ou tout autre type de compte. Commencez par remplir les balances "
+"d'ouverture et de fermeture, puis enregistrer toutes les lignes de votre "
+"relevé. Quand vous êtes dans la colonne paiement de la ligne, vous pouvez "
+"appuyer sur F1 pour ouvrir le formulaire de rapprochement."
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5990,7 +5999,7 @@ msgstr "Compte de crédit par défaut"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configurer votre plan de comptes"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6065,6 +6074,8 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indique si le montant de taxes doit être inclus dans le montant de base pour "
+"le calcul des taxes suivantes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6138,6 +6149,10 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Depuis cette vue, vous avez une analyse des différentes entrées analytiques "
+"suivant le compte analytique que vous avez défini en fonction de vos "
+"besoins. Utiliser l'outil de recherche pour analyser les informations à "
+"propos des entrées analytiques générées dans le système."
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -6189,7 +6204,7 @@ msgstr "Centralisation"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Générer votre plan de comptes depuis un modèle de plan"
 
 #. module: account
 #: view:account.account:0
@@ -6326,6 +6341,9 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Le rapprochement bancaire consiste à vérifier que votre relevé bancaire "
+"correspond avec les écritures (ou enregistrements) comptables dans votre "
+"système."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6380,6 +6398,8 @@ msgstr "Code Python"
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
+"Veuillez définir le compte de réserve et le compte de profit/perte pour la "
+"société de l'utilisateur courant !"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6387,6 +6407,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Cochez cette case si vous voulez autoriser l'annulation des écritures ou des "
+"factures associées à ce journal."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6428,6 +6450,9 @@ msgid ""
 "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
 "o.journal_id.currency and o.journal_id.currency.symbol"
 msgstr ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -7085,7 +7110,7 @@ msgstr "  jour du mois = -1"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 
 #. module: account
 #: help:account.journal,type:0
@@ -7557,7 +7582,7 @@ msgstr "Écriture automatique"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de code de taxe récursif."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7810,7 +7835,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Paiement"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7960,7 +7985,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sous total"
 
 #. module: account
 #: report:account.invoice:0
@@ -7989,7 +8014,7 @@ msgstr "Date d'échéance"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Fournisseurs"
 
 #. module: account
 #: constraint:account.move:0
@@ -8015,7 +8040,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistiques"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -8040,7 +8065,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Factures impayées"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8079,7 +8104,7 @@ msgstr "Plan de comptes analytiques"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Divers"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -8216,14 +8241,14 @@ msgstr ""
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contrats"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "inconnu"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -8415,7 +8440,7 @@ msgstr ""
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8510,7 +8535,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Impayée"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8545,7 +8570,7 @@ msgstr "Comptes débiteurs"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Particulars"
-msgstr ""
+msgstr "Particuliers"
 
 #. module: account
 #: report:account.invoice:0
@@ -8606,7 +8631,7 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Modifier"
 
 #. module: account
 #: view:account.account.type:0
@@ -8633,7 +8658,7 @@ msgstr "Payable"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Cette année"
 
 #. module: account
 #: view:board.board:0
@@ -8681,7 +8706,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Signature du destinataire"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8695,7 +8720,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Saisie manuelle"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8772,7 +8797,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: account
 #: view:account.account:0
@@ -8930,7 +8955,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Gestion des paiements fournisseurs"
 
 #. module: account
 #: field:account.period,name:0
@@ -8955,7 +8980,7 @@ msgstr "Actif"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Erreur inconnue"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -9027,7 +9052,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Through :"
-msgstr ""
+msgstr "À travers :"
 
 #. module: account
 #: view:account.general.journal:0
@@ -9096,7 +9121,7 @@ msgstr "Périodes"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Taux de change"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -9110,7 +9135,7 @@ msgstr "Saisir le pourcentage entre 0-1"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9197,7 +9222,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Normal"
 
 #. module: account
 #: view:account.account:0
@@ -9211,7 +9236,7 @@ msgstr "Type interne"
 #. module: account
 #: report:account.move.voucher:0
 msgid "State:"
-msgstr ""
+msgstr "État :"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9295,7 +9320,7 @@ msgstr "Base de la taxe"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Profit"
-msgstr ""
+msgstr "Profit net"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9323,7 +9348,7 @@ msgstr "JNRL"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  montant : 0,02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9464,7 +9489,7 @@ msgstr "Journal analytique"
 #. module: account
 #: report:account.move.voucher:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Sur le compte de :"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9536,12 +9561,12 @@ msgstr ""
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de modèles de compte récursifs"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Récurrent"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9609,7 +9634,7 @@ msgstr "Comptes de résultats - Dépenses"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9653,7 +9678,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Facturation"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 9cc11e4c2aa..1352e98464d 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-15 20:51+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-19 19:48+0000\n"
+"Last-Translator: Servabit OpenERP team <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: 2010-12-17 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Sistema di pagamento"
 
 #. module: account
 #: view:account.journal:0
@@ -103,6 +103,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Il report su perdite e profitti fornisce una visuale dell'andamento della "
+"ditta in un unico documento"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -176,6 +178,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Se il campo e' impostato come 'falso', permette di nascondere i termini di "
+"pagamento senza eliminarli."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -380,7 +384,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -426,7 +430,7 @@ msgstr "Rimborso acuisti"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situazione di chiusura/apertura"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -559,7 +563,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Conto utlilizzato in questo registro"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -682,7 +686,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "La sequenza principale deve essere diversa dalla attuale!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -1256,7 +1260,7 @@ msgstr "Incluso nell'imponibile"
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Analisi registrazioni"
 
 #. module: account
 #: field:account.account,level:0
@@ -1332,7 +1336,7 @@ msgstr "Opzioni Report"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Analisi scritture registro"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1549,6 +1553,8 @@ msgstr "Ricerca movimenti bancari"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Valore del credito o debito  errato (credito+debito deve essere maggiore di "
+"\"0\")!"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1699,6 +1705,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Il campo, impostato come \"falso\", permette di nascondere il periodo "
+"fiscale del registro senza eliminarlo."
 
 #. module: account
 #: view:res.partner:0
@@ -1708,7 +1716,7 @@ msgstr "Debito fornitore"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Quantita' relativa alle registrazioni (opzionale)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1787,6 +1795,7 @@ msgstr "Importo credito"
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
 msgstr ""
+"Non si puo' inserire una voce per una registrazione su un conto chiuso."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1806,7 +1815,7 @@ msgstr "Conto per riserve e profitti o perdite"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valore di credito o debito errato nella registrazione contabile !"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1839,7 +1848,7 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Voce nel registro"
 
 #. module: account
 #: view:account.tax:0
@@ -1859,7 +1868,7 @@ msgstr ""
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Errore! Non è possibile creare aziende ricorsive."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1964,7 +1973,7 @@ msgstr "Imagine"
 #: selection:account.partner.ledger,result_selection:0
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Conti di crediti su clienti"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1983,6 +1992,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Se il campo viene impostato a 'falso' permette di nascondere la tassa senza "
+"eliminarla."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2051,7 +2062,7 @@ msgstr "Gennaio"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Verifiche"
 
 #. module: account
 #: model:account.journal,name:account.close_journal
@@ -2123,6 +2134,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Il piano dei conti  di default corrisponde al paese scelto. Se manca un "
+"piano dei conti certificato per il paese ne viene installato uno generico di "
+"default."
 
 #. module: account
 #: view:account.account.type:0
@@ -2161,7 +2175,7 @@ msgstr "In Esecuzione"
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Conto di ricavo"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -2183,12 +2197,12 @@ msgstr "Registrazioni ordinate per"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Cambiare in"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "Quantita' di prodotto "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
@@ -2443,11 +2457,13 @@ msgstr ""
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Quesrto report fornisce una visione generale della situazione di uno "
+"specifico registro"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Errore! Non si possono creare categorie ricorsive."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2510,7 +2526,7 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Label"
 
 #. module: account
 #: view:account.tax:0
@@ -2620,6 +2636,8 @@ msgid ""
 "given a period and a journal, the sum of debit will always be equal to the "
 "sum of credit, so there is no point to display it"
 msgstr ""
+"Dato un periodo ed un registro, la somma del dare risulta sempre eguale alla "
+"somma dell'avere."
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2712,6 +2730,7 @@ msgstr "Il saldo calcolato (%.2f) è diverso da quello inserito. (%.2f)"
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
 msgstr ""
+"Le registrazioni di pagamento sono il secondo input nella riconciliazione."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2738,6 +2757,8 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"La quantita' (opzionale) relativa alla registrazione, non serve ai fini "
+"legali, ma e' utile nei report."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2767,6 +2788,7 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"usato per le registrazioni di riconciliazione, ma non da usare altrove."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2997,7 +3019,7 @@ msgstr "Inizia il"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Mastrino  partner"
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -3230,7 +3252,7 @@ msgstr "anno"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Firma autorizzata"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3317,12 +3339,12 @@ msgstr ""
 #. module: account
 #: report:account.general.ledger:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Controparte"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dati Fatturazione"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3341,7 +3363,7 @@ msgstr "Categoria del prodotto"
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -3560,7 +3582,7 @@ msgstr "Qtà"
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Nome indirizzo del contatto"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3570,7 +3592,7 @@ msgstr "Causa"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Ricerca registraioni analitiche"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3582,6 +3604,8 @@ msgstr "Conto di debito"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Non si possono creare scritture in registri differenti con una stessa "
+"registrazione."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3599,7 +3623,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Bilancio del conto"
 
 #. module: account
 #: report:account.invoice:0
@@ -3611,7 +3635,7 @@ msgstr "Prezzo unitario"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "Non posso cambiare la tassa !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -3625,6 +3649,7 @@ msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
 "defined !"
 msgstr ""
+"Non sono state definite voci per i termini di pagamento del fornitore !"
 
 #. module: account
 #: view:account.state.open:0
@@ -3639,7 +3664,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "Corrispondenza"
 
 #. module: account
 #: field:account.account,name:0
@@ -3668,12 +3693,12 @@ msgstr "Data effettiva"
 #: code:addons/account/wizard/account_move_bank_reconcile.py:0
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "Codifica standard"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Registro per voci analitiche"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -3703,11 +3728,13 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Inserisce la colonna della valuta nel report, in caso la valuta sia diversa "
+"da quella della ditta."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Contabilita' generale"
 
 #. module: account
 #: report:account.overdue:0
@@ -3740,7 +3767,7 @@ msgstr "Imposta come bozza"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Voci di registrazioni periodiche"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
@@ -3756,6 +3783,8 @@ msgstr "Valida"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Errato valore per il credito od il debito nel modello (uno dei due deve "
+"essere \"0\") !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3764,11 +3793,14 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
+"Da questo report si puo' avere una visione dell'importo fatturato ai clienti "
+"ed alle dilazioni nei pagamenti. Si puo' usare la funzione di ricerca per "
+"personalizzare i report sulle fatture ed adattarli ai propri bisogni."
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Conferma le fatture"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3830,7 +3862,7 @@ msgstr "Bilancio analitico"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Loss"
-msgstr ""
+msgstr "Perdita netta"
 
 #. module: account
 #: help:account.account,active:0
@@ -3838,11 +3870,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Se il campo viene impostato come: \"falso\", permette di nascondere il conto "
+"semza rimuoverlo."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Ricerca del template per le imposte"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3904,18 +3938,19 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Ritardo medio nel pagamento"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Tipo di conto"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
+"Le tasse sono definite globalmente, ma non per le voci della fattura !"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -3969,7 +4004,7 @@ msgstr ""
 #: code:addons/account/account_analytic_line.py:0
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Manca un conto di spesa definito per questo prodotto: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
@@ -4007,6 +4042,8 @@ msgstr ""
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
 msgstr ""
+"La registrazione %s e' confermata, sono state create le voci corrispondenti "
+"nel registro."
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -4026,7 +4063,7 @@ msgstr "Spunta se volete visualizzare anche i Conti con salto a zero."
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Imposte di default"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -4045,6 +4082,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Quendo viene creata una nuova voce del movimento lo stato e' \"Draft\".\n"
+"* Quando sono fatti tutti i pagamenti lo stato e': \"Valido\""
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4054,7 +4093,7 @@ msgstr "Modalità di visualizzazione"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Registrazioni da fatture o pagamenti"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4064,7 +4103,7 @@ msgstr "  giorno del mese: 0"
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Piano dei conti"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4076,17 +4115,17 @@ msgstr "Nome conto"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Fornire il nome per le nuove registrazioni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Statistiche per le fatture"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Le transazioni bancarie sono state inserite"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:0
@@ -4098,18 +4137,18 @@ msgstr ""
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "Data di scadenza"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Template del conto"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Bilancio di Chiusura"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:0
@@ -4132,7 +4171,7 @@ msgstr "Note di credito"
 #: code:addons/account/wizard/account_use_model.py:0
 #, python-format
 msgid "Unable to find a valid period !"
-msgstr ""
+msgstr "Impossibile trovare un periodo valido !"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4147,17 +4186,17 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Transazioni non riconciliate"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Crea registr. da modelli"
 
 #. module: account
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Ammette la riconciliazione."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -4172,7 +4211,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Statistica conti analitici"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4199,7 +4238,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Modelli per operazioni periodiche"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4236,7 +4275,7 @@ msgstr ""
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Considera le registrazioni riconciliate"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4256,7 +4295,7 @@ msgstr "Annullato"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Bilancio di chiusura basato sulla cassa."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -4276,26 +4315,26 @@ msgstr ""
 #: code:addons/account/wizard/account_validate_account_move.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Registrazioni generate"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Scegliere il piano dei conti"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Corrispondenza dei conti"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -4320,7 +4359,7 @@ msgstr "Fattura annullata"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "Si deve definire un registro analitico di tipo: '%s' !"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4340,7 +4379,7 @@ msgstr "Data operazione"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Codice rimborso imposta"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4363,7 +4402,7 @@ msgstr "Fattura "
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data di inizio"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4375,6 +4414,8 @@ msgstr "Conto entrate per il prodotto"
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
 msgstr ""
+"Data in cui le registrazioni contabili per il partner sono state "
+"riconciliate la prima volta"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4444,7 +4485,7 @@ msgstr "Sei sicuro?"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Il movimento bancario usato per la riconciliazione bancaria"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4460,7 +4501,7 @@ msgstr "Calcola"
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Applicazione imposta"
 
 #. module: account
 #: view:account.move:0
@@ -4485,7 +4526,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Voci registro"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -4528,7 +4569,7 @@ msgstr "Dettagli anagrafiche bancarie"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Taxes missing !"
-msgstr ""
+msgstr "Mancano le imposte !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4541,6 +4582,7 @@ msgstr ""
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
 msgstr ""
+"Riempire questo se il registro viene utilizzato per rimborsi di fatture."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -4567,7 +4609,7 @@ msgstr "Movimenti"
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
+msgstr "Dichiarazione IVA"
 
 #. module: account
 #: view:account.period:0
@@ -4577,7 +4619,7 @@ msgstr "Da chiudere"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Controllo per data non nel periodo"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4612,7 +4654,7 @@ msgstr "5"
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Bilancio analitico -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4664,7 +4706,7 @@ msgstr "Voce"
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Codice Python"
 
 #. module: account
 #: view:account.journal.column:0
@@ -4701,6 +4743,7 @@ msgstr "Nome colonna"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Questgo report fornisce una visione delle situazione nei registri generali"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4716,7 +4759,7 @@ msgstr "Anno"
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Apertura cassa"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4743,7 +4786,7 @@ msgstr "Mese"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "La voce di registro \"%s\" non e' valida"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4753,7 +4796,7 @@ msgstr "Descrizione della Fattura"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Partner successivo per la riconciliazione"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4776,7 +4819,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Reports di contabilita'"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4801,7 +4844,7 @@ msgstr "Unità di Misura"
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr ""
+msgstr "Nessun Periodo è stato trovato nella Fattura!"
 
 #. module: account
 #: view:account.tax:0
@@ -4857,6 +4900,8 @@ msgid ""
 "The Journal Entry of the invoice have been totally reconciled with one or "
 "several Journal Entries of payment."
 msgstr ""
+"Le registrazione della fattura sono state completamente riconciliate con una "
+"o piu' registrazioni di pagamento"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -4869,6 +4914,8 @@ msgstr "Calcolo su tasse figlie"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Non si possono creare voci in un conto di pagamento o riscossione senza "
+"indicare un partner"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4885,7 +4932,7 @@ msgstr "Conferma cancellazione voci"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coefficiente per il parent"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -4895,7 +4942,7 @@ msgstr "Nome (Conto/Partner)"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Transazione"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4912,7 +4959,7 @@ msgstr "Usa questo codice per la Dichiarazione IVA"
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "Debito/Credito"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -4955,7 +5002,7 @@ msgstr ""
 #. module: account
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Errore: UOS deve esere in una categria diversa da UOM"
 
 #. module: account
 #: view:account.journal:0
@@ -4995,7 +5042,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicazione"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -5008,6 +5055,8 @@ msgid ""
 "This account will be used for invoices instead of the default one to value "
 "expenses for the current product"
 msgstr ""
+"Per il prodotto corrente verra' usato nelle fatture questo conto usato "
+"invece di quello di default"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5056,6 +5105,8 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Questi sono i partner di cui verificare se servono ancora riconciliazioni. "
+"Il partner corrente viene contato fra quelli riconciliati."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5065,7 +5116,7 @@ msgstr ""
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Quantita' dei prodotti"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5125,7 +5176,7 @@ msgstr "Ordina per"
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "Non c'e' in conto di default di credito per il registro \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5147,7 +5198,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr ""
+msgstr "Voci da riconciliare"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5167,12 +5218,12 @@ msgstr "Quantità"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Numero (movimento)"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Opzioni per rimborso fatture"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5180,6 +5231,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Numero di ammontari parziali che possono essere combinati per trovare un "
+"totale che possa essere scelto per la riconciliazione automatica"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5211,6 +5264,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Se non devono esere introdotte ulteriori registrazioni per un anno fiscale, "
+"l'anno puo' essere chiuso da qui. Verranno chiusi tutti i periodi fiscali "
+"aperti e questo rendera' impossibili nuove registrazioni. Un anno fiscale va "
+"chiuso solo quando si vogliono rendere definitive le scritture dell'anno. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5241,7 +5298,7 @@ msgstr "Importo fissato"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Vaalido fino a"
 
 #. module: account
 #: view:board.board:0
@@ -5251,13 +5308,13 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Riconciliazione automatica conti"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Voce registro"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
@@ -5268,13 +5325,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Genera scritture di apertura"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Already Reconciled!"
-msgstr ""
+msgstr "Gia' riconciliato !"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5298,7 +5355,7 @@ msgstr "Data di Creazione"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Registri analitici"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5362,7 +5419,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Valutazione"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5375,7 +5432,7 @@ msgstr "Conti di credito e debito"
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Corrispondenza imposte"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -5405,6 +5462,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Questa vista consente l'analisi dei differenti conti. Il documento mostra "
+"crediti e debiti tenendo conto dei criteri utilizzati nelo strumento di "
+"ricerca."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5439,7 +5499,7 @@ msgstr "# di Linee"
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "La nuova valuta non e' configurata correttamente !"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5538,7 +5598,7 @@ msgstr "Resi da clienti"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Calcolo ammontare"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5559,7 +5619,7 @@ msgstr "non implementato"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Ditta cui si riferisce questo registro."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:0
@@ -5568,6 +5628,8 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"Le fatture scelte non possono essere confermate, essendo nello stato 'Draft' "
+"o 'Pro-forma'"
 
 #. module: account
 #: report:account.invoice:0
@@ -5579,7 +5641,7 @@ msgstr "Commento Posizione Fiscale:"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Analisi scritture analitiche"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -5599,7 +5661,7 @@ msgstr "Passato"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Riconciliazione registrazioni"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5628,6 +5690,7 @@ msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
 msgstr ""
+"Il codice vera' usato per numerare le registrazioni in questo registro."
 
 #. module: account
 #: view:account.invoice:0
@@ -5656,12 +5719,12 @@ msgstr "Conto radice"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Ultima data di riconciliazione"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Voce conto analitico"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -5671,18 +5734,19 @@ msgstr "Tasse cliente"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Creare un conto basandosi su questo template"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Configurazione dei report"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
 msgstr ""
+"La ditta deve esere la stessa per il periodo ed il conto ad essa correlato."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5713,6 +5777,8 @@ msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
 msgstr ""
+"Non si puo' modificare la ditta relativa al conto, poiche' esistono "
+"registrazioni relative alla ditta."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -5757,7 +5823,7 @@ msgstr "Anno fiscale"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Riconciliazione parziale delle registraioni"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5811,7 +5877,7 @@ msgstr "Tipo di conto"
 #: model:account.account.type,name:account.account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr ""
+msgstr "Crediti"
 
 #. module: account
 #: view:account.invoice:0
@@ -5826,7 +5892,7 @@ msgstr "Conto Crediti predefinito"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configura il piano dei conti"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5836,12 +5902,12 @@ msgstr "  numero di giorni: 30"
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "La valuta del conto non e' eguale a quella della ditta."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Correnti"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5861,7 +5927,7 @@ msgstr "Percentuale"
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Registro e partner"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -5871,7 +5937,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Tipo di rimborso"
 
 #. module: account
 #: report:account.invoice:0
@@ -5881,7 +5947,7 @@ msgstr "Prezzo"
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Visualizza linee contabili analitiche"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -5900,11 +5966,13 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indica se l'ammontare dell'imposta deve essere incluso nell'imponibile per "
+"il calcolo delle tasse successive."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Riconciliazione: vai al partner successivo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -5946,7 +6014,7 @@ msgstr "Liquidità"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Voci del registro nalitico"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5955,11 +6023,15 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"Questo wizard genera le scritture nel registro di chiusura dell'anno fiscale "
+"selezionato. Nota che si puo'  far correre il wizard piu' volte per lo "
+"stesso anno fiscale, semplicemente le vecchie registrazioni vengono "
+"sostituite dalle nuove."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Banca e Cassa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -5973,7 +6045,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Il nome del registro deve essere unico per ogni ditta."
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -5985,6 +6057,7 @@ msgstr ""
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
+"Impossibile trovare un piano dei conti per questa ditta. Occorre crearne uno."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
@@ -6018,7 +6091,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Generare un piano dei conti a partire da un template"
 
 #. module: account
 #: view:account.account:0
@@ -6050,7 +6123,7 @@ msgstr "Sola lettura"
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
 msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "Report dei conti di perdite e profitti"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -6063,6 +6136,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
 msgstr ""
+"La percentuale per il pagamento parziale deve essere un numero fra 0 ed 1, "
+"ad esempio: 0.02 per il 2% "
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6082,7 +6157,7 @@ msgstr "Libro giornale analitico"
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Riconciliato"
 
 #. module: account
 #: report:account.invoice:0
@@ -6103,13 +6178,13 @@ msgstr "Conto categoria spesa"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Movimenti in contante"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:0
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr ""
+msgstr "La fatturaa e' gia' riconciliata"
 
 #. module: account
 #: view:account.account:0
@@ -6126,7 +6201,7 @@ msgstr "Note"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Statistiche scritture analitiche"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:0
@@ -6144,7 +6219,7 @@ msgstr ""
 #: code:addons/account/account.py:0
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr ""
+msgstr "Non si puo' creaare un movimento fra ditte diverse"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6153,6 +6228,8 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"La riconciliazione bancaria consiste nel verificare che i movimenti bancari "
+"corrispondano alle registrazioni nel relativo conto."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6168,7 +6245,7 @@ msgstr "Totale debiti"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr ""
+msgstr "La voce \"%s\" non è valida !"
 
 #. module: account
 #: report:account.invoice:0
@@ -6179,7 +6256,7 @@ msgstr "Fax :"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "Basato su"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6187,6 +6264,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Qiesto conto verra' usato al posto del default come conto per incassi dal "
+"partner corrente"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6205,6 +6284,8 @@ msgstr "Codice Python"
 msgid ""
 "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
+"Va definito il conto per riserve, e profitti/perdite per la ditta "
+"dell'attuale utente"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6212,6 +6293,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Spuntare la casella se si vuole permettere la cancellazione delle "
+"registrazioni di questo registro o delle fatture collegate a questo registro."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6226,12 +6309,12 @@ msgstr "Crea registrazione"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  valuation: percent"
-msgstr ""
+msgstr "  valutazione: percentuale"
 
 #. module: account
 #: field:account.installer,bank_accounts_id:0
 msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Conti per movimenti bancari e cassa"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -6244,7 +6327,7 @@ msgstr ""
 #: code:addons/account/wizard/account_use_model.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Errore !"
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -6259,7 +6342,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Report imposte"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -6290,7 +6373,7 @@ msgstr ""
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Da rivedere"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6299,12 +6382,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Voci  del registro"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Mostra il libro mastro con un partner per pagina"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6348,22 +6431,24 @@ msgstr "Tutte le registrazioni"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Errore: l'unità misura di default e quella di acquisto devono essere nella "
+"stessa categoria."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Selezione registro"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "La valuta corrente non e' correttamente configurata"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Riconciliazione conti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -6382,7 +6467,7 @@ msgstr "Libro Mastro generale"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "L'ordine di pagamento viene inviato alla banca"
 
 #. module: account
 #: view:account.balance.report:0
@@ -6399,6 +6484,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Spunta la casella se non sei sicuro della registrazione e vuoi che sia "
+"verificata da un contabile"
 
 #. module: account
 #: help:account.installer.modules,account_voucher:0
@@ -6435,16 +6522,22 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
+"Si puo' specificare anno,mese e data nel nome del modello, usando :\n"
+"%(year)s: per specificare l'anno\n"
+"%(month)s: per il mese \n"
+"%(date)s: indica la data corrente\n"
+"\n"
+"Esempio: Il mio modello del %(date)s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Conti per entrate"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Riferimento al documento che ha creato questa fattura"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6455,14 +6548,14 @@ msgstr ""
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Sales Credit Note Journal - (test)"
-msgstr ""
+msgstr "Registro per note di credito per le vendite"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Dati insufficienti !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -6478,12 +6571,12 @@ msgstr "Conto per storno"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Vendite"
 
 #. module: account
 #: model:account.journal,name:account.cash_journal
 msgid "Cash Journal - (test)"
-msgstr ""
+msgstr "Registro di cassa - (test)"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6515,12 +6608,14 @@ msgid ""
 "Here you can personalize and create each view of your financial journals by "
 "selecting the fields you want to appear and the sequence they will appear."
 msgstr ""
+"Qui si possono personalizzare e creare le viste dei registri contabili, "
+"scegliendo i campi che si vuole appaiano e l'ordine in cui appaiono"
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento di origine"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -6535,12 +6630,12 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Registrazioni non riconciliate"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Riconciliazione registrazioni"
 
 #. module: account
 #: report:account.invoice:0
@@ -6559,14 +6654,14 @@ msgstr ""
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Per imposte in percentuale, inserire un valore fra 0 ed 1"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Unità di misura del prodotto"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -6588,7 +6683,7 @@ msgstr "Lunghezza periodo (giorni)"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Turnover mensile"
 
 #. module: account
 #: view:account.move:0
@@ -6616,7 +6711,7 @@ msgstr "Righe"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Bank Journal - (test)"
-msgstr ""
+msgstr "Registro di banca - (test)"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -6634,7 +6729,7 @@ msgstr "Template conto tassa"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Sei sicuro di voler aprire il registro ?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6662,7 +6757,7 @@ msgstr "Dichiarazione"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Funziona come un account di default per il debito"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6706,7 +6801,7 @@ msgstr "Importo totale che questo cliente vi deve"
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -6729,7 +6824,7 @@ msgstr "Ok"
 #: code:addons/account/report/account_partner_balance.py:0
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Partner sconosciuto"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -6747,22 +6842,22 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Voce del movimento bancario"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data fine"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "UOM di default"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Imposta di default per gli acuisti"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6781,7 +6876,7 @@ msgstr ""
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
-msgstr ""
+msgstr "Bisognerebbe aver scelto periodi relativi alla stessa ditta"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -6801,7 +6896,7 @@ msgstr "Reportistica"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Il codice del registro deve essere unico per una stessa ditta !"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -6817,7 +6912,7 @@ msgstr "Libro giornale contabile"
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Fattura pagata"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -6830,7 +6925,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Commento"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -6880,7 +6975,7 @@ msgstr "Mostra conti"
 #. module: account
 #: field:account.account.type,sign:0
 msgid "Sign on Reports"
-msgstr ""
+msgstr "Segno nei report"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:0
@@ -6896,7 +6991,7 @@ msgstr ""
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Errore ! Non è possibile creare membri associati ricorsivi."
 
 #. module: account
 #: help:account.journal,type:0
@@ -6971,7 +7066,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Bad account !"
-msgstr ""
+msgstr "Conto sbagliato !"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -6983,7 +7078,7 @@ msgstr "Giornale Vendite"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Imposta della fattura"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -7005,7 +7100,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Riconciliazione manuale"
 
 #. module: account
 #: report:account.overdue:0
@@ -7016,7 +7111,7 @@ msgstr "Importo dovuto:"
 #: field:account.analytic.chart,to_date:0
 #: field:project.account.analytic.line,to_date:0
 msgid "To"
-msgstr ""
+msgstr "A"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7028,7 +7123,7 @@ msgstr "Anno fiscale da chiudere"
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Cancella lefatture scelte"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7037,7 +7132,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: account
 #: view:account.account:0
@@ -7068,12 +7163,12 @@ msgstr ""
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Imposte su vendite"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Sales Journal - (test)"
-msgstr ""
+msgstr "Registro vendite"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
@@ -7093,7 +7188,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Pagamento fatture"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7120,6 +7215,7 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
+"Spunta se il prezzo del prodotto e la fattura includono questa imposta."
 
 #. module: account
 #: view:account.state.open:0
@@ -7129,7 +7225,7 @@ msgstr "Sì"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr ""
+msgstr "Venditeper tipo di conto"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -7139,12 +7235,12 @@ msgstr ""
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensile"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 14"
-msgstr ""
+msgstr "  Numero di giorni: 14"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -7160,7 +7256,7 @@ msgstr "Mastro"
 #. module: account
 #: field:account.installer.modules,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Piano dei conti analitico multiplo"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7176,7 +7272,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Scritture legali"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -7244,7 +7340,7 @@ msgstr "Computazione del canone"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Importo (in lettere) :"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_other
@@ -7277,7 +7373,7 @@ msgstr "Partner"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Scegliere una valuta da applicare alla fattura"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:0
@@ -7289,7 +7385,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Mancano voci nella fattura !"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7349,7 +7445,7 @@ msgstr "Metodo riapertura conti"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "La fattura '%s' e' pagata"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -7359,7 +7455,7 @@ msgstr ""
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Errore! Non puoi creare un Codice di imposta ricorsivo"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7372,6 +7468,8 @@ msgid ""
 "This account will be used for invoices instead of the default one to value "
 "sales for the current product"
 msgstr ""
+"Questo conto verra' usato per le fatture al posto del  default per le "
+"vendite di questo prodotto"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -7430,13 +7528,13 @@ msgstr "Informazioni Aggiuntive"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Conti bancari e di cassa"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Residuo totale"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7448,6 +7546,8 @@ msgstr ""
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
 msgstr ""
+"Aggiunge ulteriori funzionalita' alla contabilita', oltre a quelle gia' "
+"installate"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7460,7 +7560,7 @@ msgstr "Registro Costi"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7482,7 +7582,7 @@ msgstr ""
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Per imposte in percentuale inserire un valore fra 0 ed 1"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -7548,6 +7648,8 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Questo termine di pagamento sara' usato per questo partner al posto del "
+"default"
 
 #. module: account
 #: view:account.tax.template:0
@@ -7602,13 +7704,13 @@ msgstr "Valuta società"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Chart of Account"
-msgstr ""
+msgstr "Piano dei conti"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Pagamento"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7668,6 +7770,8 @@ msgstr "Tipi di conto"
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
+"Impossibile creare la registrazione della fattura su un giornale "
+"centralizzato"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -7716,7 +7820,7 @@ msgstr "Libro giornale rimborsi"
 #: report:account.general.journal:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Filtra per"
 
 #. module: account
 #: view:account.entries.report:0
@@ -7747,7 +7851,7 @@ msgstr "Riga termine di pagamento"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "Purchase Journal"
-msgstr ""
+msgstr "Registro Acquisti"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7757,7 +7861,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotale"
 
 #. module: account
 #: report:account.invoice:0
@@ -7786,13 +7890,15 @@ msgstr "Data di Scadenza"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Fornitori"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Non si puo' creare piu' di un movimento per periodo su un registro "
+"centralizzato"
 
 #. module: account
 #: view:account.journal:0
@@ -7812,7 +7918,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistica"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -7823,7 +7929,7 @@ msgstr "Da"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Chiusura anno fiscale"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -7837,7 +7943,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Fatture Non Pagate"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -7871,12 +7977,12 @@ msgstr "Conti consentiti (vuoto per non effettuare nessun controllo)"
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Piano dei conti analitico"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varie"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -7902,6 +8008,7 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Spuntare la casella se la registrazione e' in contestazione con il partner"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -7916,12 +8023,12 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Bad account!"
-msgstr ""
+msgstr "Conto sbagliato !"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Lasciare vuoto per tutti gli anni fiscali aperti"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -7968,6 +8075,8 @@ msgstr "Valuta"
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
+"Fornisce l'ordine di sequenza quando viene mostrata una lista di movimenti "
+"bancari"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -8010,14 +8119,14 @@ msgstr ""
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratti"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "sconosciuto"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -8068,7 +8177,7 @@ msgstr ""
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Calcolato con codice Python"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -8086,7 +8195,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Ammontare residuo"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8138,7 +8247,7 @@ msgstr "Informazione"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Pagamento registrato"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -8148,7 +8257,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Informazioni prodotto"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8167,13 +8276,13 @@ msgstr "Crea fattura"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Imposta per acquisto(%)"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Creare voci della fattura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -8249,7 +8358,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "Start Period"
-msgstr ""
+msgstr "Periodo di inizio"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8293,6 +8402,8 @@ msgid ""
 "You cannot cancel the Invoice which is Partially Paid! You need to "
 "unreconcile concerned payment entries!"
 msgstr ""
+"Non si puo' cancellare una fattura parzialmente pagata, prima si deve "
+"eliminare le riconciliazione dei pagamenti."
 
 #. module: account
 #: report:account.overdue:0
@@ -8302,7 +8413,7 @@ msgstr "Distinti saluti."
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Non pagato"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8320,13 +8431,13 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Non si possono inserire movimenti in un conto di tipo \"vista\""
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "La valuta corrente non e' configurata correttamente !"
 
 #. module: account
 #: view:account.account.template:0
@@ -8382,12 +8493,12 @@ msgstr "Saldo"
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Inseriti in modo automatico o manuale nel sistema"
 
 #. module: account
 #: report:account.account.balance:0
 msgid "Display Account"
-msgstr ""
+msgstr "Mostra il conto"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8397,12 +8508,12 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Modifica"
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr ""
+msgstr "Metodo di chiusura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -8424,7 +8535,7 @@ msgstr "Debito"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Quest'anno"
 
 #. module: account
 #: view:board.board:0
@@ -8451,13 +8562,13 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "Nono si possono eliminare movimenti bancari confermati !"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:0
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr ""
+msgstr "Occorre scegliere un conto da riconciliare"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -8467,12 +8578,12 @@ msgstr "Saldo per Tipo Conto"
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Voci dei conti sono il primi input per la riconciliazione"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Firma del beneficiario"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8480,7 +8591,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Filtra per"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -8501,6 +8612,7 @@ msgstr "Movimento contabile"
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
+"Non si puo' cambiare l'imposta, bisogna eliminare e reinserire le voci !"
 
 #. module: account
 #: report:account.central.journal:0
@@ -8510,7 +8622,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr ""
+msgstr "Movimenti bancari"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -8569,7 +8681,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: account
 #: view:account.account:0
@@ -8597,7 +8709,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "End Period"
-msgstr ""
+msgstr "Periodo finale"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8616,12 +8728,12 @@ msgstr ""
 #: field:account.report.general.ledger,chart_account_id:0
 #: field:account.vat.declaration,chart_account_id:0
 msgid "Chart of account"
-msgstr ""
+msgstr "piano dei conti"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Data di scadenza"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8692,7 +8804,7 @@ msgstr "Non riconciliate"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Totale errato !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -8725,7 +8837,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Gestione pagamenti fornitori"
 
 #. module: account
 #: field:account.period,name:0
@@ -8750,7 +8862,7 @@ msgstr "Attivo"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Errore sconosciuto"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8771,7 +8883,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Aprire/chiudere un periodo"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -8820,7 +8932,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Through :"
-msgstr ""
+msgstr "Attraverso :"
 
 #. module: account
 #: view:account.general.journal:0
@@ -8847,7 +8959,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr ""
+msgstr "Numero"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8889,12 +9001,12 @@ msgstr "Periodi"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Tasso di cambio"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For Value percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Per valore in percentuale inserire unnumero fra 0 ed 1"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8903,7 +9015,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -8931,7 +9043,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Impostasu vendite (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8971,7 +9083,7 @@ msgstr ")"
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Periodo contabile"
 
 #. module: account
 #: view:account.subscription:0
@@ -8990,7 +9102,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Regolare"
 
 #. module: account
 #: view:account.account:0
@@ -9004,7 +9116,7 @@ msgstr "Tipo interno"
 #. module: account
 #: report:account.move.voucher:0
 msgid "State:"
-msgstr ""
+msgstr "Stato:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9088,12 +9200,12 @@ msgstr ""
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Profit"
-msgstr ""
+msgstr "Profitto netto"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Sequenza per gli anni fiscali"
 
 #. module: account
 #: help:account.model,name:0
@@ -9104,7 +9216,7 @@ msgstr "Questo è un modello per registrazioni contabili ricorrenti"
 #: code:addons/account/account_analytic_line.py:0
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Non e' definito un conto per incassi per il prodotto: \"%s\" (id:%d)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9242,12 +9354,12 @@ msgstr "Righe fattura"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Periodo finale"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Bilancio d'apertura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
@@ -9257,7 +9369,7 @@ msgstr "account.analytic.journal"
 #. module: account
 #: report:account.move.voucher:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Sul conto:"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9273,7 +9385,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Report sulle vendite per conto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -9329,12 +9441,12 @@ msgstr ""
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Errore! Non puoi creare un modello di conto ricorsivo"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Ricorrente"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9398,7 +9510,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9426,7 +9538,7 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:0
 #, python-format
 msgid "This period is already closed !"
-msgstr ""
+msgstr "Questo periodo e' gia' chiuso !"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -9457,7 +9569,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Piano dei conti analitico"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -9467,25 +9579,25 @@ msgstr "Importo rimanente dovuto"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Report statistici"
 
 #. module: account
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento configurazione"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Corrispondenza dei conti"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "La fattura '%s'  aspetta di esere validata"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9494,12 +9606,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Il codice del conto deve essere unico per ogni ditta!"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -9510,7 +9622,7 @@ msgstr "Il conto di ricavo o di costo riguardante il prodotto selezionato."
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "La data della registrazione non e' nel periodo definito!"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9526,7 +9638,7 @@ msgstr "Libro giornale generale"
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Ricerca fattura"
 
 #. module: account
 #: report:account.invoice:0
@@ -9536,7 +9648,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -9560,7 +9672,7 @@ msgstr "Informazioni Generali"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Documenti contabili"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -9582,11 +9694,12 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
 msgstr ""
+"Appena la riconciliazione viene effettuata, la fattura puo'essere pagata."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Ricerca template dei conti"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9648,7 +9761,7 @@ msgstr "Rif."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Modello di conto"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9657,7 +9770,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9677,12 +9790,12 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Scadenza"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Futuro"
 
 #. module: account
 #: view:account.move.line:0
@@ -9720,13 +9833,13 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr ""
+msgstr "La durata del periodo deve essere maggiore di zero"
 
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr ""
+msgstr "Non si puo' eliminare un contii che ha delle registrazioni ! "
 
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Registrazioni per movimento"
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 3baa432b455..ae7992f9df3 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 16:13+0000\n"
-"Last-Translator: badralb <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:00+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: 2010-12-17 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 7373a7cd2aa..4f62c8ff8c1 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:18+0000\n"
+"PO-Revision-Date: 2010-12-19 15:25+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-17 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2210,7 +2210,7 @@ msgstr "Фильтры"
 #: selection:account.period,state:0
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr "Открыть"
+msgstr "Открыт"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -7794,7 +7794,7 @@ msgstr ""
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -7882,14 +7882,14 @@ msgstr ""
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Договоры"
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -7899,7 +7899,7 @@ msgstr "Открытие журнала проводок"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Черновики счетов проверены и напечатаны."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -7956,7 +7956,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Остаток суммы"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8008,7 +8008,7 @@ msgstr "Информация"
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Зарегистрированный платеж"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -8018,7 +8018,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Информация о ТМЦ"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8037,13 +8037,13 @@ msgstr "Создать счет"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Налог на покупку(%)"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Пожалуйста, создайте позиции счета"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -8061,7 +8061,7 @@ msgstr "Уважаемые господа,"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Настройка модуля бухучета"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -8172,7 +8172,7 @@ msgstr "С уважением,"
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Не оплачено"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8196,7 +8196,7 @@ msgstr ""
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "Текущая валюта неправильно настроена !"
 
 #. module: account
 #: view:account.account.template:0
@@ -8257,7 +8257,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 msgid "Display Account"
-msgstr ""
+msgstr "Вывод счета"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -8267,7 +8267,7 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Изменить"
 
 #. module: account
 #: view:account.account.type:0
@@ -8294,12 +8294,12 @@ msgstr "К оплате"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Этот год"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Панель счетов"
 
 #. module: account
 #: view:account.model:0
@@ -8332,7 +8332,7 @@ msgstr "Вы должны выбрать счета для согласован
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Баланс по типу счета"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -8409,7 +8409,7 @@ msgstr "Транзакции сверки"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Общий отчет"
 
 #. module: account
 #: view:account.account:0
@@ -8439,7 +8439,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: account
 #: view:account.account:0
@@ -8486,12 +8486,12 @@ msgstr ""
 #: field:account.report.general.ledger,chart_account_id:0
 #: field:account.vat.declaration,chart_account_id:0
 msgid "Chart of account"
-msgstr ""
+msgstr "План счетов"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Срок"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8590,12 +8590,12 @@ msgstr "В ожидании"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Из аналитических счетов"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Управление оплатами поставщикам"
 
 #. module: account
 #: field:account.period,name:0
@@ -8620,7 +8620,7 @@ msgstr "Активен"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Неизвестная ошибка"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8641,7 +8641,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Открытие/закрытие периода"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -8690,7 +8690,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Through :"
-msgstr ""
+msgstr "Через :"
 
 #. module: account
 #: view:account.general.journal:0
@@ -8717,7 +8717,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr ""
+msgstr "Номер"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8759,7 +8759,7 @@ msgstr "Периоды"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Курс валюты"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8773,7 +8773,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -8860,7 +8860,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Обычный"
 
 #. module: account
 #: view:account.account:0
@@ -8874,7 +8874,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "State:"
-msgstr ""
+msgstr "Состояние:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -8895,7 +8895,7 @@ msgstr "Данный месяц"
 #: view:account.analytic.inverted.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr ""
+msgstr "Выберите период"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8958,7 +8958,7 @@ msgstr "База налога"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Profit"
-msgstr ""
+msgstr "Чистая прибыль"
 
 #. module: account
 #: view:ir.sequence:0
@@ -8968,13 +8968,13 @@ msgstr "Последовательности отчетного года"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Это модель для повторяющихся проводок"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:0
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9043,7 +9043,7 @@ msgstr "Компания"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Определить повторяющиеся проводки"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
@@ -9112,7 +9112,7 @@ msgstr "Позиции счета"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Конец периода"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -9122,7 +9122,7 @@ msgstr "Начальное сальдо"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr ""
+msgstr "account.analytic.journal"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9138,17 +9138,17 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Состояние счета - сделано"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Отчет о продажах по счету"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Счета системы налогообложения"
 
 #. module: account
 #: report:account.invoice:0
@@ -9199,12 +9199,12 @@ msgstr ""
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивные шаблоны счетов."
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Повторение"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9215,7 +9215,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Дебиторская задолженность"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9225,7 +9225,7 @@ msgstr "Условия платежа партнера"
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Диапазон"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9268,7 +9268,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9296,7 +9296,7 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:0
 #, python-format
 msgid "This period is already closed !"
-msgstr ""
+msgstr "Этот период уже закрыт !"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -9322,7 +9322,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Основной счет"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9337,14 +9337,14 @@ msgstr "Оставшиеся суммы"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Статистические отчеты"
 
 #. module: account
 #: field:account.installer,progress:0
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Настройка производится"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9355,7 +9355,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "Счет '%s' ожидает проверки."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9364,12 +9364,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Код счета должен быть уникальным для компании !"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -9380,7 +9380,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "Дата вашей записи в журнале вне определенного периода!"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9391,12 +9391,12 @@ msgstr "Количество периодов"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr ""
+msgstr "Основной журнал"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Искать счет"
 
 #. module: account
 #: report:account.invoice:0
@@ -9430,7 +9430,7 @@ msgstr "Общая информация"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Бухгалтерские документы"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -9446,7 +9446,7 @@ msgstr "Книга расходов (только количество)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Состояние счета - Сделано"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -9456,7 +9456,7 @@ msgstr ""
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Искать шаблоны счетов"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9481,7 +9481,7 @@ msgstr "Правая скобка"
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "ccount.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -9518,7 +9518,7 @@ msgstr "Ссылка"
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Модель счета"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9527,7 +9527,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9552,12 +9552,12 @@ msgstr "Срок платежа"
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Будущие"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Искать записи в журале"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9569,7 +9569,7 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "Обычно 1 или -1."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -9584,19 +9584,19 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Валюта суммы"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
-msgstr ""
+msgstr "Вы должны ввести длину периода больше 0 !"
 
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr ""
+msgstr "Нельзя удалить счет по которому есть проводки ! "
 
 #~ msgid "Partner account"
 #~ msgstr "Счет контрагента"
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index eea1f0c360d..65ebc0084b1 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 18:09+0000\n"
+"PO-Revision-Date: 2010-12-19 19:15+0000\n"
 "Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -376,7 +376,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: account
 #: selection:account.entries.report,month:0
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 6f39652d34b..b6d8fcb9de0 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1397,30 +1397,20 @@ class account_invoice_line(osv.osv):
             a = res.product_tmpl_id.property_account_expense.id
             if not a:
                 a = res.categ_id.property_account_expense_categ.id
-
         a = fpos_obj.map_account(cr, uid, fpos, a)
         if a:
             result['account_id'] = a
 
-        tax_ids = tax_obj.search(cr, uid, [('company_id', '=', company_id)])
         if type in ('out_invoice', 'out_refund'):
-            sale_taxes_def = map(lambda x: x.id, res.taxes_id)
-            sale_tax_ids = [tax for tax in tax_ids if tax in sale_taxes_def]
-            sale_taxes = tax_obj.browse(cr, uid, sale_tax_ids)
-            sale_taxes_all = sale_taxes and sale_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, sale_taxes_all)
+            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         else:
-            pur_taxes_def = map(lambda x: x.id, res.supplier_taxes_id)
-            pur_tax_ids = [tax for tax in tax_ids if tax in pur_taxes_def]
-            pur_taxes = tax_obj.browse(cr, uid, pur_tax_ids)
-            pur_taxes_all = pur_taxes and pur_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, pur_taxes_all)
+            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+        tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-#        if not name:
         result['name'] = res.partner_ref
 
         domain = {}
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 45d7e107180..00fa1f58ff6 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -70,6 +70,9 @@ class account_balance(report_sxw.rml_parse, common_report_header):
     def lines(self, form, ids=[], done=None):#, level=1):
         def _process_child(accounts, disp_acc, parent):
                 account_rec = [acct for acct in accounts if acct['id']==parent][0]
+                currency_obj = self.pool.get('res.currency')
+                acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
+                currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
                 res = {
                     'id': account_rec['id'],
                     'type': account_rec['type'],
@@ -84,12 +87,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 }
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
-                acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                 if disp_acc == 'bal_movement':
-                    if round(res['credit'], acc_digit) > 0  or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
-                    if round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
                         self.result_acc.append(res)
                 else:
                     self.result_acc.append(res)
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 8816d702118..8762b44e1e2 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -89,6 +89,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
         self.res_bl = self.obj_pl.final_result()
 
         account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')
 
         types = [
             'liability',
@@ -136,16 +137,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'level': account.level,
                         'balance':account.balance,
                     }
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += account.balance
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index ae47873a294..d3da592e085 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -341,7 +341,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table13">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Chart of Account</para>
@@ -355,15 +355,12 @@
         <td>
           <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
         </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Partner's</para>
-        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@@ -420,9 +417,6 @@
             <font color="white"> </font>
           </para>
         </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
-        </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index d9d6226904a..c17d2e7b23e 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -82,6 +82,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')
 
         types = [
             'expense',
@@ -106,16 +107,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                     if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += abs(account.debit - account.credit)
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 347a82e33c2..5f429270e29 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -79,7 +79,7 @@
          <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index c874cc3e5d2..b7775c48c8d 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -72,8 +72,8 @@
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,0,0,0
-"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index 43c1c0b6236..d173ea2eaab 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,14 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid "\n"
+"This module gives the admin user the access to all the accounting features like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
diff --git a/addons/account_accountant/i18n/mn.po b/addons/account_accountant/i18n/mn.po
new file mode 100644
index 00000000000..16cf7412521
--- /dev/null
+++ b/addons/account_accountant/i18n/mn.po
@@ -0,0 +1,23 @@
+# 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: 2010-12-15 15:04+0000\n"
+"PO-Revision-Date: 2010-12-17 18:03+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Нягтлан бодогч"
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
new file mode 100644
index 00000000000..be7641833b2
--- /dev/null
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -0,0 +1,23 @@
+# Dutch (Belgium) 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: 2010-12-15 15:04+0000\n"
+"PO-Revision-Date: 2010-12-17 09:40+0000\n"
+"Last-Translator: Niels Huylebroeck <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@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: 2010-12-18 05:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
new file mode 100644
index 00000000000..c8129c11013
--- /dev/null
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -0,0 +1,23 @@
+# Chinese (Simplified) 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: 2010-12-15 15:04+0000\n"
+"PO-Revision-Date: 2010-12-19 07:10+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "会计人员管理"
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index 3b7199e52b5..b32bfc2a40c 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,6 +46,18 @@ msgstr ""
 msgid "Date of the last invoice created for this analytic account."
 msgstr ""
 
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid "\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+""
+msgstr ""
+
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index d6760abce70..45fd89fde3d 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-08-13 09:22+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-12-17 18:05+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -40,7 +40,7 @@ msgstr "Томъёг ашиглан тооцоолох:  Дээд хэмжээ -
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "ХандалтынАлдаа"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -164,7 +164,7 @@ msgstr "Нэхэмжилсэн дүн"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
-msgstr ""
+msgstr "Хандалтын журмыг алгасах гэж оролдож байна (Баримтын төрөл: %s)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
@@ -273,7 +273,7 @@ msgstr "Нийт цаг"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 4d30102d41f..340b770859c 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-11 23:41+0000\n"
+"PO-Revision-Date: 2010-12-18 22:44+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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -39,7 +39,7 @@ msgstr "Computed using the formula: Maximum Quantity - Hours Tot."
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Access fel"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 2c3350ba6f9..15736a4e253 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-10-30 09:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 07:11+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -37,7 +37,7 @@ msgstr "计算公式为:最大数量 - 小时合计"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "访问错误"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -145,7 +145,7 @@ msgstr "辅助核算项目报表"
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "按用户汇总时间"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -261,7 +261,7 @@ msgstr "总小时"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "错误! 您不能创建递归的辅助核算科目"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index 82d696158ae..f75a5d720e9 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
 msgid "select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"
 msgstr ""
 
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -122,6 +117,18 @@ msgstr ""
 msgid "Analytic Defaults"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid "\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+"    "
+msgstr ""
+
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
 msgid "select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"
@@ -164,3 +171,8 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
 
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 9acfb156ce1..18923e085f8 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-22 07:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 10:55+0000\n"
+"Last-Translator: scigghia <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: 2010-12-17 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -54,7 +54,7 @@ msgstr "Raggruppa per..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "Data fine predefinita per questo Conto Analitico"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -82,7 +82,7 @@ msgstr "Riga Ordine di Vendita"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Data inizio predefinita per questo Conto Analitico"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index 60fe4bf9f86..a92c5097bbd 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
+#: view:analytic.plan.create.model:0
+msgid "This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -28,26 +38,6 @@ msgstr ""
 msgid "Crossovered Analytic"
 msgstr ""
 
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date2:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,rate:0
-msgid "Rate (%)"
-msgstr ""
-
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,name:0
@@ -59,95 +49,8 @@ msgid "Analytic Plan"
 msgstr ""
 
 #. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
-msgid "Analytic Instance Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "To Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,plan_id:0
-msgid "Plan Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Account Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,code:0
-msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "A model having this name and code already exists !"
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -157,27 +60,125 @@ msgstr ""
 msgid "Analytic Journal"
 msgstr ""
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Currency"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
-msgstr ""
-
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
 msgstr ""
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
 #, python-format
@@ -185,30 +186,8 @@ msgid "No analytic plan defined !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Error"
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -224,66 +203,14 @@ msgstr ""
 msgid "User Error"
 msgstr ""
 
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
-msgid "analytic.plan.create.model"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account1_ids:0
-msgid "Account1 Id"
-msgstr ""
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
 msgstr ""
 
 #. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#: view:analytic.plan.create.model:0
-#, python-format
-msgid "Distribution Model Saved"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
-msgid "Analytic Plan Instance"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
-msgid "Distribution Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "Ok"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -292,49 +219,69 @@ msgid "Analytic Plan Lines"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
 msgstr ""
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
-msgid "The Total Should be Between %s and %s"
+msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
-msgid "Bank Statement Line"
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
 msgstr ""
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
-msgid "Print Crossovered Analytic"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
+msgid "Analytic Account :"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -371,6 +318,53 @@ msgid "This module allows to use several analytic plans, according to the genera
 "        "
 msgstr ""
 
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
@@ -382,29 +376,14 @@ msgid "Quantity"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
-msgid "Multi Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_journal
-msgid "Journal"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
 #, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -413,24 +392,71 @@ msgstr ""
 msgid "No Analytic Journal !"
 msgstr ""
 
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
-msgid "Invoice Line"
-msgstr ""
-
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -445,40 +471,39 @@ msgid "Analytic Distribution"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "Value Error"
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
 msgstr ""
 
 #. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.crossovered.analytic,ref:0
-msgid "Analytic Account Reference"
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice
-msgid "Invoice"
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
+msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-#: view:analytic.plan.create.model:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -486,18 +511,3 @@ msgstr ""
 msgid "You can not create move line on view account."
 msgstr ""
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
-msgstr ""
-
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index c77cf2a5411..4f793783c8f 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-21 07:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 11:05+0000\n"
+"Last-Translator: scigghia <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: 2010-12-17 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -167,7 +167,7 @@ msgstr "100%"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -470,7 +470,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
@@ -501,7 +501,7 @@ msgstr "a"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index 7b9b9131ae3..aa5eceecc4f 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-10-30 15:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 10:35+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -101,7 +101,7 @@ msgstr "Төлөвлөгөөний дугаар"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Бүртгэлийн нэр компани бүрт дахин давтагдахгүй байх ёстой."
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
@@ -206,7 +206,7 @@ msgstr "Default Entries"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Хаагдсан дансан дээр шилжих мөр үүсгэж болохгүй."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -285,6 +285,8 @@ msgstr "Ok"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Харилцагчгүйгээр хүлээн авах / төлбөрийн дансан дээр шилжих мөр үүсгэж "
+"болохгүй."
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
@@ -335,7 +337,7 @@ msgstr "Print Crossovered Analytic"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Данс руу буруу кредит эсвэл дебит утга орсон байна !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -510,7 +512,7 @@ msgstr "Нэхэмжлэх"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Бүртгэлийн код компани бүрт дахин давтагдахгүй байх ёстой !"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -526,7 +528,7 @@ msgstr "Эхлэх огноо"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Дансны харагдац дээр шилжих мөр үүсгэж болохгүй."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index 4c490b924f1..f96013a9b3a 100644
--- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
+#: view:product.category:0
+msgid " Accounting Property"
 msgstr ""
 
 #. module: account_anglo_saxon
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
 msgstr ""
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index afb2a36cfb8..442b864928b 100644
--- a/addons/account_anglo_saxon/i18n/mn.po
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -8,55 +8,56 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-10-16 09:58+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 16:50+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Бүтээгдэхүүний ангилал"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Алдаа: Борлуулалтын нэгж нь хэмжих нэгжээс өөр ангилалд байх ёстой"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгүй."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Нэхэмжлэлийн гүйлгээ"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Худалдан авах захиалга"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Барааны загвар"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "Англо-Саксон орнуудын Хөрөнгийн Тооцоо"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -67,12 +68,12 @@ msgstr "Үнийн өөрчлөлтийн данс"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Түүврийн жагсаалт"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index 98dd022769e..e2ea514a5cf 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -118,6 +118,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_budget
+#: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
 msgstr ""
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 24cc04e9439..de8d69eba54 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 09:21+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-12-20 04:01+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: 2010-12-17 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index d6c036e31f1..ed064edbdf1 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid "\n"
+"    Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
new file mode 100644
index 00000000000..200be1c3de8
--- /dev/null
+++ b/addons/account_cancel/i18n/vi.po
@@ -0,0 +1,23 @@
+# 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: 2010-12-15 15:04+0000\n"
+"PO-Revision-Date: 2010-12-17 15:41+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-18 05:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Hủy bỏ Tài khoản"
diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot
index 0bf5b9ad036..bd19519e330 100644
--- a/addons/account_chart/i18n/account_chart.pot
+++ b/addons/account_chart/i18n/account_chart.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,3 +20,8 @@ msgstr ""
 msgid "Remove minimal account chart"
 msgstr ""
 
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr ""
+
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
index 2c8a3d548e0..899ae288af1 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:39+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:39+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -154,6 +154,14 @@ msgstr ""
 msgid "Import Coda Statement"
 msgstr ""
 
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid "\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
 #. module: account_coda
 #: view:account.coda:0
 msgid "Statements"
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index e30aaca5f2f..21661cfbf8e 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -54,9 +54,13 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_followup
-#: view:res.company:0
-#: field:res.company,follow_up_msg:0
-msgid "Follow-up Message"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+""
 msgstr ""
 
 #. module: account_followup
@@ -145,6 +149,12 @@ msgstr ""
 msgid "%(heading)s: Move line header"
 msgstr ""
 
+#. module: account_followup
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 5dc6bf6a08b..356592e1e17 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -7,25 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-08-02 21:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-18 15:13+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: 2010-12-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
 #, python-format
 msgid "Follwoup Summary"
-msgstr ""
+msgstr "Sommaire des suivis"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "Recherche de suivi"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -51,17 +52,39 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Modules d'automatisation des lettres pour factures impayées, avec "
+"rappels multi-niveaux.\n"
+"\n"
+"    Vous pouvez définir de multiples niveaux de rappel via le menu:\n"
+"        Comptabilité / Configuration / Divers / Suivis\n"
+"\n"
+"    Une fois défini, les rappels peuvent être imprimés quotidiennement\n"
+"    par simple clic sur le menu :\n"
+"        Comptabilité / Périodique de traitement / Facturation / Émettre "
+"rappels\n"
+"\n"
+"    Cela génère un fichier PDF comportant toutes les lettres selon les\n"
+"   différents niveaux de rappel définis. Vous pouvez définir différentes "
+"politiques\n"
+"   selon les sociétés. On peut également envoyer un courriel au client.\n"
+"\n"
+"    Noter que vous avez la possibilité de modifier le niveau de suivi pour "
+"un partenaire/compte, via le menu :\n"
+"        Comptabilité / Rapport / Rapport générique / Comptes des partenaires "
+"/ Rappels émis\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groupé par ..."
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr ""
+msgstr "Message de suivi"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -91,7 +114,7 @@ msgstr "Sujet du Message"
 #: 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."
-msgstr ""
+msgstr "Suivi des  rappels pour impayés envoyés aux partenaires."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -107,12 +130,12 @@ msgstr "Ok"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Choisir les partenaires à rappeler"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Impossible de créer une ligne d'écriture sur un compte clos"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
@@ -122,7 +145,7 @@ msgstr "Date d'envoi de la Relance"
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -138,7 +161,7 @@ msgstr "Relances"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Balance > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -181,12 +204,12 @@ msgstr "Partenaires"
 #: code:addons/account_followup/wizard/account_followup_print.py:0
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Rappel de facture"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "Suivi"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -196,7 +219,7 @@ msgstr "Fin de mois"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Non contentieux"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -215,6 +238,10 @@ msgid ""
 "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."
 msgstr ""
+"Cette fonction permet d'envoyer des rappels à des partenaires ayant des "
+"factures en souffrance. Vous pouvez leur envoyer le message standard des "
+"factures impayées ou entrer manuellement un message pour rappeler une "
+"information particulière."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index f32f9e74993..12e99ee9de2 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2009-02-03 14:34+0000\n"
+"PO-Revision-Date: 2010-12-17 09:57+0000\n"
 "Last-Translator: Niels Huylebroeck <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: 2010-12-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
 #, python-format
 msgid "Follwoup Summary"
-msgstr ""
+msgstr "Samenvatting aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "Aanmaning zoeken"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -51,23 +51,46 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Modules voor automatisch onbetaalde facturen aan te manen met meer "
+"aanmaning niveaus.\n"
+"\n"
+"    U kunt uw aanmaningsniveaus definiëren via menu:\n"
+"        Financieel/Configuratie/Diversen/Aanmaningen\n"
+"\n"
+"    Eenmaal gedefinieerd, kunt u automatisch dagelijks aanmaningen "
+"afdrukken\n"
+"    door eenvoudig te klikken op menu:\n"
+"        Financieel/Periodieke verwerking/Facturatie/Aanmaningen versturen\n"
+"\n"
+"    Het genereert een PDF met alle aanmaningen overeenstemmend met de "
+"verschillende\n"
+"    gedefinieerde niveaus van aanmaningen. U kunt verschillende aanpakken "
+"definiëren \n"
+"    voor verschillende bedrijven. U kunt ook email sturen naar de klant.\n"
+"\n"
+"    Merk op dat wanneer u het aanmaanniveau voor een bepaalde klant/rekening "
+"wilt wijzigen, u dat kunt via menu:\n"
+"        Financieel/Rapportage/Algemene rapportage/Relatie "
+"rekeningen/Verstuurde aanmaningen\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op..."
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr ""
+msgstr "Aanmaningsbericht"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Aanmanen"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -80,70 +103,72 @@ msgstr "Bedrijf"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Factuurdatum"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "E-mail onderwerp"
 
 #. 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."
 msgstr ""
+"Opvolging op de aan uw relaties gestuurde herinneringen voor onbetaalde "
+"facturen."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "Legend"
-msgstr ""
+msgstr "Legende"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Selecteren aan te manen relaties"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "U kan geen boekingen maken op een afgesloten rekening."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Verzenddatum aanmaning"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Verkeerde krediet of debet waarde in boeking !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "Netto dagen"
 
 #. 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"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Saldo > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Totaal debet"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -153,24 +178,24 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Aanmaning"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "BTW:"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,partner_id:0
 #: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Datum :"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
@@ -181,12 +206,12 @@ msgstr "Relaties"
 #: code:addons/account_followup/wizard/account_followup_print.py:0
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Facturen aanmaning"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "Aanmaningenbeheer"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -201,7 +226,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: Gebruikersnaam"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -215,6 +240,9 @@ msgid ""
 "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."
 msgstr ""
+"U kan hiermee aanmaningen naar relaties sturen met openstaande facturen. U "
+"kan kiezen tussen het standaard bericht sturen of handmatig een bericht "
+"invoeren, mocht u dat nodig vinden."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -224,24 +252,24 @@ msgstr "Ref"
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr ""
+msgstr "Bepaalt de volgorde bij het afbeelden van de aanmaningregels"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr ""
+msgstr "Bericht"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr ""
+msgstr "Niveau aanmaning"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr ""
+msgstr "Laatste aanmaning"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -266,27 +294,48 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Geachte %(partner_name)s,\n"
+"\n"
+"We zijn teleurgesteld om te constateren dat, ondanks het versturen van een "
+"herinnering, u een aanzienlijke\n"
+"betalingsachterstand heeft.\n"
+"\n"
+"Het is van belang dat er direct betaling plaatsvindt, anders moeten we "
+"overwegen om uw rekening te blokkeren wat betekent dat we u niet langer "
+"kunnen voorzien van gogederen en diensten.\n"
+"Wilt u alstublieft maatregelen nemen om te zorgen voor betaling binnen 8 "
+"dagen.\n"
+"\n"
+"Als er problemen zijn met betaling van een factuur waar we niet van op de "
+"hoogte zijn, neem dan gerust contact op met onze debieturenafdeling op "
+"(+32).10.68.94.39. opdat we de kwestie spoedig kunnen oplossen.\n"
+"\n"
+"Een openstaande posten overzicht treft u hieronder aan.\n"
+"\n"
+"Met vriendelijke groeten,\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "Stuur email-bericht in taal relatie"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"U kan geen boeking maken op een debiteuren rekening zonder een relatie"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Relatiekeuze"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Afgedrukt bericht"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -295,18 +344,18 @@ msgstr ""
 #: 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"
-msgstr ""
+msgstr "Verzend aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Relatie voor aanmaning"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -324,6 +373,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Beste %(partner_name)s,\n"
+"\n"
+"Uitgezonderd eventuele fouten onzerzijds lijkt het volgende bedrag onbetaald "
+"te zijn gebleven. Wilt u de nodige stappen zetten om deze betaling binnen 8 "
+"dagen te laten plaatsvinden.\n"
+"\n"
+"Als uw betaling al heeft plaatsgevonden, kunt u dit bericht als niet "
+"verzonden beschouwen. Neem gerust contact op met onze debiteurenbewaking op "
+"(+32).10.68.94.39.\n"
+"\n"
+"Met vriendelijke groeten,\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -344,68 +405,87 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Geachte %(partner_name)s,\n"
+"\n"
+"Ondanks verschillende herinneringen is uw openstaande saldo nog niet "
+"voldaan.\n"
+"\n"
+"Indien uw betaling niet binnen 8 dagen is doorgevoerd zullen we zonder "
+"verdere aankondiging overgaan tot het nemen van gerechtelijke stappen om het "
+"openstaande saldo in te vorderen.\n"
+"\n"
+"Wij vertrouwen erop dat deze actie niet nodig zal blijken. Details van de "
+"openstaande posten treft u heronder aan.\n"
+"\n"
+"Ingeval u nog vragen heeft omtrent deze kwestie, dan kunt u contact opnemen "
+"met onze debiteurenbewaking op (+32).10.68.94.39.\n"
+"\n"
+"Hoogachtend,\n"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Mails versturen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Aanmaning statistieken per relatie"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Aanmaningenbeheer"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Geblokkeerd"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
+"Dit veld biedt u de mogelijkheid om een datum te kiezen om uw aanmaningen "
+"vooraf te plannen."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "Vervallen"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Relaties selecteren"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Email-instellingen"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "Aanmaningen afdrukken"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr ""
+msgstr "Laatste aanmaning"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr ""
+msgstr "Subtotaal:"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -415,22 +495,22 @@ msgstr "Saldo:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "Aanmaning statistieken"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "Betaald"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(user_signature)s: Gebruikersnaam"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -440,7 +520,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr ""
+msgstr "Stuur bevestigings e-mail"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
@@ -449,69 +529,71 @@ msgid ""
 "All E-mails have been successfully sent to Partners:.\n"
 "\n"
 msgstr ""
+"Alle e-mails zijn met succes verstuurd naar de relaties :\n"
+"\n"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: Bedrijfsnaam gebruiker"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bedrijven"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "Aanmaningsregels"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Krediet"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Vervaldatum"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: Relatienaam"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr ""
+msgstr "Aanmaningsregels"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: Bedrijfsvaluta gebruiker"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Soort termijn"
 
 #. 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"
-msgstr ""
+msgstr "Aanmaning afdrukken en email versturen naar klanten"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
index ad33fb6a6fa..f274428d5e0 100644
--- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot
+++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -72,8 +72,18 @@ msgid "Unit Price"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:notify.message,msg:account_invoice_layout.demo_message1
-msgid "Be Expert with the Experts..."
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid "\n"
+"    This module provides some features to improve the layout of the invoices.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of an invoice\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: account_invoice_layout
@@ -114,6 +124,11 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
@@ -143,8 +158,8 @@ msgid "Source Account"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
-msgid "Write Messages"
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -304,8 +319,8 @@ msgid "Fax :"
 msgstr ""
 
 #. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Cancel"
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
 msgstr ""
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 9d4542a5ac0..3accc4f19e7 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 23:48+0000\n"
-"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 06:11+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/fr.po b/addons/account_invoice_layout/i18n/fr.po
index 2bf2f0efaef..d3c39d25c8c 100644
--- a/addons/account_invoice_layout/i18n/fr.po
+++ b/addons/account_invoice_layout/i18n/fr.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: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-17 11:07+0000\n"
+"PO-Revision-Date: 2010-12-19 00:14+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: 2010-12-17 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -26,7 +26,7 @@ msgstr "Sous-Total"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "Note :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -78,13 +78,13 @@ msgstr "Prix unitaire"
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "Be Expert with the Experts..."
-msgstr ""
+msgstr "Être expert avec les experts..."
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -121,7 +121,7 @@ msgstr "Produit"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "Donne l'ordre d'affichage de la liste des lignes de facture."
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -133,7 +133,7 @@ msgstr "Prix"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Date de la facture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -171,7 +171,7 @@ msgstr "Message Spécial"
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "Message à imprimer au bas du rapport"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -183,7 +183,7 @@ msgstr "Quantité"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Réf. partenaire"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -196,7 +196,7 @@ msgstr "Facture"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Total :"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -229,7 +229,7 @@ msgstr "Montant"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tél. :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -245,7 +245,7 @@ msgstr "Numéro Séquence"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "Message spécial des factures"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -266,7 +266,7 @@ msgstr "Ligne de séparation"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr ""
+msgstr "Amélioration de la présentation des factures"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -288,13 +288,13 @@ msgstr "Taxe"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Ligne de facture"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Total net :"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -305,7 +305,7 @@ msgstr "Ecrire un avis"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index e6fea3a69df..0a27f881a59 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,6 +41,15 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid "\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+"    "
+msgstr ""
+
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 7c71e634aad..62ebdd32c8c 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-24 09:28+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-18 19:52+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2010-12-17 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -81,6 +80,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
+"Quand une commande est passée en \"Brouillon\".\n"
+"Lorsque la banque a donné son accord, le statut passe à \"Confirmé\".\n"
+"Enfin, le statut passe à \"Terminé\" lorsque le paiement a été effectué."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -114,7 +116,7 @@ msgstr "Ecritures"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Compte utilisé"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -125,7 +127,7 @@ msgstr "Date d'échéance"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -141,7 +143,7 @@ msgstr "_Ajouter à l'ordre de paiement"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "Relevé rempli par paiement"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -152,7 +154,7 @@ msgstr "Montant"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -178,7 +180,7 @@ msgstr "Référence"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Le nom de la ligne de paiement doit être unique !"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -218,7 +220,7 @@ msgstr "Date effective de la facture"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Type d'exécution"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -282,7 +284,7 @@ msgstr "Date d'exécution"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Journal de banque ou de caisse pour le mode de paiement"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -303,13 +305,15 @@ msgstr "Compte de destination"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Rechercher des ordres de paiement"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Vous ne pouvez pas créer de lignes d'écriture sur un compte client "
+"débiteur/fournisseur créditeur sans partenaire"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -383,7 +387,7 @@ msgstr ""
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Relevé de compte rempli par paiement"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -430,7 +434,7 @@ msgstr "Adresse du client qui a passé la commande"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Remplir le relevé :"
 
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
@@ -452,12 +456,12 @@ msgstr "Lignes de paiement"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Lignes d'écriture"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La société doit être la même pour les comptes et périodes liées."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -516,7 +520,7 @@ msgstr "Le client ayant passé la commande"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Paiement"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -642,7 +646,7 @@ msgstr "Paiement"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Ordre de paiement / Paiement"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -697,12 +701,17 @@ msgid ""
 "payment orders that should be done, keep track of all payment orders and "
 "mention the invoice reference and the partner the payment should be done for."
 msgstr ""
+"Un ordre de paiement est une demande de paiement passée par votre société "
+"pour payer une facture de fournisseur ou une note de crédit d'un client. "
+"Ici, vous pouvez enregistrer tous les ordres de paiement à faire, garder une "
+"trace de tous les ordres de paiement,  mentionner la référence de la facture "
+"et le partenaire en faveur de qui sera fait le paiement."
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Faire le paiement"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -713,7 +722,7 @@ msgstr "Partenaire"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr ""
+msgstr "Remplir le paiement"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -724,6 +733,7 @@ msgstr "Compte bancaire pour le mode de paiement"
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
 msgstr ""
+"Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
 
 #~ msgid "Execution date:"
 #~ msgstr "Date d'exécution :"
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 1da4b5b978f..33d8642ffac 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-10-15 09:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 16:59+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -41,7 +41,7 @@ msgstr "Хэрэглэх төлбөрийн горимыг сонгох"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -95,7 +95,7 @@ msgstr "Гүйлгээ"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Ашиглагдсан Данс"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -106,7 +106,7 @@ msgstr "Товлосон огноо"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Хаагдсан дансан дээр шилжих мөр үүсгэж болохгүй."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -122,7 +122,7 @@ msgstr "_Төлбөрийн баримт руу нэмэх"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "Төлбөрийн Суурин Тайлан"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -133,7 +133,7 @@ msgstr "Дүн"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Данс руу буруу кредит эсвэл дебит утга орсон байна !"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -159,7 +159,7 @@ msgstr "Баримтын дугаар"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Төлбөрийн мөр дахин давтагдах ёсгүй!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -199,7 +199,7 @@ msgstr "Нэхэмжлэлийн ашигтай огноо"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Ажиллагааны Төрөл"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -252,7 +252,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -267,7 +267,7 @@ msgstr "Гүйцэтгэх огноо"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Төлбөрийн Горимын Банкны эсвэл Бэлэн мөнгөний Бүртгэл"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -288,13 +288,15 @@ msgstr "Орох данс"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Төлбөрийн Захиалга хайх"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Харилцагчгүйгээр хүлээн авах / төлбөрийн дансан дээр шилжих мөр үүсгэж "
+"болохгүй."
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -329,7 +331,7 @@ msgstr "Төлбөрийн менежмент"
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "Банкны тайлан тэнцлийн мөр"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -344,12 +346,12 @@ msgstr "Төлөх дүн"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Валют"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Тийм"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -367,7 +369,7 @@ msgstr ""
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Бүртгэл Төлбөрийн Суурин Тайлан"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -404,7 +406,7 @@ msgstr "Залгамжлагчтай холбоотой мэдээлэл"
 #: code:addons/account_payment/account_move_line.py:0
 #, python-format
 msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Оролтын мөрд харилцагч тодорхойлогдоогүй байна."
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
@@ -414,7 +416,7 @@ msgstr "Худалдан авагчийн хаяг"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Суурин Тайлан"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -457,7 +459,7 @@ msgstr "Энэ бичлэг худалдан авагчийн мэдээлэлд
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Хайх"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -467,7 +469,7 @@ msgstr "Төлбөрийн Огноо"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Нийт:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -477,7 +479,7 @@ msgstr "Үүссэн огноо"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "ADD"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -507,7 +509,7 @@ msgstr ""
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Нэхэмжлэл Лав."
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -539,7 +541,7 @@ msgstr "Дууссан"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -594,7 +596,7 @@ msgstr "Хүлээн авах банкны данс"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Та төлбөрөө хийхэд итгэлтэй байна уу?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -688,7 +690,7 @@ msgstr ""
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Төлбөр Хийх"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index faff57be213..18873b3a1b0 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
+"PO-Revision-Date: 2010-12-19 13:35+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-17 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index 42f81e83cbc..4d32e3e4cc2 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,13 @@ msgstr ""
 msgid "Increment Number"
 msgstr ""
 
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid "\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
 #. module: account_sequence
 #: model:ir.module.module,shortdesc:account_sequence.module_meta_information
 msgid "Entries Sequence Numbering"
@@ -63,8 +70,8 @@ msgid "Configure Your Account Sequence Application"
 msgstr ""
 
 #. module: account_sequence
-#: view:account.sequence.installer:0
-msgid "Configure"
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: account_sequence
@@ -139,8 +146,8 @@ msgid "account.sequence.installer"
 msgstr ""
 
 #. module: account_sequence
-#: field:account.sequence.installer,progress:0
-msgid "Configuration Progress"
+#: view:account.sequence.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: account_sequence
diff --git a/addons/account_tax_include/i18n/mn.po b/addons/account_tax_include/i18n/mn.po
new file mode 100644
index 00000000000..570b270920b
--- /dev/null
+++ b/addons/account_tax_include/i18n/mn.po
@@ -0,0 +1,53 @@
+# 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: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-12-17 19:10+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Харагдацын Архитектурын XML алдаатай!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Үнийн арга"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Татвар шингэсэн нэхэмжлэл ба үнэ"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Татвар шингэсэн"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Татвар шингээгүй"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Үндсэн үнэд шингэсэн татварыг тооцоолох програмчлалын код"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Нийлбэр"
diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po
index da95b437703..224a72e046f 100644
--- a/addons/account_tax_include/i18n/vi.po
+++ b/addons/account_tax_include/i18n/vi.po
@@ -8,46 +8,46 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-19 19:22+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Phương pháp tính giá"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Hóa đơn và giá đã bao gồm thuế"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr ""
+msgstr "Đã bao gồm thuế"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Chưa bao gồm thuế"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Mã tính toán cho giá bao gồm thuế"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Tổng phụ"
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 9421681b8ee..d08e78fa72a 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,12 @@ msgstr ""
 msgid "Unreconciliation transactions"
 msgstr ""
 
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
@@ -31,7 +37,6 @@ msgid "Open Customer Journal Entries"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Particulars"
 msgstr ""
@@ -47,11 +52,6 @@ msgstr ""
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
 
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "Ref. :"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
@@ -117,6 +117,11 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
@@ -225,12 +230,6 @@ msgstr ""
 msgid "Date payment"
 msgstr ""
 
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Receiver's Signature"
-msgstr ""
-
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
@@ -254,35 +253,26 @@ msgid "Tax"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,writeoff_journal_id:0
-msgid "Write-Off journal"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Amount (in words) :"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "Journal:"
-msgstr ""
-
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Payment Information"
+#: help:account.voucher,state:0
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Voucher.                         \n"
+"* The 'Pro-forma' when voucher is in Pro-forma state,voucher does not have an voucher number.                         \n"
+"* The 'Posted' state is used when user create voucher,a voucher number is generated and voucher entries are created in account                         \n"
+"* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
 
 #. module: account_voucher
@@ -309,8 +299,8 @@ msgid "You have to configure account base code and account tax code on the '%s'
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
 msgstr ""
 
 #. module: account_voucher
@@ -319,18 +309,21 @@ msgid "Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "On Account of :"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Write-Off Amount"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Date:"
 msgstr ""
@@ -375,9 +368,8 @@ msgid "Vouchers Entries"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Authorised Signatory"
+#: field:account.voucher,name:0
+msgid "Memo"
 msgstr ""
 
 #. module: account_voucher
@@ -404,9 +396,8 @@ msgid "Unreconciliation"
 msgstr ""
 
 #. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
 msgstr ""
 
 #. module: account_voucher
@@ -423,8 +414,8 @@ msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,tax_amount:0
-msgid "Tax Amount"
+#: view:account.voucher:0
+msgid "Payment Information"
 msgstr ""
 
 #. module: account_voucher
@@ -437,6 +428,16 @@ msgstr ""
 msgid "Paid Amount"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Directly"
@@ -470,21 +471,20 @@ msgid "Payable and Receivables"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
+#: report:voucher.print:0
+msgid "Account :"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Draft"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,writeoff_acc_id:0
-msgid "Write-Off account"
+#: field:account.voucher,type:0
+msgid "Default Type"
 msgstr ""
 
 #. module: account_voucher
@@ -493,7 +493,6 @@ msgid "Currency:"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "PRO-FORMA"
 msgstr ""
@@ -518,11 +517,6 @@ msgstr ""
 msgid "Audit Complete ?"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "supplier"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
@@ -550,8 +544,8 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: account_voucher
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
+#: report:voucher.print:0
+msgid "Number:"
 msgstr ""
 
 #. module: account_voucher
@@ -559,6 +553,11 @@ msgstr ""
 msgid "Amount reconciled"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
@@ -569,11 +568,6 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,comment:0
-msgid "Comment"
-msgstr ""
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@@ -587,7 +581,6 @@ msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
-#: report:voucher.cash_receipt.drcr:0
 msgid "Credit"
 msgstr ""
 
@@ -598,14 +591,14 @@ msgid "Please define a sequence on the journal !"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Through :"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,payment_option:0
-msgid "Without Write-off"
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
@@ -624,9 +617,8 @@ msgid "Bill Date"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_voucher
@@ -655,14 +647,8 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Open supplier Journal Entries"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
 msgstr ""
@@ -723,7 +709,6 @@ msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
-#: report:voucher.cash_receipt.drcr:0
 msgid "Debit"
 msgstr ""
 
@@ -732,6 +717,11 @@ msgstr ""
 msgid "Are you sure to confirm this record ?"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile with Write-Off"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
@@ -743,16 +733,10 @@ msgid "Description"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Canceled"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
 #: view:account.voucher:0
@@ -760,16 +744,6 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,payment_option:0
-msgid "Payment Option"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "-"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
@@ -782,12 +756,6 @@ msgid "Credits"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,writeoff_amount:0
-msgid "Writeoff Amount"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "State:"
 msgstr ""
@@ -804,7 +772,6 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
-#: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Posted"
 msgstr ""
@@ -815,13 +782,18 @@ msgid "Customer"
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,payment_option:0
-msgid "With Write-off"
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,type:0
-msgid "Default Type"
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -840,6 +812,11 @@ msgstr ""
 msgid "Effective date for accounting entries"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
@@ -862,11 +839,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.voucher,name:0
-msgid "Memo"
-msgstr ""
-
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 3094d627450..93ab3cbe4ce 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:15+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 18:41+0000\n"
+"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.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: 2010-12-17 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -35,7 +35,7 @@ msgstr "Öppna kundjournal transaktioner"
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Particulars"
-msgstr ""
+msgstr "Uppgifter"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -107,6 +107,9 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"När du säljer en produkt till en kund, ger du honom ett kvitto eller en "
+"faktura. När fakturan är godkänd skapas journaltransaktioner automatiskt och "
+"du kan registrera betalningar mot denna faktura."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -132,7 +135,7 @@ msgstr "Ej avstämda transaktioner"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "Verifikatstatistik"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -142,7 +145,7 @@ msgstr "Validera"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "Sök verifikat"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -190,6 +193,9 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"KKundfakturabetalningar gör det möjligt att registrera de betalningar som du "
+"tagit emor från kunderna. För kunna registrera betalningen krävs kunden, "
+"betalningsmetod och belopp. OpenERP kommer att föreslå öppna fakturor."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -199,12 +205,12 @@ msgstr "Försäljning"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Journalpost"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "Ref #"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -220,22 +226,22 @@ msgstr "Betalningsalternativ"
 #. module: account_voucher
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Fel kredit- eller debitvärde i bokföringstransaktionerna."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "Räkningsinformation"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Betalningsdag"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -246,13 +252,13 @@ msgstr "Mottagarens signatur"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Kontoutdragsrad"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Supplier Vouchers"
-msgstr ""
+msgstr "Leverantörsverifikat"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -263,12 +269,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Skatt"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Avskrivningsjournal"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -280,28 +286,29 @@ msgstr "Belopp (verbalt):"
 #: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analys konto"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Journal:"
-msgstr ""
+msgstr "Journal:"
 
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Du kan inte skapa en transaktion på en ett konto utan en kund/leverantör"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Betalningsinformation"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "Kör"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -313,24 +320,24 @@ msgstr "Företag"
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Importera fakturor"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "Du ska konfigurera kontokod och kontoskattekod för '%s' skatten!"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr ""
+msgstr "Konto:"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Kvitto"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -341,25 +348,25 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Försäljningstransaktion"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "Datum:"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
@@ -370,23 +377,23 @@ msgstr "Accounting Voucher Entries"
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr ""
+msgstr "Verifikattransaktioner"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fel !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "Leverantörsverifikat"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "Verfikatstransaktioner"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -399,18 +406,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipt"
-msgstr ""
+msgstr "Försäljningskvitto"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Felaktig åtgärd!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Övrig information"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -420,58 +427,58 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
+msgid "Vendor Payment"
+msgstr "Leverantörsbetalning"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: code:addons/account_voucher/invoice.py:0
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Betala faktura"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "Ingen kontokod och skattekod"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Skattebelopp"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "Verifikatstransaktion"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "Betalt belopp"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Betala direkt"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Fakturor"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "Vill du ta bort redovisningstransaktionerna också?"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Verifikatstransaktioner"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
@@ -481,12 +488,12 @@ msgstr "Valuta"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Leveranöts och kundfakturor"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Betal senare eller gruppera belopp"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -494,23 +501,23 @@ msgstr ""
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Konto för avskrivning"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
+msgstr "Valuta:"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -524,7 +531,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totalt belopp"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
@@ -538,13 +545,13 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Supplier"
-msgstr ""
+msgid "Vendor"
+msgstr "Leverantör"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Betalningsvillkor"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -560,48 +567,48 @@ msgstr "Datum"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "Bokför"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Företaget måste vara samma för relaterat konto och period."
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Avstämt belopp"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "Utläggstransaktioner"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Tidigare betalningar ?"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "Journal verifikat"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "Beräkna skatt"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -613,45 +620,45 @@ msgstr "Kredit"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "Definiera en sekvens för denna journal !"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Through :"
-msgstr ""
+msgstr "Genom :"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Without Write-off"
-msgstr ""
+msgstr "Utan avskrivning"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-msgstr ""
+msgstr "Transaktion referensnummer"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Fakturor och öppna transaktioner"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "Nummer:"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Redovisningsverifikat"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -661,39 +668,39 @@ msgstr "Nummer"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Bankkontoutdrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "To Review"
-msgstr ""
+msgstr "Att godkänna"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Försäljningsinformation"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Supplier Journal Entries"
-msgstr ""
+msgid "Open Vendor Journal Entries"
+msgstr "Öppna leverantörjournalstransaktioner"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "Verifikat"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "Verikattransaktioner"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -706,14 +713,14 @@ msgstr "ångra"
 #. module: account_voucher
 #: selection:account.voucher,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
 #: model:ir.model,name:account_voucher.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Journalrader"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -721,7 +728,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payment"
-msgstr ""
+msgstr "Kundbetalning"
 
 #. module: account_voucher
 #: field:account.move.line,amount_unreconciled:0
@@ -737,23 +744,23 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Betala"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 #: report:voucher.cash_receipt.drcr:0
 msgid "Debit"
-msgstr ""
+msgstr "Debet"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "Är du säker på att du vill godkänna denna post?"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "Betalningsmetod"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -768,12 +775,8 @@ msgstr "Avbruten"
 
 #. module: account_voucher
 #: view:account.voucher:0
-<<<<<<< TREE
-msgid "Supplier Invoices and Outstanding transactions"
-=======
 msgid "Vendor Invoices and Outstanding transactions"
->>>>>>> MERGE-SOURCE
-msgstr ""
+msgstr "Leverantörsfakturor och utestående transaktioner"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
@@ -785,7 +788,7 @@ msgstr "Journal"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Option"
-msgstr ""
+msgstr "Betalningsalternativ"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -795,24 +798,24 @@ msgstr "-"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interna anteckningar"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Krediteringar"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Writeoff Amount"
-msgstr ""
+msgstr "Avskrivningsbelopp"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "Status:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -821,7 +824,7 @@ msgstr ""
 #: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Betalning"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -829,38 +832,38 @@ msgstr ""
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Posted"
-msgstr ""
+msgstr "Bokförd"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "With Write-off"
-msgstr ""
+msgstr "Med avskrivning"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Standardtyp"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "Transkationer per kontoutdrag från fakturor"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "Kontotransaktion"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "Bokföringsdatum för konteringstransaktioner"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -878,23 +881,23 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Ingående balans"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "Anteckning"
 
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Du kan inte skapa en transaktion för ett vykonto"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index a8a20895e33..b7168d550db 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -61,6 +61,18 @@ msgstr ""
 msgid "Debit"
 msgstr ""
 
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid "* 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'."
+msgstr ""
+
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index 15298031eca..71b1d09a03f 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-25 19:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 16:58+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -30,7 +30,7 @@ msgstr "Дансны нэр"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Тоо ширхэгийг тоолох хэмжээг тооцоолох"
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Объект шинжилгээний бүртгэлийг тодорхойлох модуль.\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -138,11 +140,13 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Бүтээгдэхүүний үнэд өгөгдсөн тоо ширхэгиг үржүүлж тооцоолоогдсон. Үргэлж "
+"компанийн үндсэн мөнгөн тэмдэгтэд илэрхийлэгдсэн."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Цагийн тоо хэмжээнд дээд хязгаар тавих"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -172,7 +176,7 @@ msgstr "Тэнцэл"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -180,6 +184,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Хэрэв та Харагдацын Төрлийг сонговол, энэ бүртгэлийг ашиглан бүртгэлийн "
+"мэдээлэл оруулах боломжгүй болно."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
@@ -211,7 +217,7 @@ msgstr "Харах"
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
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
index a7dc4543796..b60207b0480 100644
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,17 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \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 ""
+
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
diff --git a/addons/analytic_journal_billing_rate/i18n/mn.po b/addons/analytic_journal_billing_rate/i18n/mn.po
new file mode 100644
index 00000000000..ca1b1e4d9d8
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/mn.po
@@ -0,0 +1,71 @@
+# 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: 2010-12-15 15:04+0000\n"
+"PO-Revision-Date: 2010-12-18 17:01+0000\n"
+"Last-Translator: badralb <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: 2010-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+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.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 ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+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_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index fde40a298a6..ff2e4d75cf5 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -60,8 +60,14 @@ msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid "\n"
+"\n"
+"    This module allows you to define what is the default function of a specific user 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 employee data so that this module is perfectly compatible with older configurations.\n"
+"\n"
+"    "
 msgstr ""
 
 #. module: analytic_user_function
@@ -69,6 +75,11 @@ msgstr ""
 msgid "Analytic User Function"
 msgstr ""
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 7fe0dfc2d9e..589397256a6 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -86,6 +86,7 @@ msgid "Expenses Tracking"
 msgstr ""
 
 #. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
 msgstr ""
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index e5b49faa0a5..c890708b185 100644
--- a/addons/association/i18n/es.po
+++ b/addons/association/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-25 08:39+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-18 17:28+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -141,7 +140,7 @@ msgstr "Gestión de proyectos"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index 0662e176641..db64d464fc8 100644
--- a/addons/association/i18n/fr.po
+++ b/addons/association/i18n/fr.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: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-04 09:26+0000\n"
+"PO-Revision-Date: 2010-12-17 14:42+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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -48,6 +48,8 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Les applications spécifiques liées au profil \"Association\" que vous avez "
+"sélectionnées sont ici."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -101,7 +103,7 @@ msgstr "Suivi des frais"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "Configuration de l'application \"Association\""
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -140,7 +142,7 @@ msgstr "Gestion de projets"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #~ msgid "Relationship Management"
 #~ msgstr "Gestion de la relation"
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index 5ca07594e1a..a145167ed98 100644
--- a/addons/association/i18n/nl.po
+++ b/addons/association/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-11-24 09:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 16:33+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -47,6 +47,8 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Hier zijn specifieke toepassingen die horen bij het vereniging profiel dat u "
+"selecteerde."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -100,7 +102,7 @@ msgstr "Declaratiebeheer"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "Vereniging applicatie configuratie"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -139,7 +141,7 @@ msgstr "Projectmanagement"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configureren"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 92dc5cc4a3c..2366d44d9d5 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:45+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:45+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1795,6 +1795,24 @@ msgstr ""
 msgid "Estimation"
 msgstr ""
 
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid "\n"
+"     This module manages the records of the artists,\n"
+"     the articles to be put up for auction,the buyers and\n"
+"     sellers.\n"
+"\n"
+"     It completely manages an auction such as managing bids,\n"
+"     keeping track of the sold articles along with the paid\n"
+"     and unpaid objects including delivery of the articles.\n"
+"     Dashboards for auction that includes:\n"
+"       * My Latest Objects (list)\n"
+"       * My Latest Deposits (list)\n"
+"       * Objects Statistics (list)\n"
+"       * My Objects By Day (list)\n"
+"    "
+msgstr ""
+
 #. module: auction
 #: view:auction.taken:0
 msgid "OK"
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index b9324c14e84..06e2fc5f065 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:20+0000\n"
+"PO-Revision-Date: 2010-12-19 23:31+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: 2010-12-17 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 064f9eeb107..fca0fd922ce 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:17+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-20 04:21+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2010-12-17 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -217,6 +216,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the auction "
 "lot category without removing it."
 msgstr ""
+"Si le champ actif est à \"Faux\", cela vous permet de cacher la catégorie "
+"d'enchère sans la supprimer."
 
 #. module: auction
 #: view:auction.lots:0
@@ -305,7 +306,7 @@ msgstr "Image de l'objet"
 #: code:addons/auction/wizard/auction_lots_buyer_map.py:0
 #, python-format
 msgid "No buyer is set for this lot."
-msgstr ""
+msgstr "Pas d'acheteur pour ce lot."
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -386,7 +387,7 @@ msgstr "Juin"
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
 #, python-format
 msgid "No Lots belong to this Auction Date"
-msgstr ""
+msgstr "Absence de lots sur cette séance"
 
 #. module: auction
 #: selection:report.auction,month:0
@@ -793,7 +794,7 @@ msgstr "# d'Objets Encodés"
 #. module: auction
 #: field:aie.category,parent_id:0
 msgid "Parent aie Category"
-msgstr ""
+msgstr "Catégorie aie parente"
 
 #. module: auction
 #: view:report.auction:0
@@ -821,7 +822,7 @@ msgstr "Listes des huissiers"
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "This record does not exist !"
-msgstr ""
+msgstr "Cet enregistrement n'existe pas !"
 
 #. module: auction
 #: field:auction.pay.buy,total:0
@@ -873,7 +874,7 @@ msgstr "Coûts Additionnels"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Map "
-msgstr ""
+msgstr "Plan "
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
@@ -1385,7 +1386,7 @@ msgstr "Analyse des enchères"
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Payment aborted !"
-msgstr ""
+msgstr "Paiement interrompu !"
 
 #. module: auction
 #: field:auction.lot.history,price:0
@@ -1463,7 +1464,7 @@ msgstr "Lot"
 #. module: auction
 #: help:aie.category,child_ids:0
 msgid "Childs aie category"
-msgstr ""
+msgstr "Sous-categorie aie"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
@@ -1603,7 +1604,7 @@ msgstr "Ligne 2"
 #. module: auction
 #: help:auction.lots,obj_ret:0
 msgid "Object Ret"
-msgstr ""
+msgstr "Ret objet"
 
 #. module: auction
 #: view:report.auction.adjudication:0
@@ -1806,7 +1807,7 @@ msgstr "Revenu net"
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1925,12 +1926,12 @@ msgstr "Configuration"
 #, python-format
 msgid ""
 "You should pay all the total: \"%.2f\" are missing to accomplish the payment."
-msgstr ""
+msgstr "La totalité est dûe : \"%.2f\" manquent pour compléter le paiement."
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_pay_buy
 msgid "Pay buy"
-msgstr ""
+msgstr "Payer acheter"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_outils_menu
@@ -1950,7 +1951,7 @@ msgstr "Dernier jour d'exposition"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_able
 msgid "Lots able"
-msgstr ""
+msgstr "Lots disponibles"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id3
@@ -2181,7 +2182,7 @@ msgstr "Description des objets"
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "No auction date for \"%s\": Please set one."
-msgstr ""
+msgstr "Absence de séance pour \"%s\" : En établir une, SVP."
 
 #. module: auction
 #: view:auction.deposit:0
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index 0a8a5de159c..0b513d42c3c 100644
--- a/addons/auction/i18n/vi.po
+++ b/addons/auction/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 17:39+0000\n"
+"PO-Revision-Date: 2010-12-20 00:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index 06d97b42a7e..2ed7f56e9cc 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -205,6 +205,18 @@ msgstr ""
 msgid "Log Workflow"
 msgstr ""
 
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid "\n"
+"    This module gives the administrator the rights\n"
+"    to track every user operation on all the objects\n"
+"    of the system.\n"
+"\n"
+"    Administrator can subscribe rules for read,write and\n"
+"    delete on objects and can check logs.\n"
+"    "
+msgstr ""
+
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 6893dc60678..ee866b97b36 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.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: 2010-12-15 15:04+0000\n"
-"PO-Revision-Date: 2010-12-16 15:49+0000\n"
+"PO-Revision-Date: 2010-12-17 18:02+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: 2010-12-17 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index b7a65cea8a2..d2cf7a727e8 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:00+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:00+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -366,6 +366,11 @@ msgstr ""
 msgid "%(partner_email)s = Partner Email"
 msgstr ""
 
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 3a471a2a61b..de8fc5318e6 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 21:37+0000\n"
+"PO-Revision-Date: 2010-12-17 15:02+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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -380,7 +380,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
new file mode 100644
index 00000000000..689de69eca2
--- /dev/null
+++ b/addons/base_action_rule/i18n/lv.po
@@ -0,0 +1,492 @@
+# Latvian 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-18 19:02+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2010-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Atgādināt partnerim"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Partnera Kategorija"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "E-pastu sekotājiem (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Poga nospiesta"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objekts"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "E-pastu uz šim adresēm"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Uzstādīt stāvokli"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-pasta veidlapa"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "E-pasta teksts"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dienas"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Kļūda!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Atbildēt uz"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minūtes"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Noteikuma nosaukums"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Create actions automatically triggered based on a user activity in the "
+"system.E.g.: an opportunity created by a specific user can be automatically "
+"maintained with a specific sales team, or an opportunity which still has "
+"status pending after 14 days triggers an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Termiņš"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Objekta subjekts"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "E-pasta atgādinājumi"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Speciāli atslēgas vārdi, kas tiks izmantoti tekstā"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. 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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Darbības noteikums"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Lauki izmaiņām"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Izveidošanas datums"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Pēdējas darbības datums"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Stundas"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = Objekta ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Aizkave pēc trigger datuma"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Atgādināt ar piesaistni"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Nederīgi argumenti"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Ielikt par atbildīgo"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Nav"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+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 ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "%(object_user_phone)s = Atbildīgā tālrunis"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Aizkaves tips"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Izsaukt objekta metodi"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "E-pastu"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Partnera nosaukums"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Piezīme"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+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 ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Aizkave pēc trigger datuma"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Nosacījumi"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Aktīvs"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Atgādināt atbildīgajam"
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Mēneši"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtrs"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.cron"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "%(object_description)s = Objekta apraksts"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Kļūda: e-pasta formāts neatbilst"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "E-pasta darbības"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "E-pasta informācija"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Darbību noteikumi"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "E-pasta saturs"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Atbildīgais"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "%(partner_email)s = Partners E-pasts"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "%(object_user_email)s = Atbildīgā e-pasts"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "E-pasta teksts"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Servera darbība izsaukšanai"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "E-pasts atbildīgajam"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Pievienot sekotājus (CC)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: 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 "Automatizētas darbības"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Servera Darbība"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Nosacījumi uz laiku"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Darbības"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Izveidošanas datums"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Stāvokļu nosacījumi"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Datums, kad tiks Izpildīts"
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 298cde9836b..a2dd7d3b04b 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:35+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 10:43+0000\n"
+"Last-Translator: sugi <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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -22,12 +22,12 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
-"Хэрэв танд эзэн хариуцагч руу мэйл илгээх дүрэм хэрэгтэй бол үүснийг сонго"
+"Хэрэв та хариуцах хүнрүү э-мэйлийн дүрмийг илгээхийг хүсвэл үүнийг чеклэнэ."
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
 msgid "Remind Partner"
-msgstr "Харилцагчид сануулах"
+msgstr "Харилцагчийн сануулга"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
@@ -52,22 +52,22 @@ msgstr "Объект"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr "Эдгээр имэйлийг илгээх"
+msgstr "Эдгээр хаягуудруу илгээх"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
 msgid "Set State to"
-msgstr "Төсвийг өөрчлөх нь"
+msgstr "Ноороглох"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_from:0
 msgid "Email From"
-msgstr "Хаанаас ирсэн"
+msgstr "Э-мэйлээс"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
-msgstr "Имэйлийн агуулга"
+msgstr "Имэйлийн гол утга"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -123,12 +123,12 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
-msgstr "Харилцагчийн моделийн нөхцөл"
+msgstr "Эцэг модел дээрх нөхцөл"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr "Эцсийн хугацаа"
+msgstr "Товлосон хугацаа"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
@@ -138,17 +138,17 @@ msgstr "Харилцагч"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr "%(object_subject)s = Обьектын гарчиг"
+msgstr "%(object_subject)s = Объектын гарчиг"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Reminders"
-msgstr "Имэйл сануулга"
+msgstr "Имэйл сануулагууд"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr "Гол агуулгад тусгай тэмдэгтүүд хэрэглэгдсэн"
+msgstr "Их биенд тусгай түлхүүр үгсийг хэрэглэсэн байх"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
@@ -164,12 +164,12 @@ msgstr ""
 #: view:base.action.rule:0
 #: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
 msgid "Action Rule"
-msgstr "Үйлдлийн дүрэм"
+msgstr "Үйл ажиллаагааны дүрэм"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
-msgstr "Солих талбар"
+msgstr "Солих утгууд"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -179,7 +179,7 @@ msgstr "Үүсгэсэн Огноо"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr "Сүүлчийн үйлдлийн огноо"
+msgstr "Сүүлийн үйл ажиллагааны огноо"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -194,12 +194,12 @@ msgstr "%(object_id)s=Объектын дугаар"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Delay After Trigger Date"
-msgstr "Бэлтгэл хугацаа (минут)"
+msgstr "Саатлын дараах гарааны огноо"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr "Хавсралттай сануулга"
+msgstr "Хавсралтын сануулга"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
@@ -209,7 +209,7 @@ msgstr "Алдаатай аргумент"
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible to"
-msgstr ""
+msgstr "Хариуцуулах"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -300,6 +300,9 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Delay After Trigger Date,specifies you can put a negative number. Хэрэв та "
+"гол огнооны өмнө зогсох хэргтэй бол, уулзалтаас 15 минутын өмнө анхааруулга "
+"илгээж байна."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -348,6 +351,8 @@ msgid ""
 "Describes the action name.\n"
 "eg:on which object which action to be taken on basis of which condition"
 msgstr ""
+"Үйлдлийн нэрийг дүрслэх.\n"
+"ЖНЬ:on which object which action to be taken on basis of which condition"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
@@ -357,7 +362,7 @@ msgstr "ir.cron"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_description)s = Object description"
-msgstr "%(object_description)s = Тодорхойлолт"
+msgstr "%(object_description)s = Object description"
 
 #. module: base_action_rule
 #: constraint:base.action.rule:0
@@ -392,7 +397,7 @@ msgstr "Хариуцлагатай"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner_email)s = Partner Email"
-msgstr "%(partner_email)s = Түншийн имэйл"
+msgstr "%(partner_email)s = Харилцагчийн Э-мэйл"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -402,14 +407,14 @@ msgstr "%(object_user_email)s = Хариуцлагатай имэйл"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr "Имэйлийн гол утга"
+msgstr "Э-мэйлийн гол утга"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_user:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
-"Хэрэв танд хэрэглэгч рүү сануулга илгээх дүрэм хэрэгтэй бол үүнийг сонго"
+"Хэрэв хэрэглэгчид э-мэйл-ээр анхааруулга илгээхийг хүсвэл үүнийг чеклэнэ."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -429,7 +434,7 @@ msgstr "Сонирхогч нэмэх"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Fields"
-msgstr "Модел талбрууд дахь нөхцөл"
+msgstr "Модел талбарууд дахь нөхцөл"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
@@ -452,7 +457,7 @@ msgstr ""
 msgid ""
 "Check this if you want that all documents attached to the object be attached "
 "to the reminder email sent."
-msgstr ""
+msgstr "Хэрэв та"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -497,29 +502,8 @@ msgstr "Нөхцөл байдал"
 msgid "Trigger Date"
 msgstr "Гарааны огноо"
 
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Та рекурс меню үүсгэхгүй"
-
 #~ msgid "%(object_date)s = Creation date"
 #~ msgstr "%(object_date)s = Үүсгэх огноо"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй !"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index 20409b32cff..bb925d71e3d 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-27 07:09+0000\n"
+"PO-Revision-Date: 2010-12-19 23:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -387,7 +387,7 @@ msgstr "%(object_description)s = Object omschrijving"
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Fout: De mail is niet juist geformatteerd"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index 8c346fbd184..86b516976e8 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-29 07:50+0000\n"
+"PO-Revision-Date: 2010-12-20 04:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -41,7 +41,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr ""
+msgstr "Knappen intryckt"
 
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
@@ -71,18 +71,18 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dagar"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Svara till"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_cc:0
@@ -94,7 +94,7 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuter"
 
 #. module: base_action_rule
 #: field:base.action.rule,name:0
@@ -134,7 +134,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr ""
+msgstr "%(object_subject) = Objekt ämnen"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Skapad datum"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -180,7 +180,7 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -200,7 +200,7 @@ msgstr ""
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ogiltiga argument"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
@@ -210,7 +210,7 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Inga"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -270,7 +270,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Anteckning"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_from:0
@@ -287,7 +287,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -300,7 +300,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:0
@@ -326,17 +326,17 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Månader"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtrera"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -348,7 +348,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -383,7 +383,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -430,7 +430,7 @@ msgstr ""
 #: 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 ""
+msgstr "Automatiserade händelser"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
@@ -457,7 +457,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -479,7 +479,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Skapat datum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 219fbb8c42d..2a3288152e2 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -582,11 +582,6 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
-msgid "Set Exclude range"
-msgstr ""
-
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
@@ -827,6 +822,7 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr ""
@@ -913,11 +909,9 @@ msgid "User"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,active:0
-#: field:calendar.event,active:0
-#: field:calendar.todo,active:0
-#: field:res.alarm,active:0
-msgid "Active"
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
 msgstr ""
 
 #. module: base_calendar
@@ -1024,9 +1018,11 @@ msgid "Summary"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,date:0
-msgid "Date"
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
 msgstr ""
 
 #. module: base_calendar
@@ -1515,6 +1511,13 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
@@ -1555,10 +1558,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Saturday"
+#: help:calendar.alarm,attach:0
+msgid "* Points to a sound resource,                     which is rendered when the alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when                      the alarm is triggered for procedure."
 msgstr ""
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index 2a32d519ded..a21ebf7face 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 22:11+0000\n"
+"PO-Revision-Date: 2010-12-19 13:07+0000\n"
 "Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -241,7 +241,7 @@ msgstr ""
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr ""
+msgstr "Estado de la participación de los asistentes"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -317,7 +317,7 @@ msgstr "Tipo de invitación"
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Secondly"
-msgstr ""
+msgstr "En segundo lugar"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -358,7 +358,7 @@ msgstr ""
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Fecha del final del evento"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -464,7 +464,7 @@ msgstr "Detalles del recordatorio"
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr ""
+msgstr "Delegado desde"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,select1:0
@@ -484,7 +484,7 @@ msgstr ""
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "¿Enviar email?"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr ""
+msgstr "Detalles del evento"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -506,7 +506,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "Información del aviso del evento"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -535,7 +535,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "¿Respuesta requerida?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
@@ -577,12 +577,12 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Respuesta requerida"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Participación  requerida"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
@@ -593,7 +593,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 msgid "Set Exclude range"
-msgstr ""
+msgstr "Fijar el rango de exclusión"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -612,7 +612,7 @@ msgstr ""
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "No se puede duplicar"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
@@ -696,7 +696,7 @@ msgstr ""
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -780,7 +780,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Información sobre la alarma básica"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
@@ -793,7 +793,7 @@ msgstr ""
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "La cuenta no puede ser negativa"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -825,7 +825,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Invitación desde"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -850,12 +850,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Invitar asistentes"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Email del invitado"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -940,7 +940,7 @@ msgstr ""
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Indicar los grupos a los que pertenece el asistente"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
@@ -1025,7 +1025,7 @@ msgstr ""
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "El intervalo no puede ser negativo"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
@@ -1052,7 +1052,7 @@ msgstr ""
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Seleccione a quien quiere invitar"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1065,7 +1065,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Editar todos los eventos del calendario"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
@@ -1075,12 +1075,12 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Ref. evento"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Define la acción a invocar cuando salte la alarma"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1128,7 +1128,7 @@ msgstr ""
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Detalles del recordatorio"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1285,7 +1285,7 @@ msgstr ""
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Email externo"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1327,7 +1327,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Buscar invitaciones"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
@@ -1444,11 +1444,12 @@ msgstr ""
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
 msgstr ""
+"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Enviado por usuario"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -1495,7 +1496,7 @@ msgstr ""
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Invitar"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
@@ -1515,7 +1516,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Enviado por"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index c91c22cd8c7..f8590935c85 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 17:56+0000\n"
+"PO-Revision-Date: 2010-12-18 15:22+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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -46,7 +46,7 @@ msgstr ""
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -162,7 +162,7 @@ msgstr "Vendredi"
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Toute la journée"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
@@ -222,7 +222,7 @@ msgstr "Mar"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -791,7 +791,7 @@ msgstr "Ven"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Le décompte ne peut pas être négatif"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -1024,7 +1024,7 @@ msgstr "Mercredi"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "L'intervalle ne peut pas être négatif"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
@@ -1066,12 +1066,12 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Modifier tous les événements"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Rôle de l'utilisateur vis à vis de l'agenda"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
@@ -1116,7 +1116,7 @@ msgstr "Id. de la date récurrente"
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1172,7 +1172,7 @@ msgstr "Annuler"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1199,7 +1199,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1304,6 +1304,9 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Définit une règle pour des événements récurrents.\n"
+"Par exemple : à faire 10 fois, tous les deux mois, le dernier dimanche du "
+"mois: FREQ=Mensuel;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
@@ -1352,7 +1355,7 @@ msgstr "Arrêter"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
@@ -1559,14 +1562,14 @@ msgstr "Accepter"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Invitation à"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Seconde"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
@@ -1591,6 +1594,7 @@ msgid ""
 "Create specific calendar alarms that can be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Créer des alarmes associées à des événements de l'agenda ou à des réunions."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
@@ -1609,7 +1613,7 @@ msgstr "Samedi"
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Cinquième"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect dans la définition de l'action"
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index 623e3746866..cc35e60fcb9 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 10:49+0000\n"
+"Last-Translator: sugi <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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -56,7 +56,7 @@ msgstr "Гарчиг"
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
-msgstr "Сарын"
+msgstr "Сар тутмын"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -147,7 +147,7 @@ msgstr "3 сар"
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Сэрэмжлүүлэг!"
+msgstr "Сануулга!"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -281,7 +281,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Select data for Custom Rule"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн үүрэгт зориулсан өгөгдөл сонгох"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
@@ -321,13 +321,13 @@ msgstr "Хоёрдугаарт"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr ""
+msgstr "Үйл явдлын төгсгөл"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Груплэх"
+msgstr "Бүлэглэх..."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
@@ -337,29 +337,29 @@ msgstr ""
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
-msgstr ""
+msgstr "Харилцагчийн холбоо хамаарал"
 
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Тусгай урилгын төрөл"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Жил"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Үйл явдал дуусах огноо"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr ""
+msgstr "Сайн дурын оролцоо"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
@@ -377,12 +377,12 @@ msgstr "Товлосон хугацаа"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Warning!"
-msgstr "Сэрэмжлүүлэг!"
+msgstr "Сануулга!"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr "_Болих"
+msgstr "_Цуцлах"
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
@@ -395,7 +395,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Зохион байгуулагч"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -403,13 +403,13 @@ msgstr ""
 #: model:res.request.link,name:base_calendar.request_link_meeting
 #, python-format
 msgid "Event"
-msgstr ""
+msgstr "Үйл явдал"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr ""
+msgstr "Өмнөх"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -428,7 +428,7 @@ msgstr ""
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Оролцогчид"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -455,7 +455,7 @@ msgstr "Урилгын төрөл"
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr ""
+msgstr "Дэлгэрэнгүй сануулах"
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
@@ -467,7 +467,7 @@ msgstr ""
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Сарын өдөр"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -480,14 +480,14 @@ msgstr "Байрлал"
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr "Имэйл илгээхүү?"
+msgstr "Э-мэйл илгээхүү?"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr "Имэйл"
+msgstr "Э-мэйл"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -502,7 +502,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr ""
+msgstr "Үйл явдлын мэдээлэл"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -515,13 +515,13 @@ msgstr "Итгэмжлэгдсэн"
 #: field:calendar.event,end_date:0
 #: field:calendar.todo,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Давталт хүртэл"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Секунд"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -531,7 +531,7 @@ msgstr "Харагдац"
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr ""
+msgstr "Хариулт шаардлагатай юу?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
@@ -543,7 +543,7 @@ msgstr ""
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Давтагдсан ID"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -573,12 +573,12 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Required Reply"
-msgstr ""
+msgstr "Хариу шаардлагатай"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr ""
+msgstr "Оролцоо шаардлагатай"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
@@ -645,12 +645,12 @@ msgstr "Харилцагч"
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Харилцагчийн холбоо"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr "_ОК"
+msgstr "_Тийм"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -673,7 +673,7 @@ msgstr "Цагийн бүс"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Сэдэв"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -697,7 +697,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Боломжтой"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
@@ -756,7 +756,7 @@ msgstr "Бууралт"
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "7 хоног"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -771,12 +771,12 @@ msgstr "Бүгдийг засварлах"
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr "Харьцах хүмүүс"
+msgstr "Харилцах хүмүүс"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Үндсэн дохионы мэдээлэл"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
@@ -821,7 +821,7 @@ msgstr "Хавсралт"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Хаанаас урих"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -846,12 +846,12 @@ msgstr "Үйл явдлууд"
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Урих оролцогч"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr "Урьсан хүний имэйл"
+msgstr "Урьсан хүний э-мэйл"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -905,7 +905,7 @@ msgstr "Үйл явцын огноо"
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "Энэ"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -941,7 +941,7 @@ msgstr ""
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Өгөгдөл"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
@@ -955,7 +955,7 @@ msgstr "Да"
 #: field:calendar.event,count:0
 #: field:calendar.todo,count:0
 msgid "Count"
-msgstr "Тоо"
+msgstr "Тоолох"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -986,7 +986,7 @@ msgstr "Хэл"
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Гол"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -1048,7 +1048,7 @@ msgstr "Үйл ажиллагаа"
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr ""
+msgstr "Урихыг хүсч буй хүнээ сонго."
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1061,7 +1061,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Календарын бүх үйл явдлыг засах"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
@@ -1071,7 +1071,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Үйл явдлын дугаар"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
@@ -1104,7 +1104,7 @@ msgstr ""
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "ID давтагдсан огноо"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
@@ -1165,7 +1165,7 @@ msgstr "Цуцлах"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1190,7 +1190,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Үүрэгтэй хэрэглэгч"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1218,7 +1218,7 @@ msgstr "Шалгуур"
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr "Хариуцлага"
+msgstr "Үүрэгтэй"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1250,7 +1250,7 @@ msgstr "Харилцагч"
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Онцгой үүрэг"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1339,7 +1339,7 @@ msgstr "Зогс"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
@@ -1350,7 +1350,7 @@ msgstr "Хүмүүсийг урих"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr "Объект"
+msgstr "Объектууд"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1402,7 +1402,7 @@ msgstr "2 сар"
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Сар"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -1418,7 +1418,7 @@ msgstr "Нэр"
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Онцгой Огноо/Цаг"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1525,7 +1525,7 @@ msgstr "Дараалал"
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Үйл ажиллагаа болохын өмнө сэрүүлэг тохируулах"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1577,7 +1577,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Гол огноо"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 98b60a437a1..e4487d23efa 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-27 04:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 10:05+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -46,7 +46,7 @@ msgstr ""
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -791,7 +791,7 @@ msgstr "Vrij"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Aantal kan niet negatief zijn"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -1025,7 +1025,7 @@ msgstr "Woensdag"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "Interval kan niet negatief zijn"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
@@ -1117,7 +1117,7 @@ msgstr "Herhaling ID datum"
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
index 07ed51bcf0e..054498cbe45 100644
--- a/addons/base_contact/i18n/base_contact.pot
+++ b/addons/base_contact/i18n/base_contact.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -123,6 +123,24 @@ msgstr ""
 msgid "If the active field is set to False,                 it will allow you to hide the partner contact without removing it."
 msgstr ""
 
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid "\n"
+"        This module allows you to manage your contacts entirely.\n"
+"\n"
+"    It lets you define\n"
+"        *contacts unrelated to a partner,\n"
+"        *contacts working at several addresses (possibly for different partners),\n"
+"        *contacts with possibly different functions for each of its job's addresses\n"
+"\n"
+"    It also adds new menu items located in\n"
+"        Partners \\ Contacts\n"
+"        Partners \\ Functions\n"
+"\n"
+"    Pay attention that this module converts the existing addresses into \"addresses + contacts\". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.\n"
+"    "
+msgstr ""
+
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index 02cd44bac26..bea83564d3b 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 17:14+0000\n"
+"PO-Revision-Date: 2010-12-17 14:43+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: 2010-12-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -45,7 +45,7 @@ msgstr "Date de début d'emploi (date d'entrée)"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Sélectionnez l'option pour la migration des adresses"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
@@ -240,7 +240,7 @@ msgstr "Adresses des partenaires"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migration des adresses vers les contacts"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -305,7 +305,7 @@ msgstr "Sinon, ces détails ne seront pas visibles dans l'adresse/le contact."
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -316,7 +316,7 @@ msgstr "E-Mail"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -461,6 +461,7 @@ msgstr "Nom"
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
 msgstr ""
+"Vous pouvez migrer les adresses actuelles du partenaire vers le contact."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
diff --git a/addons/base_contact/i18n/lv.po b/addons/base_contact/i18n/lv.po
index 8b1a35ac1cc..fb826ce3e24 100644
--- a/addons/base_contact/i18n/lv.po
+++ b/addons/base_contact/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-03 01:29+0000\n"
-"Last-Translator: Rinalds <rranny@gmail.com>\n"
+"PO-Revision-Date: 2010-12-18 18:36+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2010-12-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -35,27 +35,27 @@ msgstr "Fakss"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "uzruna"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Darba (pievienošanās) sākuma datums"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Izvēlēties adreses migrācijas iespēju"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "Šī kontakta funkcija pie šī partnera"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Adreses statuss"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
@@ -63,11 +63,13 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Varat vispirms ievadīt adresi, partneris tiks piesaistīt automātiski, ja būs "
+"atrasts."
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Darba faksa nr."
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -78,7 +80,7 @@ msgstr "Mobilais tālr."
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Piezīmes"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -93,13 +95,13 @@ msgstr "Definēt funkcijas un adreses"
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Darba beigu datums"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Migrēt"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -120,7 +122,7 @@ msgstr "Partneri"
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stāvoklis"
 
 #. module: base_contact
 #: help:res.partner.contact,active:0
@@ -170,7 +172,7 @@ msgstr "Vietējais / Pilsētas tālruņa numurs"
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Darba tālruņa nr."
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -187,7 +189,7 @@ msgstr "Kontakts"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Darba e-pasts"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -202,7 +204,7 @@ msgstr "Funkcijas -> adrese"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurācijas Progress"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -213,13 +215,13 @@ msgstr "Uzvārds"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Saziņa"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Attēls"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -229,12 +231,12 @@ msgstr "Iepriekšējie"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Partnera Adreses"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Adreses migrācija uz kontaktiem"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -244,7 +246,7 @@ msgstr "Kontaktu Sec."
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Meklēt Kontaktu"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -271,7 +273,7 @@ msgstr "Darba un privātās adreses."
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Adrese, kas ir piesaistīta pie partnera"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
@@ -296,7 +298,7 @@ msgstr ""
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurēt"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -307,7 +309,7 @@ msgstr "E-pasts"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -372,7 +374,7 @@ msgstr "Vispārējs"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -439,12 +441,12 @@ msgstr "Nacionālā Piederība"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Vakances"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nosaukums"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -459,12 +461,12 @@ msgstr "Galvenais Darba Devējs"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Adrese migrācija"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Pasta adrese"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index b7f079c4e5c..7f8c12d7445 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-27 01:02+0000\n"
+"PO-Revision-Date: 2010-12-20 04:24+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: 2010-12-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -49,7 +49,7 @@ msgstr "Startdaum dienstbetrekking (datum in dienst)"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Selecteer de optie voor adressen migratie"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
@@ -134,6 +134,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Als het actief veld uitstaat kunt u de contactpersoon verbergen zonder te "
+"verwijderen."
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -237,7 +239,7 @@ msgstr "Relatieadressen"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migratie adressen naar contactpersonen"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -301,7 +303,7 @@ msgstr "Anders zijn deze details niet zichtbaar vanuit adres/contactpersoon."
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configureren"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -455,6 +457,7 @@ msgstr "Naam"
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
 msgstr ""
+"U kunt de huidige adressen van de relatie migreren naar de contactpersoon."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
diff --git a/addons/base_contact/i18n/vi.po b/addons/base_contact/i18n/vi.po
index 705efccbdcf..fde25b987da 100644
--- a/addons/base_contact/i18n/vi.po
+++ b/addons/base_contact/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 16:06+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 23:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index a47c9429f35..b689874851e 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-09-09 07:07+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-19 07:17+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -39,34 +39,34 @@ msgstr ""
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "开始工作的日期（入职日期）"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "选择地址迁移的选项"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
 msgid "Function of this contact with this partner"
-msgstr ""
+msgstr "该业务伙伴联系人的职能"
 
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "地址状态"
 
 #. module: base_contact
 #: help:res.partner.job,name:0
 msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
-msgstr ""
+msgstr "您应该先输入地址，业务伙伴信息如果存在的话会自动链接过来。"
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "工作传真号码"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -77,7 +77,7 @@ msgstr "手机"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -98,7 +98,7 @@ msgstr ""
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "迁移"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -169,7 +169,7 @@ msgstr "内部或外部扩充电话号码"
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "工作电话号码"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -186,7 +186,7 @@ msgstr "联系人"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "工作电子邮件"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -201,7 +201,7 @@ msgstr "职能到地址"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -218,7 +218,7 @@ msgstr ""
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -228,7 +228,7 @@ msgstr "过去"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "业务伙伴地址列表"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -243,7 +243,7 @@ msgstr "联系人序号"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "搜索联系人"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -270,7 +270,7 @@ msgstr "工作和私人地址"
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "链接到该业务伙伴的地址"
 
 #. module: base_contact
 #: field:res.partner.job,function:0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "配置"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -321,7 +321,7 @@ msgstr "电话"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "您是否想要把地址数据迁移到联系人数据中？"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -371,7 +371,7 @@ msgstr "一般"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "相片"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
@@ -438,12 +438,12 @@ msgstr "国籍"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "开放的职位"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "姓名"
 
 #. module: base_contact
 #: view:base.contact.installer:0
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index c6ac6a13e2c..f63798c1745 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,6 +51,14 @@ msgstr ""
 msgid "bic"
 msgstr ""
 
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid "\n"
+"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
@@ -67,11 +75,6 @@ msgstr ""
 msgid "IBAN"
 msgstr ""
 
-#. module: base_iban
-#: sql_constraint:res.partner.bank:0
-msgid "The BVR adherent number must be unique !"
-msgstr ""
-
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index ea496e804d2..1697f977a81 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2009-10-04 10:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-19 13:26+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Izveidot IBAN banku kontus"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:0
@@ -28,7 +28,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "IBAN nešķiet pareizs. Jūs ievadījāt kaut ko līdzīgu šim '%s'"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -43,7 +43,7 @@ msgstr "International Bank Account Number"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankas Konti"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -64,7 +64,7 @@ msgstr "iban"
 #: code:addons/base_iban/base_iban.py:0
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "IBAN nepareizs, tam jāsākās ar valsts kodu"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
diff --git a/addons/base_iban/i18n/mn.po b/addons/base_iban/i18n/mn.po
new file mode 100644
index 00000000000..6cb7f15850b
--- /dev/null
+++ b/addons/base_iban/i18n/mn.po
@@ -0,0 +1,87 @@
+# 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-17 19:24+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:03+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "IBAN банкны данс үүсгэх"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr "IBAN данс буруу бололтой. Та %s шиг өгөгдөл оруулах хэрэгтэй."
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Олон Улсын Банкны Дансны дугаар"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Банкны дансууд"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "iban"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "IBAN буруу байна. Улсын кодоор эхлэх ёстой."
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: sql_constraint:res.partner.bank:0
+msgid "The BVR adherent number must be unique !"
+msgstr "BVR дугаар дахин давтагдахгүй байх ёстой !"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Данс"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "acc_number"
diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
index b34f55bba6c..3a2ad652ffe 100644
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,8 +41,13 @@ msgid "Please choose a file where the Technical Guide will be written."
 msgstr ""
 
 #. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
+#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
+msgid "\n"
+"    * This module generates the Technical Guides of selected modules in Restructured Text format (RST)\n"
+"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
+"    * It creates a tarball (.tgz file suffix) containing an index file and one file per module\n"
+"    * Generates Relationship Graph\n"
+"    "
 msgstr ""
 
 #. module: base_module_doc_rst
@@ -67,6 +72,11 @@ msgstr ""
 msgid "Relationship Graph"
 msgstr ""
 
+#. module: base_module_doc_rst
+#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
+msgid "Module"
+msgstr ""
+
 #. module: base_module_doc_rst
 #: wizard_field:tech.guide.rst,init,rst_file:0
 msgid "file"
diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot
index 64d2369dfbf..1ddd822cdc7 100644
--- a/addons/base_module_quality/i18n/base_module_quality.pot
+++ b/addons/base_module_quality/i18n/base_module_quality.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -427,6 +427,14 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#, python-format
+msgid "\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+""
+msgstr ""
+
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
diff --git a/addons/base_module_quality/i18n/fr.po b/addons/base_module_quality/i18n/fr.po
index a2d1c09c596..924bee3e593 100644
--- a/addons/base_module_quality/i18n/fr.po
+++ b/addons/base_module_quality/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 21:48+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-20 00:57+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -49,6 +48,9 @@ msgid ""
 "\n"
 "Test checks for fields, views, security rules, dependancy level\n"
 msgstr ""
+"\n"
+"Le test vérifie les champs, les vues, les règles de sécurité, le niveau de "
+"dépendance\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
@@ -345,6 +347,10 @@ msgid ""
 "needed in order to run it.\n"
 "\n"
 msgstr ""
+"\n"
+"Ce test vérifie la vitesse du module. Notez qu'il est nécessaire d'avoir au "
+"moins 5 données de démonstration pour pouvoir le lancer.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
@@ -359,6 +365,8 @@ msgid ""
 "\n"
 "This test checks if the module satisfy tiny structure\n"
 msgstr ""
+"\n"
+"Ce tests vérifie si le module correspond à la structure \"tiny\"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
@@ -439,6 +447,10 @@ msgid ""
 "of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
+"Ce test utilise Pylint et vérifie si le module correspond aux standards de "
+"développement de Python. Visitez http://www.logilab.org/project/name/pylint "
+"pour de plus amples informations.\n"
+" "
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
@@ -502,6 +514,10 @@ msgid ""
 "'unit_test/test.py' is needed in module.\n"
 "\n"
 msgstr ""
+"\n"
+"Ce test vérifie les tests unitaires (Pyunit) du module. Notez que le fichier "
+"'unit_test/test.py' doit être présent dans le module.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
@@ -511,6 +527,9 @@ msgid ""
 "This test checks if the module classes are raising exception when calling "
 "basic methods or not.\n"
 msgstr ""
+"\n"
+"Ce test vérifie si les classes du module remontent ou non une exception "
+"quand on appelle une méthode basique.\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
@@ -521,7 +540,7 @@ msgstr "Détails"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "Avertissement ! Pas assez de données de démonstration"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
@@ -583,6 +602,24 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"Le but de ce module est de vérifier la qualité des autres modules.\n"
+"\n"
+"Il ajoute un assistant sur la liste des modules dans OpenERP, qui vous "
+"permet de\n"
+"les évaluer à partir de différents critères comme : les respect des normes "
+"de développement\n"
+"d'OpenERP, la vitesse d'exécution...\n"
+"\n"
+"Ce module fournit également un cadre de travail générique pour définir vos "
+"propres tests de qualité.\n"
+"Pour plus d'informations, les développeurs peuvent regarder le fichier "
+"base_module_quality/README.txt\n"
+"\n"
+"AVERTISSEMENT : Ce module ne fonctionne pas comme un fichier ZIP, vous devez "
+"le décompresser avant\n"
+"de l'utiliser, sinon il plante.\n"
+"    "
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index e4857e22776..72eebbd5768 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-27 06:41+0000\n"
+"PO-Revision-Date: 2010-12-20 00:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-12-17 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -539,7 +539,7 @@ msgstr "Details"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "Waarschuwing! Onvoldoende demo gegevens"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
index 86bc4190d82..364cefca5ab 100644
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ b/addons/base_module_record/i18n/base_module_record.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -264,3 +264,24 @@ msgstr ""
 msgid "Created & Modified"
 msgstr ""
 
+#. module: base_module_record
+#: model:ir.module.module,description:base_module_record.module_meta_information
+msgid "\n"
+"This module allows you to create a new module without any development.\n"
+"It records all operations on objects during the recording session and\n"
+"produce a .ZIP module. So you can create your own module directly from\n"
+"the OpenERP client.\n"
+"\n"
+"This version works for creating and updating existing records. It recomputes\n"
+"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+"It also support workflows and demo/update data.\n"
+"\n"
+"This should help you to easily create reusable and publishable modules\n"
+"for custom configurations and demo/testing data.\n"
+"\n"
+"How to use it:\n"
+"Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.\n"
+"Select datetime criteria of recording and objects to be recorded and Record module.\n"
+"    "
+msgstr ""
+
diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot
index a1fc33f1592..c51b850f21c 100644
--- a/addons/base_report_creator/i18n/base_report_creator.pot
+++ b/addons/base_report_creator/i18n/base_report_creator.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -169,6 +169,7 @@ msgid "Form"
 msgstr ""
 
 #. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 #: selection:base_report_creator.report.fields,calendar_mode:0
 #: selection:base_report_creator.report.fields,graph_mode:0
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index 30218e6e6e5..cf09984f532 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-05 07:38+0000\n"
+"PO-Revision-Date: 2010-12-19 19:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-17 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -427,7 +427,7 @@ msgstr "Третий вид"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "End Date"
-msgstr "Дата окочания"
+msgstr "Дата окончания"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 3a898c8b96b..8caa4b3ec9e 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -40,6 +40,19 @@ msgstr ""
 msgid "Upload the modified report"
 msgstr ""
 
+#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid "\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+""
+msgstr ""
+
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
diff --git a/addons/base_report_designer/i18n/mn.po b/addons/base_report_designer/i18n/mn.po
new file mode 100644
index 00000000000..f9fa9876f8d
--- /dev/null
+++ b/addons/base_report_designer/i18n/mn.po
@@ -0,0 +1,214 @@
+# 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-17 18:24+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "base.report.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "OpenERP Тайлангийн Дизайны Тохиргоо"
+
+#. module: base_report_designer
+#: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
+msgid "Report designer interface module"
+msgstr "Тайлангийн дизайны интерфэйс модуль"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Энэ плаг-ин нь танд OpenOffice Writer руу OpenERP тайлан үүсгэх/өөрчлөх "
+"боломж олгоно."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Өөрчилсөн тайланг байршуулах"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr ".SXW тайлан"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "base_report_designer.installer"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "Хаах"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML report"
+msgstr "RML тайлан"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Тохируулах"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "гарчиг"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Тайлан"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "base.report.rml.save"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Тайлангийн Дизайн"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Файлын нэр"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Тайланг авах"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "OpenERP Тайлангийн Дизайнер"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Үргэлжлүүлэх"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Дахин хадгалах"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+"OpenObject Тайлангийн Дизайнер плаг-ин файл. Энэ файлыг хадгалж плаг-иныг "
+"OpenOffice-д суулгана уу."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "RML файлыг хадгалах"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "Таны .SXW файл"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Суулгацын ба Тохиргооны Алхамууд"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Тохиргооны үйл явц"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Энэ таны тайлангийн загвар. \n"
+"Үүнийг .SXW файл хэлбэрээр хадгалж OpenOffice програмаар нээнэ үү.\n"
+"Өөрчлөлт хийхийн тулд OpenERP SA OpenOffice багцийг суулгахаа бүү мартаарай."
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Skip"
+msgstr "Алгасах"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Image"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Үндсэн Тайлан sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "base.report.file.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "OpenObject Тайлангийн Дизайнер Плаг-ин"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "OpenERP Тайлан Дизайнер Суулгац"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+msgid "Cancel"
+msgstr "Болих"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Тайлангаа сонгоно уу"
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 467d7c3f870..d8d02acd0a6 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-09 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 19:16+0000\n"
+"Last-Translator: Aries Bucquet, Aspirix AB <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: 2010-12-17 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -181,7 +181,7 @@ msgstr "base.report.file.sxw"
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "OpenERP rapportdesigner plugin"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index a1403b195f3..fe053c831df 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -169,6 +169,23 @@ msgstr ""
 msgid "Knowledge Management"
 msgstr ""
 
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid "\n"
+"    This module implements a configuration system that helps user\n"
+"    to configure the system at the installation of a new database.\n"
+"\n"
+"    It allows you to select between a list of profiles to install:\n"
+"    * Minimal profile\n"
+"    * Accounting only\n"
+"    * Services companies\n"
+"    * Manufacturing companies\n"
+"\n"
+"    It also asks screens to help easily configure your company, the header and\n"
+"    footer, the account chart to install and the language.\n"
+"    "
+msgstr ""
+
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
 msgid "Installs a preselected set of OpenERP applications which will help you manage your industry."
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 39c5730a3ff..653a51cf371 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 22:25+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-18 19:50+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2010-12-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -178,6 +177,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"La description de votre société personnalisera les documents générés par "
+"OpenERP (factures, bons de commande; etc.)"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -215,7 +216,7 @@ msgstr "Nom de la société"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Passer l'étape des assistants de configuration"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -317,6 +318,9 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Choisir les applications que vous voulez mettre en oeuvre dans le système. "
+"Si vous n'êtes pas sûr de vos besoins précis à ce stade, vous pourrez "
+"facilement les installer plus tard."
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -465,7 +469,7 @@ msgstr "Rue"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Configurer les informations de la société"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index d8a259f74ec..3b2ac60f295 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-01 09:35+0000\n"
+"PO-Revision-Date: 2010-12-19 22:31+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: 2010-12-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
 msgid "City"
-msgstr "Хот"
+msgstr "Сум/Дүүрэг"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -40,12 +40,12 @@ msgstr "Хүний нөөц"
 #. module: base_setup
 #: field:base.setup.company,email:0
 msgid "E-mail"
-msgstr "И-мэйл"
+msgstr "Э-мэйл"
 
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "Дансны дугаар"
+msgstr "Банкны дансны дугаар"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -55,7 +55,7 @@ msgstr "Нэмэлт багаж"
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr "Хөлийн мэдээ 1"
+msgstr "Тайлангийн хөл 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -72,7 +72,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr "Таны өгөгдлийн сан үүссэн байна."
+msgstr "Таний өгөгдлийн сан үүсгэгдсэн."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
@@ -82,7 +82,7 @@ msgstr "Борлуулалтын цэг"
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr "Харилцаа"
+msgstr "Нийгэмлэг"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -95,7 +95,7 @@ msgstr ""
 #: code:addons/base_setup/__init__.py:0
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -106,7 +106,7 @@ msgstr "Тохиргооны явц"
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "Хөлийн мэдээ 2"
+msgstr "Тайлангийн хөл 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
@@ -147,11 +147,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
+"холболт хийж болно."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr "Дээд түвшний тайлан"
+msgstr "Дээд төвшний тайлан"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -178,7 +180,7 @@ msgstr "гарчиг"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr "Баримтын менежтмент"
+msgstr "Баримтын менежмент"
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -197,7 +199,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,name:0
 msgid "Company Name"
-msgstr "Компанийн нэр"
+msgstr "Компаний нэр"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -244,7 +246,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr "Гудамж2"
+msgstr "Гудамж 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -259,7 +261,7 @@ msgstr "Улс"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
-msgstr "Тохируулга"
+msgstr "Тохируулах"
 
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
@@ -274,12 +276,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr "Зип Код"
+msgstr "Зип код"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Start Configuration"
-msgstr "Тохируулж эхлэх"
+msgstr "Тохиргоо эхлэх"
 
 #. module: base_setup
 #: help:base.setup.installer,knowledge:0
@@ -299,7 +301,7 @@ msgstr ""
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr "Компаний тохиргоо"
+msgstr "Компаний тохиоргоо"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -317,7 +319,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr "Худалдан авалтын менежмет"
+msgstr "Худалдан авалтын менежмент"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -337,7 +339,7 @@ msgstr "Төслийн менежмент"
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr "Суулгагдсан хэрэглэгчид"
+msgstr "Суулгагдсан хэрэглэгч"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -347,7 +349,7 @@ msgstr "Шинэ өгөгдлийн сан"
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr "Харилцагчийн холбоо хамаарлын менежмент"
+msgstr "Үйлчлүүлэгчтэй харилцах менежмент"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -377,7 +379,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr "Толгойн мэдээ"
+msgstr "Тайлангийн толгой"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -399,12 +401,12 @@ msgstr "Хоол үйлдвэрлэл"
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr "Үйлдвэрлэл"
+msgstr "Үйлдвэрлэх"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Таны лого-450х150 хэмжээтэй"
+msgstr "Таний лого - Хэмжээ нь 450x150 пиксел байна."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -420,7 +422,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr "Компаний вэбсайт"
+msgstr "Компаний Вэбсайт"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -440,13 +442,13 @@ msgstr ""
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr "Жишээлбэл: http://openerp.com"
+msgstr "Жишээ нь: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr "Суулгах баримтууд"
+msgstr "Хэрэглээний програм суулгах"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -480,92 +482,8 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
-#~ msgid "State"
-#~ msgstr "Төлөв"
-
-#~ msgid "Zip code"
-#~ msgstr "Зип код"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Хувийн мэдээллээ сонгох"
-
-#~ msgid "Report header"
-#~ msgstr "Толгойн мэдээлэл"
-
-#~ msgid "Next"
-#~ msgstr "Дараагийх"
-
-#~ msgid "Profile"
-#~ msgstr "Хувийн мэдээлэл"
-
-#~ msgid "General Information"
-#~ msgstr "Ерөнхий мэдээлэл"
-
-#~ msgid "Street2"
-#~ msgstr "Гудамж 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Мэдээ мэдээлэл"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Үндсэн компани тодорхойлох"
-
-#~ msgid "Summary"
-#~ msgstr "Дүгнэлт"
-
-#~ msgid "Installation Done"
-#~ msgstr "Суулгагдсан"
-
-#~ msgid "Use Directly"
-#~ msgstr "Шууд хэрэглэх"
-
-#~ msgid "Cancel"
-#~ msgstr "Цуцлах"
-
-#~ msgid "Previous"
-#~ msgstr "Өмнөх"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Та цаашид удирдлагын цэсээр дамжин нэмэлт модулууд суулгах боломжтой."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
-#~ "холболт хийж болно."
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Таны шинэ бааз бүрэн суусан."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Тодорхой шаардлагаар модулуудыг урьдчилан сонгон хувийн тохиргоонд "
-#~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
-#~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 33db37df0a3..7692b4838fd 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-20 07:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 09:57+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-12-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -176,6 +176,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Uw bedrijfsinformatie wordt gebruikt voor het personaliseren van OpenERP "
+"documenten zoals facturen, verkooporders en nog veel meer."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -313,6 +315,8 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Selecteer de applicaties waar uw systeem in moet voorzien. Als u nu niet "
+"zeker bent van uw behoeftes, kunt u ze later eenvoudig installeren."
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -460,7 +464,7 @@ msgstr "Adres"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Uw bedrijfsinformatie configureren"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 0c8fc5a760b..39cd7a700e6 100644
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -164,6 +164,11 @@ msgstr ""
 msgid "Synchronized instances"
 msgstr ""
 
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
 #. module: base_synchro
 #: view:base.synchro.obj:0
 #: field:base.synchro.obj,model_id:0
diff --git a/addons/base_synchro/i18n/fr.po b/addons/base_synchro/i18n/fr.po
index 338e06bb11f..07fd30d5ea0 100644
--- a/addons/base_synchro/i18n/fr.po
+++ b/addons/base_synchro/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 22:31+0000\n"
+"PO-Revision-Date: 2010-12-20 00:19+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
index 8be06e1513a..f6e7b0230d3 100644
--- a/addons/base_tools/i18n/base_tools.pot
+++ b/addons/base_tools/i18n/base_tools.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,3 +20,9 @@ msgstr ""
 msgid "Common base for tools modules"
 msgstr ""
 
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid "\n"
+"    "
+msgstr ""
+
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 8dd73472696..74687ff0de1 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,16 @@ msgstr ""
 msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid "\n"
+"    Enable the VAT Number for the partner. Check the validity of that VAT Number.\n"
+"\n"
+"    This module follows the methods stated at http://sima-pc.com/nif.php for\n"
+"    checking the validity of VAT Number assigned to partners in European countries.\n"
+"    "
+msgstr ""
+
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index f849c42c170..07c9e8612b2 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-30 15:56+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 10:08+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -32,7 +32,7 @@ msgstr "Basis BTW - voor controle geldigheid BTW nummer"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fout ! U kunt geen recursieve aangesloten leden maken."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index b7a307f554c..f5555892a60 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -224,6 +224,11 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr ""
+
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 1afbc859de7..b291fb421d0 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-09-29 11:05+0000\n"
+"PO-Revision-Date: 2010-12-20 02:24+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: 2010-12-17 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -25,7 +25,7 @@ msgstr ""
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Цэс үүсгэх"
 
 #. module: board
 #: view:board.note:0
@@ -48,20 +48,20 @@ msgstr "Хяналтын самбарын үндсэн модул"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Сүүлийн холболт"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:0
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Хэрэглэгчийн алдаа!"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Админы хянах самбар"
 
 #. module: board
 #: view:board.note:0
@@ -74,12 +74,12 @@ msgstr "Тэмдэглэл"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Самбар"
 
 #. module: board
 #: view:board.board:0
@@ -204,7 +204,7 @@ msgstr ""
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr "Хяналтын самбарт зориулсан цэс үүсгэх"
+msgstr "Хянах самбарт зориулсан цэс үүсгэх"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -219,12 +219,12 @@ msgstr ""
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Самбрын мөр"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Толгой цэс"
+msgstr "Эцэг цэс"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -247,6 +247,7 @@ msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
 msgstr ""
+"Дэлгэцэнд самбрын шугамын дугаар харагдах үед захиалгын дугаарыг өгнө."
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -270,7 +271,7 @@ msgstr "Хяналтын самбарт зориулсан үндсэн моду
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Үйлдэл"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -291,7 +292,7 @@ msgstr "Цэсний нэр"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Сүүлийн хөдөлгөөн"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -347,7 +348,7 @@ msgstr "Өндөр"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr "Самбарын цэс үүсгэх"
+msgstr "Самбрын цэс үүсгэх"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -379,7 +380,7 @@ msgstr "Хяналтын самбар харах"
 #: code:addons/board/wizard/board_menu_create.py:0
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Хянах самбарын дэлгэцийг оруулна уу!"
 
 #. module: board
 #: view:board.note:0
@@ -393,26 +394,5 @@ msgstr "Сэдэв"
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
 
-#~ msgid "board.board"
-#~ msgstr "Самбар"
-
-#~ msgid "board.note"
-#~ msgstr "Самбарын тэмдэглэл"
-
-#~ msgid "Configuration"
-#~ msgstr "Тохируулга"
-
-#~ msgid "board.note.type"
-#~ msgstr "Самбар тэмдэглэлийн төрөл"
-
-#~ msgid "board.board.line"
-#~ msgstr "Самбарын шугам"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Харагдах архитектурт нийцэхгүй XML!"
-
-#~ msgid "Dashboards"
-#~ msgstr "Хянах самбар"
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 2fcebb6073c..6f0112ee246 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-03 03:21+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"PO-Revision-Date: 2010-12-19 21:46+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2010-12-17 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Rok  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Vytvoriť menu"
 
 #. module: board
 #: view:board.note:0
@@ -43,25 +43,25 @@ msgstr "Autor"
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "Nástenka hlavných modulov"
+msgstr "Nástenka hlavného modulu"
 
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Posledné priraredenia"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:0
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Používateľská chyba!"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Nástenka správy"
 
 #. module: board
 #: view:board.note:0
@@ -74,35 +74,35 @@ msgstr "Poznámka"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Zoskupiť podľa..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Nástenka"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Všeobecná týždenná aktivita"
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr "Titulok"
+msgstr "Titul"
 
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "Počet záznamov"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mesiac"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
@@ -114,12 +114,12 @@ msgstr "Otvoriť nástenku"
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Mesačná aktivita pre každý dokument"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analýza protokolu"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -130,23 +130,23 @@ msgstr "Definícia nástenky"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marec"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Používateľské prepojenia"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Dátum vytvorenia"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -157,12 +157,12 @@ msgstr "Publikovať poznámku"
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr "Informácia ponuky"
+msgstr "Informácie menu"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Jún"
 
 #. module: board
 #: field:board.note,type:0
@@ -172,12 +172,12 @@ msgstr "Typ poznámky"
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr "Zobrazenie akcií"
+msgstr "Pohľady akcie"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Výkaz protokolu"
 
 #. module: board
 #: view:board.note:0
@@ -188,48 +188,48 @@ msgstr "Dátum"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Júl"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšírené filtre..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Deň"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr "Vytvorenie ponuky pre nástenku"
+msgstr "Vytvoriť menu pre nástenku"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Február"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Október"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Riadok nástenky"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Rodičovská (základná) ponuka"
+msgstr "Rodičovské menu"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Január"
 
 #. module: board
 #: view:board.note:0
@@ -239,19 +239,19 @@ msgstr "Poznámky"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "Nastaví poradie pri zobrazovaní riadkov nástenky"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Apríl"
 
 #. module: board
 #: view:board.board:0
@@ -270,28 +270,28 @@ msgstr "Základný modul pre všetky nástenky."
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Akcia"
 
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
-msgstr "Pozícia"
+msgstr "Umiestnenie"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr "Názov ponuky"
+msgstr "Meno menu"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Posledné aktivity"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -301,7 +301,7 @@ msgstr "Vľavo"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr "Zobraziť panel"
+msgstr "Pohľad nástenky"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -316,28 +316,28 @@ msgstr "Šírka"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mesiac   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr "Poradie"
+msgstr "Postupnosť"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr "Vytvorenie ponuky"
+msgstr "Vytvoriť menu"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -347,23 +347,23 @@ msgstr "Výška"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr "Vytvorenie panela ponuky"
+msgstr "Vytvoriť menu nástenky"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Máj"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: board
 #: view:board.menu.create:0
@@ -373,13 +373,13 @@ msgstr "Zrušiť"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "Zobrazenie nástenky"
+msgstr "Pohľad nástenky"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:0
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Prosím vložte pohľad(y) nástenky!"
 
 #. module: board
 #: view:board.note:0
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index 92e74c21dcf..4ee66ba785a 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -194,6 +194,29 @@ msgstr ""
 msgid "Calendar attributes"
 msgstr ""
 
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid "\n"
+"    This module Contains basic functionality for caldav system like:  \n"
+"  - Webdav server that provides remote access to calendar\n"
+"  - Synchronisation of calendar using WebDAV\n"
+"  - Customize calendar event and todo attribute with any of OpenERP model\n"
+"  - Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
+"        http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is created\n"
+"        CALENDAR_NAME: Name of calendar to access\n"
+""
+msgstr ""
+
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
index 6d07630fb44..7963d5973a7 100644
--- a/addons/caldav/i18n/fr.po
+++ b/addons/caldav/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 09:19+0000\n"
+"PO-Revision-Date: 2010-12-20 00:07+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -134,18 +134,18 @@ msgstr "Lignes de calendrier"
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "S'abonner à l'évènement"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importer ICS"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuler"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_event
@@ -158,7 +158,7 @@ msgstr ""
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Event"
-msgstr ""
+msgstr "Évènement"
 
 #. module: caldav
 #: field:document.directory,calendar_collection:0
@@ -168,7 +168,7 @@ msgstr ""
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de répertoires récursifs."
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -176,12 +176,12 @@ msgstr ""
 #: field:basic.calendar.fields,type_id:0
 #: field:basic.calendar.lines,name:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: caldav
 #: field:basic.calendar,description:0
 msgid "description"
-msgstr ""
+msgstr "description"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index d428e62b19a..833d0530e69 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr ""
+
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7aefcc3fb60..c2222bf162e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -38,7 +38,7 @@ CRM_LEAD_PENDING_STATES = (
 class crm_lead(crm_case, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
-    _description = "Lead"
+    _description = "Lead/Opportunity"
     _order = "date_action, priority, id desc"
     _inherit = ['mailgate.thread','res.partner.address']
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index a3ed5b3ad18..a3e29f91cfc 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -81,6 +81,7 @@ msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
+#: view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
@@ -138,11 +139,6 @@ msgstr ""
 msgid "No Repeat"
 msgstr ""
 
-#. module: crm
-#: field:crm.case.section,resource_calendar_id:0
-msgid "Resource's Calendar"
-msgstr ""
-
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -692,6 +688,11 @@ msgstr ""
 msgid "Defines a rule or repeating pattern of time to exclude from the recurring rule."
 msgstr ""
 
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
@@ -3014,11 +3015,6 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#. module: crm
-#: model:res.request.link,name:crm.request_link_meeting
-msgid "Case Meeting"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
@@ -3203,6 +3199,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
 #, python-format
 msgid "Meeting"
 msgstr ""
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 102dd70358e..b8eccc541aa 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-17 03:58+0000\n"
+"PO-Revision-Date: 2010-12-17 15:23+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: 2010-12-17 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -203,7 +203,7 @@ msgstr "Avertissement !"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "Analyse des opportunités"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -506,7 +506,7 @@ msgstr "Privé"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Analyse des opportunités"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -1983,7 +1983,7 @@ msgstr "Opportunité par catégories"
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Nom du client"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -2162,7 +2162,7 @@ msgstr "URL caldav"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Revenus attendus"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2385,7 +2385,7 @@ msgstr ""
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Copie à tous :"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2399,7 +2399,7 @@ msgstr "Appels téléphoniques"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Nombre de jours pour ouvrir le cas"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2420,7 +2420,7 @@ msgstr "Actif"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "L'étape de l'opportunité \"%s\" a été changé à \"%s\"."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2435,7 +2435,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Incertain"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2459,11 +2459,15 @@ msgid ""
 "Helps you manage wiki pages for Frequently Asked Questions on Sales "
 "Application."
 msgstr ""
+"Vous aide à gérer les pages wiki pour les FAQ (Foires Aux Questions) sur le "
+"module Ventes."
 
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
+"Ceci peut aider les associations dans leur processus de levée de fonds et de "
+"suivi."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2496,7 +2500,7 @@ msgstr ""
 #: field:crm.lead2partner,action:0
 #: field:crm.phonecall2partner,action:0
 msgid "Action"
-msgstr "Nom"
+msgstr "Action"
 
 #. module: crm
 #: field:crm.installer,crm_claim:0
@@ -2513,23 +2517,23 @@ msgstr "Fact. décrois. (0.0>1.0)"
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr "Semaine"
+msgstr "Hebdomadaire"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Impossible d'envoyer le courriel !"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Divers"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -2560,7 +2564,7 @@ msgstr "Intervalle max de calcul"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_Planifier un appel"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2580,12 +2584,12 @@ msgstr "Ouvert"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Mardi"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Ville"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -2610,28 +2614,28 @@ msgstr "Responsable"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Le cas \"%s\" a été annulé."
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Opportunité en devis."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Envoyer un nouveau courriel"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Mes opportunités ouvertes"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - Tableau de bord de statistiques"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2640,11 +2644,14 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Définit une règle pour des évènements récurrents.\n"
+"Par exemple : à faire 10 fois, tous les deux mois, le dernier dimanche du "
+"mois : FREQ=Mensuel;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Emploi principal"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2656,19 +2663,19 @@ msgstr "Limite Maximale de l'Historique de communication"
 #: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
-"Êtes vous sur de vouloir créer un partenaire basé sur cette affaire ?"
+"Êtes vous sûr de vouloir créer un partenaire à partir de cette piste ?"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Type de réunion"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Fusionner avec une opportunité existante"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2682,6 +2689,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'état est à \"Brouillon\" quand le cas est créé.\n"
+"Si le cas est en cours, l'état est à \"Ouvert\".\n"
+"Quand le cas est terminé, l'état est à \"Terminé\".\n"
+"Si le cas doit être revu, l'état est à \"En attente\"."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2692,7 +2703,7 @@ msgstr "Date de fin"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Troisième"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2700,40 +2711,40 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
-"Le calcul est effectué sur tout les évenements qui ont eux lieu pendant "
-"cette interval, les dernières X périodes."
+"Le calcul est effectué sur tous les évènements qui ont eu lieu pendant cet "
+"intervalle, les dernières X périodes."
 
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "Mon ratio Gagné/Perdu pour l'année précédente"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Custom Recurrency Rule"
-msgstr ""
+msgstr "Régle de récurrence personnalisée"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "Nb. de courriels"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr "Recherche des prospections"
+msgstr "Rechercher des pistes"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Délai pour ouvrir"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -2743,22 +2754,22 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Jour de la semaine"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Référent"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Conversion de piste en opportunité"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Information du participant"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2778,19 +2789,19 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Appel téléphonique au partenaire"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr "Assigné à"
+msgstr "Assigner à"
 
 #. module: crm
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Passer le nouvel état à"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2810,19 +2821,19 @@ msgstr "Durée"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Résumé de l'appel"
 
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Répondre à"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Tableaux de bord des ventes"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -2840,17 +2851,17 @@ msgstr "# de cas"
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Équipe commerciale à laquelle le cas appartient."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Dimanche"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Quatrième"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2863,17 +2874,17 @@ msgstr "Non modifié"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Segmentation des partenaires"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Affectation"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2888,67 +2899,67 @@ msgstr "Société"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Vendredi"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Toute la journée"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nb. de courriels"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Invitations à des réunions"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nom de l'objet"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "Adresse courriel du contact"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Apporté par"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Ajouter une note interne"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La piste \"%s\" est passée à l'étape \"%s\"."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Dernier"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Modifier la probabilité sur les étapes suivantes et précédentes."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2961,7 +2972,7 @@ msgstr "Erreur!"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exclude range"
-msgstr ""
+msgstr "Exclure la plage"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2978,7 +2989,7 @@ msgstr "Annulé"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Corps de la note"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -2990,24 +3001,24 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Mes revenus planifiés par étape"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Date de clôture"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mois   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Liens"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -3024,27 +3035,31 @@ msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Si le partenaire n'a pas acheté pendant une période, l'état d'esprit est "
+"diminué de ce facteur. C'est une multiplication"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
-msgstr ""
+msgstr "Passerelle des courriels"
 
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
 msgstr ""
+"Par défaut, le représentant commercial est l'administrateur quand on crée un "
+"nouvel utilisateur"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Nb. de courriels"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -3060,17 +3075,17 @@ msgstr "Opérateur"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Appel téléphonique à appel téléphonique"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Planifie/Enregistre un appel"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Relever les courriels"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -3083,16 +3098,18 @@ 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 ""
+"Ces adresses recevront une copie de ce courriel. Pour modifier de façon "
+"permanente la liste des \"Copie à\", modifiez le champ 'Copie à' de ce cas."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Dim"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -3102,7 +3119,7 @@ msgstr "Section"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Total des revenus planifiés"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3111,6 +3128,8 @@ msgid ""
 "You can not escalate, You are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Vous ne pouvez pas escalader, vous êtes déjà au plus haut niveau pour votre "
+"catégorie d'équipe commerciale."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3120,12 +3139,12 @@ msgstr "Expression facultative"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Jour du mois"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Taux de succès (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3136,7 +3155,7 @@ msgstr "Nouveau"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Envoyer un courriel à"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3144,7 +3163,7 @@ msgstr ""
 #: field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "Email"
+msgstr "Courriel"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3158,7 +3177,7 @@ msgstr "Canal"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr "Appel planifié"
+msgstr "Planifier un appel"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -3181,6 +3200,10 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Cochez cette case si la catégorie est limitée aux partenaires qui "
+"correspondent aux critères de segmentation.\n"
+"Si la case est cochée, cela supprime la catégorie des partenaires qui ne "
+"correspondent pas aux critères de segmentation."
 
 #. module: crm
 #: field:crm.meeting,exdate:0
@@ -3198,6 +3221,8 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
+"L'échéance est calculée automatiquement à partir de la date de début + la "
+"durée"
 
 #. module: crm
 #: field:crm.lead,state_id:0
@@ -3207,33 +3232,34 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Création des opportunités d'affaires à partir des prospections"
+msgstr "Créer des opportunités d'affaires à partir des pistes."
 
 #. module: crm
 #: help:crm.send.mail,html:0
 msgid "Select this if you want to send email with HTML formatting."
 msgstr ""
+"Cochez cette case si vous souhaitez envoyer des courriels au format HTML."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "A besoin d'information"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Opportunité prospect"
 
 #. module: crm
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "Configuration du CRM"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Passer la catégorie à"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3243,23 +3269,23 @@ msgstr "Configuration"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Jeu"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "Ce module associe les ventes avec les opportunités du module CRM"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -3269,23 +3295,23 @@ msgstr "Journalier"
 #. module: crm
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Case Meeting"
-msgstr ""
+msgstr "Réunion à propos du cas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Qualification"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Définition de l'étape"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Premier"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3297,7 +3323,7 @@ msgstr "Décembre"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3315,16 +3341,23 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"Une période est le nombre de jours moyens entre deux cycles de vente ou "
+"d'achat pour cette segmentation.\n"
+"Elle est principalement utilisée pour déterminer si un partenaire n'a pas "
+"acheté ou commandé depuis un temps trop long,\n"
+"et donc nous supposons que son état d'esprit s'est détérioré parce qu'il a "
+"probablement acheté à un autre fournisseur.\n"
+"Utilisez cette fonctionnalité pour les affaires récurrentes."
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_Envoyer une réponse"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Fuseau horaire"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
@@ -3336,7 +3369,7 @@ msgstr "Message"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Sam"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3349,12 +3382,12 @@ msgstr "Vendeur"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Date de fermeture prévue"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Opportunité en appel téléphonique"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3369,7 +3402,7 @@ msgstr "Planifier un rendez-vous"
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Nom du partenaire"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3382,13 +3415,13 @@ msgstr "Sortant"
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Ouvert"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Membres de l'équipe"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3396,17 +3429,17 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Intérêt pour les ordinateurs"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Détail de l'invitation"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3420,6 +3453,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Ces adresses courriels seront ajoutées par défaut au champ \"Copie à\" de "
+"tous les courriels entrants et sortants de cet enregistrement. Séparez les "
+"adresses multiples avec une virgule."
 
 #. module: crm
 #: constraint:res.partner:0
@@ -3430,7 +3466,7 @@ msgstr ""
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Probabilité de succès"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3448,13 +3484,13 @@ msgstr "Brouillon"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Cas par équipes commerciales"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -3469,7 +3505,7 @@ msgstr "Rendez-vous"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Catégorie de cas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3480,17 +3516,17 @@ msgstr "7 Jours"
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Revenu planifié par étape et par utilisateur"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "Rapport sur les pistes du CRM"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avancement de la configuration"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3503,25 +3539,25 @@ msgstr "Normal"
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Rue 2"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Catégories de rendez-vous"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr "Vous devez vérifier que ce partenaire n'existe pas"
+msgstr "Vous devriez vérifier que ce partenaire n'existe pas déjà."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Délai pour ouvrir"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3545,7 +3581,7 @@ msgstr "Pas de courriel défini dans l'adresse de votre société"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Opportunités par étape"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3576,7 +3612,7 @@ msgstr "Contrat"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Publicités Twitter"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:0
@@ -3588,12 +3624,12 @@ msgstr "Erreur"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Revenus planifiés"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "A besoin de consultation"
 
 #. module: crm
 #: constraint:crm.segmentation:0
@@ -3604,7 +3640,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "Le cas \"%s\" a été fermé."
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3616,7 +3652,7 @@ msgstr "Contact partenaire"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Date de l'identifiant récurrent"
 
 #. module: crm
 #: sql_constraint:res.users:0
@@ -3627,7 +3663,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Fusionné avec l'opportunité : %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3641,18 +3677,18 @@ msgstr "Clôturer"
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "Catégorisation"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Règles d'action"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Récurrence"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3662,7 +3698,7 @@ msgstr "Appel téléphonique"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Jeudi"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3678,12 +3714,12 @@ msgstr "Privé"
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Fonction"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Ajouter"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3718,7 +3754,7 @@ msgstr "Description"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Équipe commerciale"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3730,13 +3766,13 @@ msgstr "Mai"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Intérêt pour les accessoires"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "L'opportunité \"%s\" a été ouverte."
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3746,23 +3782,23 @@ msgstr "Obligatoire / Optionnelle"
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Rue"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Opportunités par utilisateur et par équipe"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Heures de travail"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3782,14 +3818,14 @@ msgstr "Planifier un rendez vous"
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Perdu"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Pays"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3802,7 +3838,7 @@ msgstr "Convertir en opportunité"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Mercredi"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3814,33 +3850,33 @@ msgstr "Avril"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Nom de la campagne"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Appels téléphoniques par utilisateur et par section"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Fusionner avec une opportunité existante"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Option"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Négociation"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Clôture prév."
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3851,12 +3887,12 @@ msgstr "Séquence"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Corps du message"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3866,18 +3902,18 @@ msgstr "Variable de contrôle"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Seconde"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Proposition"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Appels téléphoniques"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3890,7 +3926,7 @@ msgstr "Année"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr "Bulletin d'information"
+msgstr "Lettre d'information"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index ee300a635e5..a313fc15716 100644
--- a/addons/crm/i18n/mn.po
+++ b/addons/crm/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-09-29 11:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 11:10+0000\n"
+"Last-Translator: sugi <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: 2010-12-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "# Судалгаа"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -28,22 +28,22 @@ msgstr ""
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Судалгаа"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Хэрэгтэй үйлчилгээ"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Сар тутам"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Төлөвлөх"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -53,29 +53,29 @@ msgstr "Тохиолдын үе"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "Харагдац"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Гарчиг"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Үзүүлэх"
 
 #. module: crm
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Сарын огноо"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Today"
-msgstr ""
+msgstr "Өнөөдөр"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -86,29 +86,29 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Хаах хүлээлт"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Өмнөх үе"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:0
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Тэмдэглэл нэмж болохгүй!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Үеийн нэр"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -116,7 +116,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Өдөр"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -133,17 +133,17 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "Энэ судалгаа '%s' хаагдсан байна."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Дахихгүй"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Нөөц календар"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -151,17 +151,17 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Сэрэмжлүүлэг!"
+msgstr "Сануулга !"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Жил тутмын"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Дүрмийн нэр"
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -176,12 +176,12 @@ msgstr "Компанит ажил"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "Харилцагч үүсэхгүй"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Боломж хайх"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -194,14 +194,14 @@ msgstr ""
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
 msgid "Warning!"
-msgstr "Сэрэмжлүүлэг!"
+msgstr "Сануулга!"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "Боломж Шинжилгээ"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -228,14 +228,14 @@ msgstr "Харилцагч"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Зохион байгуулагч"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Бусад дуудлагыг төлөвлөх"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
@@ -250,7 +250,7 @@ msgstr "Утасны дуудлага"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Хүлээж авахгүй"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -266,6 +266,10 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Удирдлагын шинжилгээ нь CRM-д хамааралтай төрөл бүрийн мэдээллийг шалгах "
+"боломж олгодог. Өгсөн хариуны дугаар болон илгээсэн эмэйлүүдийг шалгах. "
+"Нарийн шинжилгээ гаргахын тулд судалгаа шинжилгээг олон янзын бүлэгт хувааж "
+"болно."
 
 #. module: crm
 #: view:crm.lead:0
@@ -285,19 +289,19 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr "Хэсгүүд"
+msgstr "Хэсэг"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "_Нэгтгэх"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Судалгаа Шинжилгээ"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -310,13 +314,13 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Нийтийн"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Компанит ажил"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -343,6 +347,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Хэрэв хүлээж авахгүй-г чеклвэл магадлагдаагүй компанит ажил буюу э-"
+"мэйлүүдийг хүлээж авахаас татгалзана."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -352,7 +358,7 @@ msgstr "Хэтийн түнш"
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr "Гэрээний нэр"
+msgstr "Харицах хүний нэр"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -387,7 +393,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "Энэ судалгаа '%s' нээгдсэн байна."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -415,22 +421,22 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Судалгаа ба Боломжууд"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send"
-msgstr ""
+msgstr "_Илгээх"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr ""
+msgstr "Харилцаа холбоо"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Change Responsible"
-msgstr ""
+msgstr "Солих үүрэгтэй"
 
 #. module: crm
 #: field:crm.merge.opportunity,state:0
@@ -445,7 +451,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Шинэчлэх огноо"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -456,7 +462,7 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Үйл ажиллагаа сонгох"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -474,32 +480,32 @@ msgstr "Ангилал"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Компанит ажил 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Компанит ажил 2"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "Хувийн"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Боломж Шинжилгээ"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Үйл явдлын байрлал"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -544,7 +550,7 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Шат дараалан хөгжүүлэх"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -561,33 +567,33 @@ msgstr "6 сар"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "Ачааллаагүй"
 
 #. module: crm
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "Сүүлийн э-мэйлд хариулах"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "Э-мэйл"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "Борлуулалт FAQ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.send.mail.attachment"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Count"
-msgstr ""
+msgstr "Тоолох"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -611,7 +617,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Дүгнэлт"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -636,7 +642,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Үүрний ангилал"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -663,7 +669,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#Утасны дуудлага"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -675,7 +681,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
-msgstr ""
+msgstr "Харилцаа холбооны түүх"
 
 #. module: crm
 #: help:crm.phonecall,canal_id:0
@@ -689,7 +695,7 @@ msgstr ""
 #: code:addons/crm/crm_meeting.py:0
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Уулзалт  '%s'  батлагдсан байх."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -712,7 +718,7 @@ msgstr ""
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Идэвхтэй"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -737,7 +743,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Дэлгэрэнгүй"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -749,7 +755,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Жил"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
@@ -761,7 +767,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Судалгааны форм"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -783,18 +789,18 @@ msgstr ""
 #: field:crm.case.stage,probability:0
 #: field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "Магадлал (%)"
+msgstr "Боломж (%)"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Судалгааны үе"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Статистик хянах самбар"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -814,7 +820,7 @@ msgstr "Боломж"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "Телевиз"
 
 #. module: crm
 #: field:crm.installer,crm_caldav:0
@@ -824,12 +830,12 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+msgstr "Зогсоох"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Утасны дуудлага хайх"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -848,7 +854,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Өдрөөр"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
@@ -859,17 +865,17 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Үйл явдлын төрөл"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
 msgid "crm.installer"
-msgstr ""
+msgstr "crm.installer"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "Дээд зиндаанд зориулсан"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -921,23 +927,23 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Үүсгэх огноо"
 
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Дугаар 2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "Борлуулалт худалдан авалт"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Шаардлага"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -949,7 +955,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Хөрвүүлэх боломж "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -963,7 +969,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Боломжууд"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
@@ -974,12 +980,12 @@ msgstr "Харилцагчийн ангилал"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Тэмдэглэл нэмэх"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Нийлүүлэгч"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
@@ -994,7 +1000,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "Худалдан авалтын хэмжээ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1017,12 +1023,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Нээх өдөр"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Үзүүлэх хугацаа"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1034,7 +1040,7 @@ msgstr "Харилцагч үүсгэх"
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0
@@ -1052,22 +1058,22 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Дараагийн үе"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Миний уулзалтууд"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr "Ишлэл"
+msgstr "Дугаар"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Хүлээж авах"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -1082,7 +1088,7 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr "Уулзалт"
+msgstr "Уулзалтууд"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -1098,7 +1104,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "Дуусах"
+msgstr "Дуусах огноо"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -1109,7 +1115,7 @@ msgstr "Дуусах"
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr "_Болих"
+msgstr "_Цуцлах"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
@@ -1125,17 +1131,17 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Өмнөх"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Статистик"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr "Оролцогчид"
+msgstr "Оролцогч"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -1153,12 +1159,12 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Дараагийн"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Үе:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
@@ -1175,12 +1181,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Борлуулалтын хэлтэс"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "HTML формат?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1203,14 +1209,14 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr "Дор"
+msgstr "Доод"
 
 #. module: crm
 #: view:crm.add.note:0
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Хавсралт"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1227,7 +1233,7 @@ msgstr "8 сар"
 #: field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr "Үүсгэсэн Огноо"
+msgstr "Үүсгэх огноо"
 
 #. module: crm
 #: help:crm.meeting,interval:0
@@ -1237,7 +1243,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Хэрэгтэй Вэбсайт загвар"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1250,12 +1256,12 @@ msgstr ""
 #: field:crm.send.mail,subject:0
 #: view:res.partner:0
 msgid "Subject"
-msgstr "Сэдэв"
+msgstr "Агуулга"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Мяг"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1266,22 +1272,22 @@ msgstr ""
 #: field:crm.lead.report,stage_id:0
 #, python-format
 msgid "Stage"
-msgstr "Шат"
+msgstr "Үе"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Түүхийн мэдээлэл"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Харилцагчийн мэйл"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Илгээх"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1308,7 +1314,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Үе"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1316,7 +1322,7 @@ msgstr ""
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr "Боломжит орлого"
+msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1334,25 +1340,25 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Утасны дуудлагын Шинжилгээ"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Нээх өдөр"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Минутын үргэлжлэх хугацаа"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr "Үргэлжлүүлэх"
+msgstr "Үргэлжлэх"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
@@ -1362,7 +1368,7 @@ msgstr ""
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Боломжийн нэр"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1375,27 +1381,27 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Жил  "
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Edit All"
-msgstr ""
+msgstr "Бүгдийг засах"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Баа"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Бичих огноо"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "Сануулга"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1412,7 +1418,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "Харилцагч үүсгэх"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1422,26 +1428,26 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Даваа"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Хаах өдөр"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "тодорхой бус"
 
 #. module: crm
 #: field:crm.lead,id:0
 #: field:crm.meeting,id:0
 #: field:crm.phonecall,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
@@ -1465,17 +1471,17 @@ msgstr "Огноо"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Өргөтгөсөн хайлт..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Боломжийн товч утга"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Хайх"
 
 #. module: crm
 #: view:board.board:0
@@ -1485,7 +1491,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Завсар"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1501,12 +1507,12 @@ msgstr "Түүх"
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Дэд баг"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1529,12 +1535,12 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Давтамж"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr ""
+msgstr "Дугаар"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1554,7 +1560,7 @@ msgstr "Цуцлах"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1564,19 +1570,19 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Үйлчлүүлэгч"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Онцгой дүрэм"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
@@ -1586,27 +1592,27 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Утасны дуудлагын ангилал"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Урих хүмүүс"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Алдаа ! Та борлуулалтын баг үүсгэж болохгүй"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Уулзалт хайх"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "Борлуулалтын хэмжээ"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:0
@@ -1617,12 +1623,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Батлагдаагүй"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1656,7 +1662,7 @@ msgstr ""
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr "Түгшүүр"
+msgstr "Тохио"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1667,17 +1673,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Төрсөн огноо"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "Энэ"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Визард"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1690,7 +1696,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Үүсгэх"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1703,7 +1709,7 @@ msgstr "Өндөр"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Секунд"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1713,22 +1719,22 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Хөрвүүлэх"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Бямба"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "5 дугаар"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Төлөвлөгөө"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1738,7 +1744,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Лха"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
@@ -1757,7 +1763,7 @@ msgstr "Төлөвлөсөн орлого"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
@@ -1767,17 +1773,17 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Урилгын мэдээлэл"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Эцэг баг"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Дараагий үйл ажиллагааны огноо"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1787,12 +1793,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Hours"
-msgstr ""
+msgstr "Цаг"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Зип"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1803,14 +1809,14 @@ msgstr ""
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Ирсэн"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1823,12 +1829,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Чөлөөтэй"
 
 #. module: crm
 #: view:crm.installer:0
@@ -1843,7 +1849,7 @@ msgstr "Зөвшөөрөл устгах"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Дав"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1851,19 +1857,19 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Өндөр"
 
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Тэмдэглэл"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Days"
-msgstr ""
+msgstr "Өдрүүд"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1874,13 +1880,13 @@ msgstr "Утга"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Боломж (ангиллаар)"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн нэр"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1899,17 +1905,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Minutes"
-msgstr ""
+msgstr "Минут"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Борлуулалтын багийг үе шатаар сонгох"
 
 #. module: crm
 #: view:board.board:0
@@ -1926,63 +1932,63 @@ msgstr ""
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Хөрвүүлэх боломж"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "Нөлөө"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Ноороглох"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Нэмэлт мэдээлэл"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Боломж нэгтгэх"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Компанит ажлын мэйл 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "Компанит ажлын мэйл 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Үүсгэх"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Илгээх"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2003,7 +2009,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Харилцагчийн судлагдсан боломж"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2013,12 +2019,12 @@ msgstr "Байрлал"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Хариу"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "7 хоног"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2029,7 +2035,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
@@ -2047,22 +2053,22 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr "Төлөвлөсөн Огноо"
+msgstr "Төлөвлөсөн огноо"
 
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: help:crm.lead,type:0
@@ -2087,12 +2093,12 @@ msgstr "7 сар"
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Борлуулалтын баг"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Харилцагчийн судалгаа"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2104,24 +2110,24 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Баг"
 
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "Нөлөөгүй"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Магадлал"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2138,20 +2144,20 @@ msgstr "Сар"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Судалгаа"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr "Шинэ харилцагч"
+msgstr "Шинэ харилцагч үүсгэх"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Эхлэх огноо"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2162,17 +2168,17 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Төлөөлөгч"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Татгалзах"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "Хэрэв хүлээж авах-г чеклвэл э-мэйлүүдийг хүлээж авахыг зөвшөөрнө."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2184,7 +2190,7 @@ msgstr ""
 #: view:crm.add.note:0
 #, python-format
 msgid "Note"
-msgstr ""
+msgstr "Тэмдэглэл"
 
 #. module: crm
 #: constraint:res.users:0
@@ -2197,7 +2203,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr "Бага"
+msgstr "доод"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2211,17 +2217,17 @@ msgstr "Бага"
 #: selection:crm.phonecall.report,state:0
 #: selection:crm.send.mail,state:0
 msgid "Closed"
-msgstr "Хаагдсан"
+msgstr "Хаасан"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Plug-In"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Дотоод уулзалт"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2250,7 +2256,7 @@ msgstr "Шийд хүлээсэн"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн уулзалт"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2266,7 +2272,7 @@ msgstr ""
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Глобал CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2311,17 +2317,17 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Тодорхой бус"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr "СС"
+msgstr "CC"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -2332,7 +2338,7 @@ msgstr "Мэйл илгээх"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Сар"
 
 #. module: crm
 #: help:crm.installer,wiki_sale_faq:0
@@ -2382,7 +2388,7 @@ msgstr "Үйлдэл"
 #. module: crm
 #: field:crm.installer,crm_claim:0
 msgid "Claims"
-msgstr "Шаардлагууд"
+msgstr "Нэхэмжлэл"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2394,18 +2400,18 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "Хавсралт"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "7 хоног"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Мэйл илгээж болохгүй!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2436,12 +2442,12 @@ msgstr "Дууссан"
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr ""
+msgstr "Хамгийн их завсар"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_Дуудлагын төлөвлөгөө"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2461,17 +2467,17 @@ msgstr "Нээх"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Мягмар"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Сум/Дүүрэг"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Завгүй"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
@@ -2496,23 +2502,23 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Боломжит үнийн санал"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Шинэ э-мэйл илгээх"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Миний нээлттэй боломжууд"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM- Статистик хянах самбар"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2530,7 +2536,7 @@ msgstr ""
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "Хамгийн их харилцаа холбооны түүх"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -2542,7 +2548,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Уулзалтын төрөл"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -2567,12 +2573,12 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Дуусах огноо"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "3 дугаар"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2594,17 +2600,17 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "# Э-мэйлүүдийн"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Судалгааны Хайлт"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2616,27 +2622,27 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Ажлын өдөр"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Хамаарагч"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Судлагдсан Боломж"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Оролцогчийн мэдээлэл"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2646,7 +2652,7 @@ msgstr "Тест хэмжилт"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "Үргэлжлүүлэх"
 
 #. module: crm
 #: view:crm.installer:0
@@ -2656,13 +2662,13 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Харилцагчийн утасны дуудлага"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Хариуцах"
 
 #. module: crm
 #: field:crm.add.note,state:0
@@ -2682,31 +2688,31 @@ msgstr "Сүүлийн үйлдэл"
 #: field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr "Үргэжлэх"
+msgstr "Үргэлжлэх хугацаа"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Дуудлагын товч утга"
 
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Борлуулалт хянах самбар"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Харилцагч аль хэдийн энэ судалгаанд тодорхойлогдсон байна."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2723,19 +2729,19 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Ням"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "4 дүгээр"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 #: selection:crm.merge.opportunity,state:0
 #: selection:crm.send.mail,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Солигдоогүй"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -2746,12 +2752,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Факс"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Хуваарилалт"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2766,44 +2772,44 @@ msgstr "Компани"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Баасан"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Бүх өдөр"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# Э-мэйлүүд"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Уулзалтын урилга"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Обьектийн нэр"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "Харицах Э-мэйл хаяг"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Хамаарагчаар"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Дотоод тэмдэглэл нэмэх"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -2814,14 +2820,14 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Сүүлийн"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Мессеж"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -2834,12 +2840,12 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Алдаа!"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exclude range"
-msgstr ""
+msgstr "Хасах өөрчлөлт"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2851,12 +2857,12 @@ msgstr ""
 #: selection:crm.phonecall.report,state:0
 #: selection:crm.send.mail,state:0
 msgid "Cancelled"
-msgstr "Цуцалсан"
+msgstr "Цуцлагдсан"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Тэмдэглэлийн үндсэн хэсэг"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -2874,18 +2880,18 @@ msgstr ""
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Хаах огноо"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Сар   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Линк"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2895,6 +2901,10 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Энэ тайлангаас та борлуулалтын багийн утасны дуудлага дээр суурилсан "
+"үзүүлэлтийг шинжилж болно.Хэд хэдэн төрлийн шалгууртай холбоотой мэдээллийг "
+"бүлэглэж шүүлт хийж болно. Мөн тайланд нэмж бүлэг оруулснаар мэдээллийн "
+"хэмжээг ихэсгэж болно."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2916,29 +2926,29 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "# Мэйлүүд"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Сануулга"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr "Дуудлагын товчоо"
+msgstr "Дуудлагын товч утга"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Оператор"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2965,12 +2975,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Батлах"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Ня"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2998,7 +3008,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Сарын өдөр"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
@@ -3009,7 +3019,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead1
 #: model:crm.case.stage,name:crm.stage_opportunity1
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3022,7 +3032,7 @@ msgstr ""
 #: field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "Имэйл"
+msgstr "Э-мэйл"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3044,7 +3054,7 @@ msgstr ""
 #: field:crm.meeting,date_action_next:0
 #: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "Дараагийн үйлдэл"
+msgstr "Дараагийн үйл ажиллагаа"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3063,12 +3073,12 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Онцгой Огноо/Цаг"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Итгэмжлэгдсэн"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
@@ -3080,7 +3090,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Аймаг/Хот"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
@@ -3095,7 +3105,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Хэрэгтэй мэдээлэл"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3106,7 +3116,7 @@ msgstr ""
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "CRM Хэрэглээний програмын тохиргоо"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
@@ -3121,13 +3131,13 @@ msgstr "Тохиргоо"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Пү"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
@@ -3137,12 +3147,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "of"
-msgstr ""
+msgstr "ийн"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Өдөр тутмын"
 
 #. module: crm
 #: model:res.request.link,name:crm.request_link_meeting
@@ -3153,17 +3163,17 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Мэргэшил"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Үе тодорхой байх"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Анхны"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3175,12 +3185,12 @@ msgstr "12 сар"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "Харилцаа холбооны түүх дахь нөхцөл"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3197,24 +3207,24 @@ msgstr ""
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_Буцааж илгээх"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Цагийн бүс"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
 #: field:crm.lead2partner,msg:0
 #: view:crm.send.mail:0
 msgid "Message"
-msgstr "Мессеж"
+msgstr "Мэссэж"
 
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Бя"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3227,12 +3237,12 @@ msgstr "Борлуулагч"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Хаахыг хүлээх"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Татан авалтын дуудлага"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3242,31 +3252,31 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Уулзалт төлөвлөх"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Харицагчийн нэр"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Гарсан"
 
 #. module: crm
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Нээлттэй"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Багийн гишүүнчлэл"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3274,7 +3284,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Contacts"
-msgstr ""
+msgstr "Харилцаа"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
@@ -3284,12 +3294,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Урилгын мэдээлэл"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Үндсэн (0=None)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3308,7 +3318,7 @@ msgstr ""
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Амжилттай"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3332,7 +3342,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Хаанаас"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -3353,7 +3363,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 өдөр"
 
 #. module: crm
 #: view:board.board:0
@@ -3363,12 +3373,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "CRM Судалгааны Тайлан"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Тохиргооны үйл явц"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3376,18 +3386,18 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr "Ердийн"
+msgstr "Хэвийн"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Гудамж2"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Уулзалтын ангилал"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3461,17 +3471,17 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Алдаа"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Төлөвлөсөн орлого"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Хэрэгтэй зөвлөгөө"
 
 #. module: crm
 #: constraint:crm.segmentation:0
@@ -3489,7 +3499,7 @@ msgstr ""
 #: field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr "Харьцах хүн"
+msgstr "Харилцагчийн холбоо"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
@@ -3519,28 +3529,28 @@ msgstr "Хаах"
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "Ангилал"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Үйл ажиллагааны дүрэм"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Давталт"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Пүрэв"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3551,17 +3561,17 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Хувийн"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Функц"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Нэмэх"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3576,7 +3586,7 @@ msgstr ""
 #: field:crm.phonecall,description:0
 #: field:crm.segmentation,description:0
 msgid "Description"
-msgstr "Тодорхойлолт"
+msgstr "Тайлбар"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0
@@ -3596,7 +3606,7 @@ msgstr "Тодорхойлолт"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Борлуулалтын баг"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3624,7 +3634,7 @@ msgstr "Мандатын/Албан бус"
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Гудамж"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3634,13 +3644,13 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Ажлын цаг"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Үйлчлүүлэгч"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3660,14 +3670,14 @@ msgstr "Уулзалтын хуваарь"
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Хаясан"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Улс"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3680,7 +3690,7 @@ msgstr "Хөрвүүлэх боломжтой"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Лхагва"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3692,7 +3702,7 @@ msgstr "4 сар"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Компанит ажлын нэр"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3707,13 +3717,13 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Сонголт"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Яриа хэлэлцээр"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3729,12 +3739,12 @@ msgstr "Дараалал"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Мессежний үндсэн хэсэг"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Зөвшөөрөх"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3744,18 +3754,18 @@ msgstr "Удирдах хэмжигдэхүүн"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "2 дугаар"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Мэдэгдэл"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Утасны дуудлага"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3768,227 +3778,4 @@ msgstr "Жил"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr "Мэдээллийн товхимол"
-
-#~ msgid "Emails"
-#~ msgstr "Имэйлүүд"
-
-#~ msgid "This Year"
-#~ msgstr "Энэ жил"
-
-#~ msgid "Created"
-#~ msgstr "Үүссэн"
-
-#~ msgid "General"
-#~ msgstr "Ерөнхий"
-
-#~ msgid "This Month"
-#~ msgstr "Энэ сар"
-
-#~ msgid "Amount"
-#~ msgstr "Хэмжээ"
-
-#~ msgid "Fixed"
-#~ msgstr "Тогтмол"
-
-#~ msgid "TRANSPARENT"
-#~ msgstr "Илэрхий"
-
-#~ msgid "Proposed Salary"
-#~ msgstr "Цалингийн санал"
-
-#~ msgid "None"
-#~ msgstr "Хоосон"
-
-#~ msgid "My Histories"
-#~ msgstr "Миний түүхүүд"
-
-#~ msgid "Last Action Date"
-#~ msgstr "Сүүлийн үйл ажиллагааны огноо"
-
-#~ msgid "Appreciation"
-#~ msgstr "Өндөр үнэлгээ"
-
-#~ msgid "Second Interview"
-#~ msgstr "Хоёр дахь уулзалт"
-
-#~ msgid "Description Information"
-#~ msgstr "Тайлбар мэдээлэл"
-
-#~ msgid "Delay type"
-#~ msgstr "Саатлын төрөл"
-
-#~ msgid "Next Interview"
-#~ msgstr "Дараагийн уулзалт"
-
-#~ msgid "Email Add CC"
-#~ msgstr "Имэйлд CC нэмэх"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Объектын нэр нь х_ болон онцгой тэмдэгтийн хослол байх ёстой"
-
-#~ msgid "All Meetings"
-#~ msgstr "Бүх уулзалтууд"
-
-#~ msgid "Add CC"
-#~ msgstr "СС нэмэх"
-
-#~ msgid "New Business"
-#~ msgstr "Шинэ бизнес"
-
-#~ msgid "   Today   "
-#~ msgstr "   Өнөөдөр   "
-
-#~ msgid "Policy Claims"
-#~ msgstr "Даатгалын шаардлага"
-
-#~ msgid "Assigned to"
-#~ msgstr "Шилжүүлсэн"
-
-#~ msgid "Partner Events"
-#~ msgstr "Түншийн үйл явц"
-
-#~ msgid "Contract Proposed"
-#~ msgstr "Гэрээ санал болгох"
-
-#~ msgid "Jobs - Hiring Process"
-#~ msgstr "Ажлууд-Хөлслөх үйл явц"
-
-#~ msgid "New Claims"
-#~ msgstr "Шинэ шаардлага"
-
-#~ msgid "Factual Claims"
-#~ msgstr "Баримттай шаардлагууд"
-
-#~ msgid "Pending Claims"
-#~ msgstr "Шаардлага хүлээх"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Архитектур харахад зориулсан алдаатай XML"
-
-#~ msgid "Value Claims"
-#~ msgstr "Заргын утга"
-
-#~ msgid "Search Claims"
-#~ msgstr "Шаардлага хайх"
-
-#~ msgid "In Progress Claims"
-#~ msgstr "Заргын үйл явц"
-
-#~ msgid "Claims Info"
-#~ msgstr "Заргын мэдээлэл"
-
-#~ msgid "All Claims"
-#~ msgstr "Бүх шаардлага"
-
-#~ msgid "Your action"
-#~ msgstr "Таны үй ажиллагаа"
-
-#~ msgid "Reporting"
-#~ msgstr "Мэдээ"
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Алдаатай аргумент"
-
-#~ msgid "Trensparent"
-#~ msgstr "Илэрхий"
-
-#~ msgid "Lead Subject"
-#~ msgstr "Сэдвийн удирдамж"
-
-#~ msgid "Planned"
-#~ msgstr "Төлөвлөсөн"
-
-#~ msgid "Customer Office"
-#~ msgstr "Харилцагчийн албан газар"
-
-#~ msgid "Change RRule"
-#~ msgstr "Дүрэм солих"
-
-#~ msgid "Licenced"
-#~ msgstr "Зөвшөөрөлтэй"
-
-#~ msgid "Planned revenue"
-#~ msgstr "Төлөвлөсөн улсын орлого"
-
-#~ msgid "Healthcare"
-#~ msgstr "Эмнэлэгийн тусламж"
-
-#~ msgid "Assign"
-#~ msgstr "Шилжүүлэх"
-
-#~ msgid "Office"
-#~ msgstr "Ажлын газар"
-
-#~ msgid "Estimates"
-#~ msgstr "Төсөв"
-
-#~ msgid "Section Code"
-#~ msgstr "Бүлэг код"
-
-#~ msgid "Meeting date"
-#~ msgstr "Уулзалтын огноо"
-
-#~ msgid "CONFIDENTIAL"
-#~ msgstr "Итгэмжлэгдсэн"
-
-#~ msgid "Content of mail"
-#~ msgstr "Имэйлийн агуулга"
-
-#~ msgid "Not fixed"
-#~ msgstr "Тогтмол бус"
-
-#~ msgid "Employee"
-#~ msgstr "Ажилтан"
-
-#~ msgid "Partner Email"
-#~ msgstr "Түншийн Имэйл"
-
-#~ msgid "% = The '%' Character"
-#~ msgstr "% = '%' тэмдэгт"
-
-#~ msgid "Internal Notes"
-#~ msgstr "Дотоодын тэмдэглэл"
-
-#~ msgid "_Import"
-#~ msgstr "_Импорт"
-
-#~ msgid "Mass Mailing"
-#~ msgstr "Бөөнөөр нь илгээх"
-
-#~ msgid "E-Mail Actions"
-#~ msgstr "Имэйл үйл ажиллагаанууд"
-
-#~ msgid "Cash"
-#~ msgstr "Касс"
-
-#~ msgid "Funds by Categories"
-#~ msgstr "Зэрэглэлээр хадгалах"
-
-#~ msgid "Future"
-#~ msgstr "Ирээдүй"
-
-#~ msgid "Save ICS file"
-#~ msgstr "ICS файл хадгалах"
-
-#~ msgid "Conditions on Timing"
-#~ msgstr "Цагийн байдал"
-
-#~ msgid "Export ICS File"
-#~ msgstr "ICS файл экспортлох"
-
-#~ msgid "Select ICS file"
-#~ msgstr "ICS файл сонгох"
-
-#~ msgid "Import Message"
-#~ msgstr "Мэссэжийн утга"
-
-#~ msgid "Cases by section"
-#~ msgstr "Тохиолдлуудаар нь бүлэглэх"
-
-#~ msgid "New Jobs"
-#~ msgstr "Шинэ ажлууд"
-
-#~ msgid "Fund Raising Operations"
-#~ msgstr "Мөнгө өсгөх үйл ажиллагаа"
+msgstr "Сонин"
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index fbec49509de..d80a8e1d5a7 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 17:24+0000\n"
+"PO-Revision-Date: 2010-12-18 11:02+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: 2010-12-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 59bf4fc261b..8d1f3c3882c 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-11 22:04+0000\n"
+"PO-Revision-Date: 2010-12-19 20:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -200,7 +200,7 @@ msgstr "Внимание!"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "Анализ сделок"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -249,7 +249,7 @@ msgstr "Звонок"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Отказ"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -306,7 +306,8 @@ msgid ""
 "partner."
 msgstr ""
 "При выборе объединения с существующей сделкой, реквизиты кандидата (вместе с "
-"историей общения) будет объединен с существующей сделкой выбранного партнера."
+"историей общения) будут объединены с существующей сделкой выбранного "
+"партнера."
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -541,7 +542,7 @@ msgstr "Создать сделку"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -653,12 +654,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Claim"
-msgstr ""
+msgstr "Претензия"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Ошибка: письмо плохо отформатировано"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -779,7 +780,7 @@ msgstr "Классификация партнера"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Вероятная выручка"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -795,7 +796,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Создание кандидатов"
 
 #. module: crm
 #: view:board.board:0
@@ -826,7 +827,7 @@ msgstr "Телевидение"
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "Синхронизация календаря"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -866,12 +867,12 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Тип события"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
 msgid "crm.installer"
-msgstr ""
+msgstr "crm.installer"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -882,7 +883,7 @@ msgstr "Эксклюзивный"
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "Сделка  '%s' выиграна."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
@@ -928,7 +929,7 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -944,7 +945,7 @@ msgstr "Продажи Закупки"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Требования"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -956,7 +957,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Преобразовать в сделку "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -981,12 +982,12 @@ msgstr "Категория партнера"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Добавить заметку"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Поставщик"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
@@ -996,7 +997,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Отметить \"Выиграна\""
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1006,7 +1007,7 @@ msgstr "Закупаемое количество"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Отметить \"Проиграна\""
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1019,7 +1020,7 @@ msgstr "Март"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "Сделка '%s'  закрыта."
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -1029,7 +1030,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Показать время как"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1055,11 +1056,12 @@ msgstr "Моб. тел."
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Нет других сделок в стадии \"Открыто\" или \"В ожидании\" для партнера '%s'."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Следующая стадия"
 
 #. module: crm
 #: view:board.board:0
@@ -1074,7 +1076,7 @@ msgstr "Ссылка"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Подписан"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -1095,12 +1097,12 @@ msgstr "Встречи"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr ""
+msgstr "Закрытого/отмененного кандидата нельзя преобразовать в сделку"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Повторять до"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1122,7 +1124,7 @@ msgstr "_Отмена"
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr ""
+msgstr "Закрытый/отмененный звонок нельзя преобразовать в сделку"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1132,12 +1134,12 @@ msgstr "Классификация партнеров"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Предыдущий"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Статистика"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -1160,34 +1162,34 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Следующий"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Этап:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Выиграна"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Отдел продаж"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Форматирование HTML ?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1217,7 +1219,7 @@ msgstr "Самый низкий"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Вложение"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1249,7 +1251,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Повторяющийся ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1262,7 +1264,7 @@ msgstr "Тема"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Вт"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1278,27 +1280,27 @@ msgstr "Этап"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "История"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Письмо партнеру"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Рассылки"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Пометить как"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Пусть события автоматически повторяются с этим интервалом"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -1341,18 +1343,18 @@ msgstr "Макс. ID обработанного партнера"
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Анализ звонков"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Дата открытия"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Продолжительность в минутах"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -1364,7 +1366,7 @@ msgstr "Продолжить"
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Управление техподдержкой"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
@@ -1382,17 +1384,17 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Год  "
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Edit All"
-msgstr ""
+msgstr "Редактировать все"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Пт"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
@@ -1421,7 +1423,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "Создать партнера"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1431,19 +1433,19 @@ msgstr "Статус выполнения"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Понедельник"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Дней до закрытия"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвестный"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1455,7 +1457,7 @@ msgstr "Идентификатор"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Партнер в Сделку"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1474,7 +1476,7 @@ msgstr "Дата"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
@@ -1484,17 +1486,17 @@ msgstr "Кратко о сделке"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Искать"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Сделки по категориям"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Интервал"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1510,12 +1512,12 @@ msgstr "Журнал"
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Подотделы"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1538,7 +1540,7 @@ msgstr "Продажи по телефону"
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Частота"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1563,24 +1565,24 @@ msgstr "Отмена"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Объединить две сделки"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Свой"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Текущие"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1596,17 +1598,17 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Категории звонков"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Пригласить"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Ошибка ! Вы не можете создать рекурсивные отделы продаж."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1622,7 +1624,7 @@ msgstr "Сумма продажи"
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
-msgstr ""
+msgstr "Невозможно отправить письмо. Пожалуйста, проверьте настройку SMTP."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1632,7 +1634,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Неподтверждённый"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1672,12 +1674,12 @@ msgstr "Сигнал"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Мои вопросы"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "День рождения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1687,7 +1689,7 @@ msgstr ""
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Помощник"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1700,7 +1702,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Создание"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1713,7 +1715,7 @@ msgstr "Высокая"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Секунд"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1728,12 +1730,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Суббота"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Пятый"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1743,17 +1745,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Задержка закрытия"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Ср"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Возможный посредник"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1767,7 +1769,7 @@ msgstr "Планируемая выручка"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
@@ -1777,17 +1779,17 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Подробности приглашения"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Главный отдел"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Дата следующего действия"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1802,13 +1804,13 @@ msgstr "Часы"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Индекс"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "Вопрос '%s'  был открыт."
 
 #. module: crm
 #: view:crm.installer:0
@@ -1833,17 +1835,17 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Звонки"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Свободно"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Синхронизация"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1853,7 +1855,7 @@ msgstr "Разрешить удаление"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Пн"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1868,7 +1870,7 @@ msgstr "Наивысший"
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Заметки"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1884,13 +1886,13 @@ msgstr "Значение"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Сделки по категориям"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Имя заказчика"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1904,7 +1906,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Звонок в Сделку"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1919,12 +1921,12 @@ msgstr "Минуты"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Выберите этапы для этого отдела продаж"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Сделки по этапам"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1936,7 +1938,7 @@ msgstr ""
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr "Превратить в сделку"
+msgstr "Преобразовать в сделку"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1961,17 +1963,17 @@ msgstr "Доп. информация"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Объединить сделки"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
@@ -1986,7 +1988,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Создать"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2023,12 +2025,12 @@ msgstr "Расположение"
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Ответ"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Недели"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2067,7 +2069,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Ожидаемая выручка"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2078,12 +2080,12 @@ msgstr ""
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Тип используется для разделения кандидатов и сделок"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "Вы уверены, что хотите создать партнера используя этот звонок ?"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -2097,12 +2099,12 @@ msgstr "Июль"
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Отделы продаж"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Кандидат в партнера"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2114,7 +2116,7 @@ msgstr "Классификация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Группа"
 
 #. module: crm
 #: field:crm.installer,outlook:0
@@ -2131,7 +2133,7 @@ msgstr "Не проведено"
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Вероятность"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2161,28 +2163,28 @@ msgstr "Создать нового партнера"
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "Сделать"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Поручить"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Отклонить"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "Если \"Подписан\" отмечено, этот контакт будет получать эл. письма."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2199,7 +2201,7 @@ msgstr "Заметка"
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Выбранная компания недоступна для этого пользователя"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2226,7 +2228,7 @@ msgstr "Закрыто"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Дополнение"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2260,7 +2262,7 @@ msgstr "В ожидании"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Встреча с заказчиком"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2290,7 +2292,7 @@ msgstr "Телефонные звонки"
 #: help:crm.lead.report,delay_open:0
 #: help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Количество дней на открытие вопроса"
 
 #. module: crm
 #: field:crm.lead,phone:0
@@ -2311,7 +2313,7 @@ msgstr "Активен"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Этап сделки '%s'  изменен на '%s'."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2326,7 +2328,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Неопределенный"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2404,12 +2406,12 @@ msgstr "Уменьшить (0>1)"
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Еженедельно"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:0
@@ -2420,7 +2422,7 @@ msgstr "Не могу послать эл. письмо !"
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Прочее"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -2471,17 +2473,17 @@ msgstr "Открыт"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Город"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Занят"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
@@ -2501,28 +2503,28 @@ msgstr "Ответственный"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Вопрос '%s' отменен."
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Сделка в Запрос цен"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Послать новое эл. письмо"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Мои открытые сделки"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "Панель статистики CRM"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2535,7 +2537,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Основная должность"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2552,13 +2554,13 @@ msgstr "Вы уверены, что хотите создать партнера
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Тип встречи"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Объединить с существующей сделкой"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2577,12 +2579,12 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Третий"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2594,12 +2596,12 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "Мое отношение Выиграно/Проиграно за последний год"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Custom Recurrency Rule"
-msgstr ""
+msgstr "Дополнительное правило повтора"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
@@ -2609,7 +2611,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "#  эл. писем"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2621,27 +2623,27 @@ msgstr "Поиск кандидатов"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Задержка открытия"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "День недели"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Указатель"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Кандидат в Сделку"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2661,12 +2663,12 @@ msgstr "Продолжение процесса"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Настройка модуля CRM"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Звонок в партнера"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2678,7 +2680,7 @@ msgstr "Назначить на"
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Установить новое состояние в"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2698,19 +2700,19 @@ msgstr "Продолжительность"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Кратко о звонке"
 
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Ответить"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Панель продаж"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -2728,17 +2730,17 @@ msgstr "кол-во вопросов"
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Отдел продаж, которому принадлежат вопросы."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Воскресенье"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Четвертый"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2751,17 +2753,17 @@ msgstr "Не изменен"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Сегментация партнеров"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Факс"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Назначение"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2776,62 +2778,62 @@ msgstr "Организация"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Пятница"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Весь день"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# эл. писем"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Приглашения на встречу"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Название объекта"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "Эл. адрес контакта"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Кем предложено"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Добавить внутреннею запись"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Этап кандидата '%s' изменен на '%s'."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Последний"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -2849,7 +2851,7 @@ msgstr "Ошибка!"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exclude range"
-msgstr ""
+msgstr "Исключить диапазон"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2866,7 +2868,7 @@ msgstr "Отменено"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Текст заметки"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -2884,18 +2886,18 @@ msgstr ""
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Дата закрытия"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Месяц   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2926,13 +2928,13 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "# Писем"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2948,7 +2950,7 @@ msgstr "Оператор"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Звонок в звонок"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2958,7 +2960,7 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,fetchmail:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Получить эл. почту"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -2975,12 +2977,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Вс"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2990,7 +2992,7 @@ msgstr "Раздел"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Всего запланированная выручка"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3008,12 +3010,12 @@ msgstr "Необязательное выражение"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "День месяца"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Шанс (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3046,7 +3048,7 @@ msgstr "Канал"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -3078,7 +3080,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Конфиденциально"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
@@ -3090,7 +3092,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Область"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
@@ -3105,7 +3107,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Нужна информация"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3116,12 +3118,12 @@ msgstr "Перспективы сделки"
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "Настройка модуля CRM"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Установить категорию в"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3131,13 +3133,13 @@ msgstr "Настройки"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Чт"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Месяц-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
@@ -3152,28 +3154,28 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Ежедневно"
 
 #. module: crm
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Case Meeting"
-msgstr ""
+msgstr "Встреча по вопросу"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Уточнение"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Определение этапа"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Первый"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3185,7 +3187,7 @@ msgstr "Декабрь"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3212,7 +3214,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
@@ -3224,7 +3226,7 @@ msgstr "Сообщение"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Сб"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3237,12 +3239,12 @@ msgstr "Менеджер продаж"
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Ожидаемое закрытие"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Сделка в звонок"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3257,7 +3259,7 @@ msgstr "Запланировать встречу"
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Имя партнера"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3270,7 +3272,7 @@ msgstr "Исходящий"
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Открыто"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3284,17 +3286,17 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Contacts"
-msgstr ""
+msgstr "Контакты"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Интерес к компьютеру"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Детали приглашения"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3312,7 +3314,7 @@ msgstr ""
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3336,7 +3338,7 @@ msgstr "Черновик"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Вопросы по отделам продаж"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3357,28 +3359,28 @@ msgstr "Встреча"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Категория вопроса"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 дней"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Планируемая выручка по этапу и пользователю"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "Отчет по кандидатам в CRM"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Настройка производится"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3397,7 +3399,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Категории встреч"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3410,7 +3412,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Задержка открытия"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3434,7 +3436,7 @@ msgstr "Нет ID эл. почты в адресе вашей компании!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Сделки по этапам"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -3477,23 +3479,23 @@ msgstr "Ошибка"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Планируемая выручка"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Нуждается в консультации"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Ошибка ! Вы не можете создать зацикленные профили."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "Вопрос '%s' был закрыт."
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3510,13 +3512,13 @@ msgstr ""
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Вы не можете иметь двух одинаковых пользователей !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Объединено со сделкой: %s"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3530,28 +3532,28 @@ msgstr "Закрыть"
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "Категоризация"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Правила действий"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Повторения"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Звонок"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Четверг"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3567,7 +3569,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Функция"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3607,7 +3609,7 @@ msgstr "Описание"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Отдел продаж"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3625,7 +3627,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "Сделка '%s' была открыта."
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3635,23 +3637,23 @@ msgstr "Обязательно / Опционально"
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Улица"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Сделки по пользователям и отделам"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Рабочие часы"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Заказчик"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3671,14 +3673,14 @@ msgstr "Запланировать встречу"
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Проиграно"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Страна"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3703,7 +3705,7 @@ msgstr "Апрель"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Название кампании"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3713,7 +3715,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Объединить с существующей сделкой"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3724,7 +3726,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Переговоры"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3740,12 +3742,12 @@ msgstr "Последовательность"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Содержимое сообщения"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Подтвердить"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3755,18 +3757,18 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Второй"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Предложение"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Звонки"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3779,7 +3781,7 @@ msgstr "Год"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Рассылка"
 
 #~ msgid "My Draft "
 #~ msgstr "Мой черновик "
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 5390f93c534..1a299122e68 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 23:19+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 00:02+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: 2010-12-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "# Leads"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -27,7 +27,7 @@ msgstr ""
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Lead"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -573,7 +573,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-post"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
@@ -2328,7 +2328,7 @@ msgstr "Osäker"
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "Kopia"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -3510,7 +3510,7 @@ msgstr ""
 #. module: crm
 #: 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: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -3546,28 +3546,28 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Torsdag"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Till"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Funktion"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3614,7 +3614,7 @@ msgstr ""
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
@@ -3635,7 +3635,7 @@ msgstr "Mandatory / Optional"
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Gata"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3645,20 +3645,20 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Arbetstimmar"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3671,14 +3671,14 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Förlorad"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3691,19 +3691,19 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Onsdag"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Kampanjnamn"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3718,13 +3718,13 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Alternativ"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Förhandling"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3740,12 +3740,12 @@ msgstr "Sequence"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Meddelandetext"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Acceptera"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3761,12 +3761,12 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Förslag"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3774,12 +3774,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "nyhetsbrev"
 
 #~ msgid "Planned Costs"
 #~ msgstr "Planerade kostnader"
diff --git a/addons/crm_caldav/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
index b629309e45d..a375283849c 100644
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ b/addons/crm_caldav/i18n/crm_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,3 +25,11 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid "\n"
+"    New Futures in Meeting:\n"
+"        *  Share meeting with other calendar clients like sunbird\n"
+""
+msgstr ""
+
diff --git a/addons/crm_caldav/i18n/mn.po b/addons/crm_caldav/i18n/mn.po
new file mode 100644
index 00000000000..f34a447d8a9
--- /dev/null
+++ b/addons/crm_caldav/i18n/mn.po
@@ -0,0 +1,28 @@
+# 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-17 16:11+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extened Module to Add CalDav future on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Уулзалт"
diff --git a/addons/crm_caldav/i18n/ru.po b/addons/crm_caldav/i18n/ru.po
new file mode 100644
index 00000000000..5e94313f915
--- /dev/null
+++ b/addons/crm_caldav/i18n/ru.po
@@ -0,0 +1,28 @@
+# Russian 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-19 18:46+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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: 2010-12-20 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extened Module to Add CalDav future on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Встреча"
diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot
index ca6f9393337..bc13ec8ecd2 100644
--- a/addons/crm_claim/i18n/crm_claim.pot
+++ b/addons/crm_claim/i18n/crm_claim.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -121,6 +121,11 @@ msgstr ""
 msgid "Preventive"
 msgstr ""
 
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr ""
+
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
@@ -285,7 +290,6 @@ msgid "Stages"
 msgstr ""
 
 #. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
 msgstr ""
@@ -428,6 +432,11 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr ""
+
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
@@ -458,6 +467,15 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid "\n"
+"This modules allows you to track your customers/suppliers claims and flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
@@ -477,6 +495,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
@@ -625,16 +644,6 @@ msgstr ""
 msgid "Report a Claim"
 msgstr ""
 
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Actions Done"
-msgstr ""
-
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Actions Defined"
-msgstr ""
-
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index 2264df1ed6a..00097ede43f 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-11 10:18+0000\n"
+"PO-Revision-Date: 2010-12-18 10:04+0000\n"
 "Last-Translator: lolivier <olivier.lenoir@free.fr>\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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -67,7 +67,7 @@ msgstr "E-mails des contrôleurs"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "Nb. de réclamation"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -76,6 +76,9 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"Vous pouvez créer des étapes relatives aux réclamations afin de les classer "
+"dans le système. Les étapes définissent pas à pas les éléments nécessaires à "
+"la résolution d'une réclamation."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -100,6 +103,9 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Équipe commerciale à laquelle le cas appartient. Sert à définir "
+"l'utilisateur responsable et le compte courriel à utiliser pour la "
+"passerelle des courriels."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -125,7 +131,7 @@ msgstr "Annulé"
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Préventive"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
@@ -186,7 +192,7 @@ msgstr "Section"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Causes premières"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
@@ -219,7 +225,7 @@ msgstr "Type"
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Courriel"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -243,6 +249,8 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
+"Présente une vue générale des réclamations traités par le système en les "
+"classant selon des critères particuliers."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -252,7 +260,7 @@ msgstr "Juillet"
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "Étapes de la réclamation"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
@@ -360,7 +368,7 @@ msgstr "Catégorie"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Réclamations sur la valeur"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -424,7 +432,7 @@ msgstr "Copie à tous :"
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Gestion de la relation client et fournisseur"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -444,7 +452,7 @@ msgstr "Utilisateur"
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "Catégories de réclamation"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -459,7 +467,7 @@ msgstr "Filtres étendus..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Clôture"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -485,7 +493,7 @@ msgstr "Date de la réclamation"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Ces personnes recevront un courriel."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -504,7 +512,7 @@ msgstr "Action Corrective"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Réclamations de procédure"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -531,6 +539,12 @@ msgid ""
 "type and so on..). Claims can be automatically linked to an email address "
 "using the mail gateway module."
 msgstr ""
+"Enregistrer et suivre les réclamations de la clientèle. Les réclamations "
+"peuvent être associées à une vente ou un lot. Vous pouvez envoyer des "
+"courriels avec des pièces jointes et obtenir l'historique de tout ce qui "
+"s'est passé sur une réclamation (courriels envoyés, type d'interventions et "
+"ainsi de suite ..). Les réclamations peuvent être automatiquement liées à "
+"une adresse courriel en utilisant le module \"mail gateway\"."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -549,7 +563,7 @@ msgstr "Terminé(e)"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Rédacteur de la réclamation"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -589,12 +603,12 @@ msgstr "Actuelle"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Cas par étape et estimations"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -604,7 +618,7 @@ msgstr "Répondre"
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Cause première"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -646,17 +660,17 @@ msgstr "Etablir une réclamation"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Actions Done"
-msgstr ""
+msgstr "Actions terminées"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Actions Defined"
-msgstr ""
+msgstr "Actions définies"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "Suivi"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -702,13 +716,13 @@ msgstr "ID"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Haute"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -716,6 +730,8 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Créer les catégories d'incidents pour mieux gérer et classer les demandes. "
+"Exemples de catégories : action préventive, action corrective."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index 24f66a67542..6b4a38a94d2 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 13:45+0000\n"
+"PO-Revision-Date: 2010-12-18 11:07+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index a3c1bda32fd..f85d1714ba4 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 23:18+0000\n"
+"PO-Revision-Date: 2010-12-17 06:26+0000\n"
 "Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -51,7 +51,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Lösning"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
@@ -82,18 +82,18 @@ msgstr ""
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Högsta"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Lägg till intern notering"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
@@ -121,32 +121,32 @@ msgstr ""
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "preventiv"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Partner kontakt"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Stängningsdatum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Månad   "
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: crm_claim
 #: field:crm.claim,action_next:0
@@ -156,7 +156,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Återställ till utkast"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -171,7 +171,7 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
@@ -182,7 +182,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sektion"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -199,12 +199,12 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Skicka ett nytt epost meddelande"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
@@ -215,23 +215,23 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Epost"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Lägsta"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Skapad datum"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
@@ -248,7 +248,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
@@ -258,7 +258,7 @@ msgstr ""
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -276,17 +276,17 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Månad-1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
@@ -322,18 +322,18 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
@@ -344,19 +344,19 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Uppdateringsdatum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "försäljare"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
@@ -366,7 +366,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  År  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -381,20 +381,20 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Låg"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Stängd"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -407,13 +407,13 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -428,17 +428,17 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -448,32 +448,32 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Stängning"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Sök"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -508,7 +508,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
@@ -519,7 +519,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -543,7 +543,7 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -554,12 +554,12 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -567,28 +567,28 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "öppna"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Nuvarande"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -598,7 +598,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Svara"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -613,7 +613,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -629,7 +629,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -672,7 +672,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -682,7 +682,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -692,18 +692,18 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Åtgärder"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hög"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -715,13 +715,13 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Skapat datum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
diff --git a/addons/crm_fundraising/i18n/crm_fundraising.pot b/addons/crm_fundraising/i18n/crm_fundraising.pot
index 13e5aab109f..9129ae0a45b 100644
--- a/addons/crm_fundraising/i18n/crm_fundraising.pot
+++ b/addons/crm_fundraising/i18n/crm_fundraising.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -160,7 +160,6 @@ msgid "Partner"
 msgstr ""
 
 #. module: crm_fundraising
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
 msgstr ""
@@ -262,6 +261,11 @@ msgstr ""
 msgid "Employee Email"
 msgstr ""
 
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "    Month-1    "
+msgstr ""
+
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
@@ -300,6 +304,7 @@ msgstr ""
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
 msgstr ""
diff --git a/addons/crm_fundraising/i18n/fr.po b/addons/crm_fundraising/i18n/fr.po
index f45a742274c..ec0c6cc29ea 100644
--- a/addons/crm_fundraising/i18n/fr.po
+++ b/addons/crm_fundraising/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-03 08:54+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 09:44+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -24,7 +24,7 @@ msgstr "Chiffre d'affaires prévu"
 #. module: crm_fundraising
 #: field:crm.fundraising.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Nb. de cas"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -62,12 +62,12 @@ msgstr "Catégories de levées de fonds"
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Courriels des observateurs"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Cas"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
@@ -114,12 +114,12 @@ msgstr "Arts et culture"
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Revenu est."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contact du partenaire"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -144,7 +144,7 @@ msgstr "Remettre en brouillon"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info supplémentaires"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising
@@ -169,7 +169,7 @@ msgstr "Analyse de levée de fonds"
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr ""
+msgstr "CRM : levée de fonds"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -261,13 +261,13 @@ msgstr "Dates"
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Courriel de l'employé"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund2
@@ -282,17 +282,17 @@ msgstr "Contact"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Formulaire de fonds"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Fund Description"
-msgstr ""
+msgstr "Description des fonds"
 
 #. module: crm_fundraising
 #: help:crm.fundraising.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Nombre de jours pour clôturer le cas"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -312,6 +312,9 @@ msgid ""
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
 msgstr ""
+"Donne un aperçu général de toutes les activités de levée de fond, en les "
+"triant par critères spécifiques comme le revenu estimé, la probabilité "
+"moyenne de succès et le délai pour fermer."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -326,7 +329,7 @@ msgstr "Communication"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Organisation des fonds"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -352,7 +355,7 @@ msgstr "Carte de crédit"
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
 msgid "Fundraising Stages"
-msgstr ""
+msgstr "Étapes de la levée de fonds"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -384,6 +387,10 @@ msgid ""
 "you can track all you fund raising activities. The search list allows you to "
 "filter by funds description, email, history and probability of success."
 msgstr ""
+"Si vous avez besoin de financer votre organisation ou une campagne, avec "
+"\"Levée de fonds\" vous pouvez suivre toutes vos activités de levée de "
+"fonds. La liste de recherche vous permet de filtrer par description, "
+"courriel, historique et probabilité de succès."
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -404,6 +411,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Ces adresses courriels seront mises en copie de tous les courriels reçus et "
+"émis pour cet enregistrement. Séparez les adresses par une virgule."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
@@ -476,12 +485,12 @@ msgstr "Utilisateur"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "Nb. de levée de fonds"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
 msgid "Active"
-msgstr ""
+msgstr "Active"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -519,6 +528,8 @@ msgid ""
 "Manage and define the fund raising categories you want to be maintained in "
 "the system."
 msgstr ""
+"Gérer et définir les catégories de levée de fonds que vous voulez maintenir "
+"dans le système."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
@@ -562,7 +573,7 @@ msgstr "État"
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -581,7 +592,7 @@ msgstr "Annuler"
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Ouverte"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -592,7 +603,7 @@ msgstr "Responsable"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Current"
-msgstr ""
+msgstr "Actuel"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,section_id:0
@@ -600,6 +611,9 @@ msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Équipe commerciale à laquelle la cas appartient. Détermine l'utilisateur "
+"responsable et le compte de courriel qui sera utilisé pour l'envoi des "
+"messages."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -628,6 +642,8 @@ msgid ""
 "Create and manage fund raising activity categories you want to be maintained "
 "in the system."
 msgstr ""
+"Créer et gérer les catégories d'activité de levée de fonds que vous voulez "
+"maintenir dans le système."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
@@ -655,6 +671,8 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"Les canaux représentent les différents moyens de communication disponibles "
+"avec ce client."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,state:0
@@ -667,6 +685,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'état est à \"Brouillon\" quand le cas est créé.\n"
+"Si le cas est en cours, l'état est à \"Ouvert\".\n"
+"Quand le cas est terminé, l'état est à \"Terminé\".\n"
+"Si le cas doit être revu, l'état est à \"En attente\"."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -697,17 +719,17 @@ msgstr "Avril"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Mes cas"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Exiger un brouillon"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "Id."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -734,18 +756,18 @@ msgstr "Date de création"
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Dernière action"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index 85a94847ac0..3a6d643c29c 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,6 @@ msgid "Partner Contact"
 msgstr ""
 
 #. module: crm_helpdesk
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
 msgid "Helpdesk Analysis"
 msgstr ""
@@ -247,6 +246,11 @@ msgstr ""
 msgid "Dates"
 msgstr ""
 
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "    Month-1    "
+msgstr ""
+
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "#Helpdesk"
@@ -518,6 +522,7 @@ msgstr ""
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index 7bf37e5ebb9..9ae8ef7c5b4 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -7,127 +7,128 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-18 15:28+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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Délai pour clôturer"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Nb. de cas"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Courriels des observateurs"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "La plus haute"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Ajouter une note interne"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulé"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contact du partenaire"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
 msgid "Helpdesk Analysis"
-msgstr ""
+msgstr "Analyse de l'assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Date de clôture"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mois   "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Prochaine action"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Support de l'assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info supplémentaires"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -135,17 +136,17 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
-msgstr ""
+msgstr "Estimations"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Section"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -153,105 +154,105 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorité"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envoyer un nouveau courriel"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Won"
-msgstr ""
+msgstr "Gagné"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Échéance dépassée"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
 msgid "Helpdesk report after Sales Services"
-msgstr ""
+msgstr "Rapport d'assistance du service après-vente"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Courriel"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,canal_id:0
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "La plus basse"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Nb. de courriels"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
 #: field:crm.helpdesk.report,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Repasser à l'état \"Brouillon\""
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "En attente"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date_deadline:0
 #: field:crm.helpdesk.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Echéance"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
 msgid "Helpdesk Categories"
-msgstr ""
+msgstr "Catégories d'assistance"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
 msgid "Categories"
-msgstr ""
+msgstr "Catégories"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History Information"
-msgstr ""
+msgstr "Information de l'historique"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "#Helpdesk"
-msgstr ""
+msgstr "Nb. Assistance"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -260,205 +261,207 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Ces adresses courriels seront mises en copie de tous les courriels reçus et "
+"émis pour cet enregistrement. Séparez les adresses par une virgule."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "References"
-msgstr ""
+msgstr "Références"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication"
-msgstr ""
+msgstr "Communication"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escalader"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Mettre à jour la date"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Query"
-msgstr ""
+msgstr "Requête"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Représentant commercial"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Référence 2"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,categ_id:0
 #: field:crm.helpdesk.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Année  "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Support de l'assistance"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_cost:0
 #: field:crm.helpdesk.report,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Coûts planifiés"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,description:crm_helpdesk.module_meta_information
 msgid "Helpdesk Management"
-msgstr ""
+msgstr "Gestion de l'assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Search Helpdesk"
-msgstr ""
+msgstr "Rechercher dans l'assistance"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Basse"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_closed:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Fermé"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 jours"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normale"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Global CC"
-msgstr ""
+msgstr "Copie globale"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Revenu planifié"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
 msgid "CRM Helpdesk"
-msgstr ""
+msgstr "Assistance du CRM"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
 msgid "Helpdesk Requests"
-msgstr ""
+msgstr "Requêtes d'assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Search"
-msgstr ""
+msgstr "Rechercher"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Ces personnes recevront un courriel."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Misc"
-msgstr ""
+msgstr "Divers"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -466,17 +469,17 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "Envoyer un rappel"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
@@ -484,71 +487,74 @@ msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Équipe commerciale à laquelle le cas appartient. Sert à définir "
+"l'utilisateur responsable et le compte courriel utilisé pour l'envoi des "
+"messages."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Ouvert"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Vue arborescente du support de l'assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Categorization"
-msgstr ""
+msgstr "Catégorisation"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "Assistance"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Current"
-msgstr ""
+msgstr "Actuel"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reply"
-msgstr ""
+msgstr "Répondre"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
@@ -556,16 +562,18 @@ msgid ""
 "Create and manage helpdesk categories to better manage and classify your "
 "support request."
 msgstr ""
+"Créer et gérer les catégories de support afin de mieux traiter et classer "
+"les demandes."
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
@@ -575,16 +583,21 @@ msgid ""
 "and assign a priority level. Depending on your need, you may consider using "
 "the issues system of OpenERP to manage your support activities."
 msgstr ""
+"\"Assistance et support\" permet le suivi des interventions. Sélectionner un "
+"client, ajouter des notes et classer les interventions faites avec des "
+"partenaires si nécessaire et fixer des priorités. Les fonctionnalités de la "
+"gestion du support proposées par OpenERP méritent une attention toute "
+"particulière."
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Probabilité (%)"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nb. de courriels"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
@@ -593,6 +606,9 @@ msgid ""
 "specific criteria such as the processing time, number of requests answered, "
 "emails sent and costs."
 msgstr ""
+"Avoir un aperçu général de toutes les demandes de support, triées sur des "
+"critères comme le temps de traitement, le nombre de demandes traitées, les "
+"courriels envoyés et les coûts."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
@@ -600,6 +616,8 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"Les canaux représentent les différents moyens de communication disponibles "
+"avec ce client."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,state:0
@@ -612,67 +630,71 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'état est à \"Brouillon\" quand le cas est créé.\n"
+"Si le cas est en cours, l'état est à \"Ouvert\".\n"
+"Quand le cas est terminé, l'état est à \"Terminé\".\n"
+"Si le cas doit être revu, l'état est à \"En attente\"."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Lost"
-msgstr ""
+msgstr "Perdu"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr ""
+msgstr "Assistance et support"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Mes cas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,id:0
 msgid "ID"
-msgstr ""
+msgstr "Id."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Haute"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Équipe commerciale"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Dernière action"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 098b5ce8de0..7a2b29b4819 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -137,6 +137,14 @@ msgstr ""
 msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
 msgstr ""
 
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid "\n"
+"This is the module used by OpenERP SA to redirect customers to his partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index d1f496fcafb..b9db5ecea0b 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 21:38+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -56,7 +57,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
-msgstr ""
+msgstr "Géolocalisation"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -91,12 +92,14 @@ msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
 "internet connection (%s)"
 msgstr ""
+"Impossible de contacter les serveurs de géolocalisation, veuillez vérifier "
+"que votre connexion internet fonctionne correctement (%s)"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
-msgstr ""
+msgstr "Date du partenaire"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -112,13 +115,13 @@ msgstr "Jour"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
-msgstr ""
+msgstr "Dernier courriel"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
-msgstr ""
+msgstr "Géo-latitude"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -142,6 +145,8 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
+"Donne la probabilité d'affecter une piste à ce partenaire (0 signifie pas "
+"d'affectation)"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -192,7 +197,7 @@ msgstr ""
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
-msgstr ""
+msgstr "Note du partenaire"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -234,7 +239,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Le partenaire auquel ce cas a été transmis / affecté."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -286,17 +291,17 @@ msgstr ""
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:0
 #, python-format
 msgid "Fwd"
-msgstr ""
+msgstr "Transférer"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
-msgstr ""
+msgstr "Géolocalisation"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr ""
+msgstr "Analyse de l'affectation des opportunités"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -306,7 +311,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
-msgstr ""
+msgstr "Envoyer l'historique"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -322,7 +327,7 @@ msgstr ""
 #: 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 "Analyse de l'affectation des opportunités"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
@@ -390,7 +395,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
 msgid "Partner Geo-Localisation"
-msgstr ""
+msgstr "Géolocalisation du partenaire"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
@@ -424,12 +429,12 @@ msgstr "Opportunités affectées"
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
-msgstr ""
+msgstr "Date d'affectation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
-msgstr ""
+msgstr "Probabilité maximale"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -502,7 +507,7 @@ msgstr "Octobre"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
-msgstr ""
+msgstr "Affectation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
@@ -522,7 +527,7 @@ msgstr ""
 #. 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
 #: selection:crm.lead.forward.to.partner,state:0
@@ -537,17 +542,18 @@ msgstr "Septembre"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "30 derniers jours"
 
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Nom du niveau"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
+"Dernière date à laquelle ce cas a été transmis / affecté à un partenaire"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -559,7 +565,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
-msgstr ""
+msgstr "Date de la géolocalisation"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -580,7 +586,7 @@ msgstr ""
 #: 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 "Transférer au partenaire"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -595,7 +601,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
-msgstr ""
+msgstr "Partenaire affecté"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
@@ -636,7 +642,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Géo-affectation"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index 1ab93187a76..f6029745a3f 100644
--- a/addons/crm_profiling/i18n/crm_profiling.pot
+++ b/addons/crm_profiling/i18n/crm_profiling.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,21 @@ msgstr ""
 msgid "Questions List"
 msgstr ""
 
+#. module: crm_profiling
+#: model:ir.module.module,description:crm_profiling.module_meta_information
+msgid "\n"
+"    This module allows users to perform segmentation within partners.\n"
+"    It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+"    It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping.\n"
+"\n"
+"    The menu items related are in \"CRM & SRM\\Configuration\\Segmentations\"\n"
+"\n"
+"\n"
+"    * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
diff --git a/addons/crm_profiling/i18n/mn.po b/addons/crm_profiling/i18n/mn.po
new file mode 100644
index 00000000000..b6b349ee27e
--- /dev/null
+++ b/addons/crm_profiling/i18n/mn.po
@@ -0,0 +1,195 @@
+# 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-17 18:29+0000\n"
+"Last-Translator: badralb <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: 2010-12-18 05:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Асуултуудын Жагсаалт"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+msgid "Question"
+msgstr "Асуулт"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,open:0
+msgid "Open Questionnaire"
+msgstr "Нээлттэй Асуулга"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic related questionnaires that will be used to "
+"guide your team(s) in the sales cycle by helping them to ask the right "
+"questions. Using the segmentation tool, you will be able to automatically "
+"assign a partner to a category based on his answers to the different "
+"questionnaires."
+msgstr ""
+"Та асуулгатай холбоотой тодорхой сэдэв үүсгэж болох ба энэ нь Борлуулалтын "
+"багыг зөв асуулт асуухад нь чиглүүлэгч болж ашиглагдана. Сегментчлэлийн "
+"хэрэгсэл ашигласнаар та харилцагчаа асуулгад өгсөн хариултууд дээр нь "
+"үндэслэн автоматаар категори руу оруулах боломжтой."
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Алдаа! Рекурсив холбоотой гишүүдийг үүсгэх боломжгүй."
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Харилцагчийн Сегментчлэлүүд"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+msgid "Answer"
+msgstr "Хариулт"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Харилцагчийн Сегментчлэл"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Профайл"
+
+#. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr "CRM Профайл удирдлага - Харилцагчтай сегментчлэл биелүүлэхийн тулд"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Хасагдсан Хариултууд"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Хариултууд"
+
+#. module: crm_profiling
+#: wizard_field:open_questionnaire,init,questionnaire_name:0
+msgid "Questionnaire name"
+msgstr "Асуулгын нэр"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Асуулга ашиглах"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+msgid "Questionnaires"
+msgstr "Асуулгууд"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
+"Энэ табыг сегментчлэлийн журмын нэг хэсэг болгон ашиглахыг хүсч байгаа бол "
+"энэ нүдийг чагтална уу. Хэрэв чагтлагдаагүй бол доорх хэмжүүр хэрэгсэхгүй "
+"болно."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Алдаа! Рекурсив профайл үүсгэх боломжгүй"
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Профайлын Журмыг ашиглах"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "Боломжит хариултууд"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Хавсаргасан Хариултууд"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Дэд профайлууд"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Асуултууд"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Эцэг Профайл"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,end:0
+#: wizard_button:open_questionnaire,open,end:0
+msgid "Cancel"
+msgstr "Болих"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:0
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Асуулга"
+
+#. module: crm_profiling
+#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
+msgid "Using a questionnaire"
+msgstr "Асуулга ашиглах"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,open,compute:0
+msgid "Save Data"
+msgstr "Өгөгдлийг Хадгалах"
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index 0d4cc30fbad..a613ae9ff27 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:14+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:14+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,24 @@ msgid "Digits"
 msgstr ""
 
 #. module: decimal_precision
-#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
-msgid "Decimal Precision Configuration"
+#: view:decimal.precision:0
+msgid "Decimal Precision"
 msgstr ""
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
-msgid "Decimal Accuracy"
+msgid "Decimal Accuracy Definitions"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid "\n"
+"This module allows to configure the price accuracy you need for different kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+""
 msgstr ""
 
 #. module: decimal_precision
@@ -42,8 +52,8 @@ msgid "Only one value can be defined for each given usage!"
 msgstr ""
 
 #. module: decimal_precision
-#: view:decimal.precision:0
-msgid "Decimal Precision"
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
 msgstr ""
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/sk.po b/addons/decimal_precision/i18n/sk.po
new file mode 100644
index 00000000000..5dc6e7c1136
--- /dev/null
+++ b/addons/decimal_precision/i18n/sk.po
@@ -0,0 +1,54 @@
+# Slovak 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-17 22:06+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
+"Language-Team: Slovak <sk@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: 2010-12-18 05:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Desatinné miesta"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Nastavenie presnosti čísiel"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr "Presnosť čísiel"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Použitie"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Iba jedna hodnota môže byť zadaná pre každé použitie!"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Presnosť čísiel"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 2d3c61f4984..b903a25b759 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -280,7 +280,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Products']/group/button[@name='action_process']" position="after">
+                <xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done,assigned" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 910f6b6c743..7dd002cbe27 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:15+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:15+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -99,11 +99,6 @@ msgstr ""
 msgid "Delivery Order :"
 msgstr ""
 
-#. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sale Order"
-msgstr ""
-
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
@@ -120,6 +115,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 #: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
 msgid "Delivery Method"
 msgstr ""
 
@@ -170,6 +166,11 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
@@ -253,11 +254,6 @@ msgstr ""
 msgid "If the active field is set to False, it will allow you to hide the delivery carrier without removing it."
 msgstr ""
 
-#. module: delivery
-#: field:sale.order,carrier_id:0
-msgid "Delivery method"
-msgstr ""
-
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
@@ -367,6 +363,11 @@ msgstr ""
 msgid "The delivery pricelist allows you to compute the cost and sales price of the delivery based on the weight of the products and other criteria. You can define several pricelists for one delivery method, for each region such as countries or a zone in a specific country defined by a zip code range."
 msgstr ""
 
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index b6930af2047..05347f35bf3 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:03+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -901,6 +901,7 @@ msgid "April"
 msgstr ""
 
 #. module: document
+#: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 4ee883be959..b3cc786f2fd 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-11 15:43+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-18 15:28+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: 2010-12-17 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -221,7 +222,7 @@ msgstr "Date de Modification"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Configuration de l'application de gestion des connaissances"
 
 #. module: document
 #: view:ir.attachment:0
@@ -274,7 +275,7 @@ msgstr "Stockage"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Configurer le répertoire des ressources"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -712,6 +713,8 @@ msgstr "Système de gestion intégrée des documents"
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
 msgstr ""
+"Choisissez les ressources suivantes pour la configuration automatique du "
+"répertoire."
 
 #. module: document
 #: view:ir.attachment:0
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index c6359f4a8e3..c88aaf56f69 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-15 10:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 16:10+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Directory"
-msgstr "Толгой хавтас"
+msgstr "Эцэг хавтас"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
@@ -39,12 +39,12 @@ msgstr "Баримтын самбар"
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr "Процессын зангилаа"
+msgstr "Process Node"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr "Баримтын хавтаст хайх"
+msgstr "Баримтын хавтас хайх"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -52,12 +52,14 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
 
 #. module: document
 #: code:addons/document/document_directory.py:0
 #, python-format
 msgid "Directory name contains special characters!"
-msgstr "Хавтасын нэр тусгай тэмдэгт агуулсан байна!"
+msgstr "Хавтасны нэр онцгой тэмдэгт агуулж болно!"
 
 #. module: document
 #: view:document.directory:0
@@ -73,7 +75,7 @@ msgstr "Хавтасын агуулгын төрөл"
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr "Нөөцүүд"
+msgstr "Нөөц"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -111,7 +113,7 @@ msgstr "Хавтасын агуулга"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr "Динамик контекст"
+msgstr "Динамик утга"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,6 +127,9 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
 
 #. module: document
 #: view:report.document.user:0
@@ -140,7 +145,7 @@ msgstr "Зам"
 #: code:addons/document/document_directory.py:0
 #, python-format
 msgid "Directory name must be unique!"
-msgstr "Хавтасын нэр давхардаж болохгүй!"
+msgstr "Хавтасны нэр давхцахгүй!"
 
 #. module: document
 #: view:ir.attachment:0
@@ -154,6 +159,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
 
 #. module: document
 #: view:document.directory:0
@@ -166,7 +173,7 @@ msgstr "Хавтасууд"
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr "Борлуулах захиалга"
+msgstr "Борлуулалтын захиалга"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
@@ -224,7 +231,7 @@ msgstr "Харилцагч"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "Файлууд, хэрэглэгчээр"
+msgstr "Хэрэгдэгчийн файл"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -236,7 +243,7 @@ msgstr "Баримтын хавтас"
 #: code:addons/document/document_directory.py:0
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "ValidateError"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
@@ -249,7 +256,7 @@ msgstr "ir.actions.report.xml"
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr "Баримтууд"
+msgstr "Баримт"
 
 #. module: document
 #: constraint:document.directory:0
@@ -260,12 +267,12 @@ msgstr "Алдаа! Рекурсив хавтас үүсгэж болохгүй.
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr "Хадгалах төхөөрөмж"
+msgstr "Хадгалалт"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Нөөцийн Директорыг Тохируулах"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -295,6 +302,8 @@ msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
 msgstr ""
+"Select an object here and there will be one folder per record of that "
+"resource."
 
 #. module: document
 #: help:document.directory,domain:0
@@ -320,7 +329,7 @@ msgstr "Нөөцөлсөн файлын нэр"
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr "Нөөцийн модел"
+msgstr "Нөөц модел"
 
 #. module: document
 #: view:document.directory:0
@@ -343,7 +352,7 @@ msgstr "7 сар"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "Баримтын хянах самбар"
+msgstr "Баримт хянах самбар"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -363,7 +372,7 @@ msgstr "Виртуаль файлууд"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr "Өөрчилсөн"
+msgstr "Засагдсан"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
@@ -390,7 +399,7 @@ msgstr "Хавтас"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr "Файлууд, харилцагчаар"
+msgstr "Харилцагчийн файл"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -403,12 +412,12 @@ msgstr "Сүүлд зассан хэрэглэгч"
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr "Холбогдох баримтууд"
+msgstr "Холбоотой баримт"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr "Тохируулгын явц"
+msgstr "Тохиргооны явц"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -463,7 +472,7 @@ msgstr "Дэд"
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "Define words in the context, for all child directories and files"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -507,6 +516,7 @@ msgstr ""
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"If not checked, media is currently offline and its contents not available"
 
 #. module: document
 #: view:document.directory:0
@@ -543,6 +553,9 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -575,6 +588,8 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
 
 #. module: document
 #: view:document.directory:0
@@ -597,7 +612,7 @@ msgstr "8 сар"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Directory cannot be parent of itself!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -683,6 +698,7 @@ msgstr "Баримтын удирдлагын систем"
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
 msgstr ""
+"Автомат директори тохиргоо хийхийн тулд дараах Нөөцүүдээс сонгоно уу."
 
 #. module: document
 #: view:ir.attachment:0
@@ -702,7 +718,7 @@ msgstr "Файлууд, хэрэглэгчээр"
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr "Зөвхөн уншигдах"
+msgstr "Зөвхөн уншина"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
@@ -736,7 +752,7 @@ msgstr "9 сар"
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr "Угтвар"
+msgstr "Урьдчилсан нөхцөл"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -751,7 +767,7 @@ msgstr "Файлын нэр"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -761,7 +777,7 @@ msgstr "Нөөц ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr "Гадаад файлын төхөөрөмж"
+msgstr "Гадна хадгалах файл"
 
 #. module: document
 #: view:board.board:0
@@ -773,7 +789,7 @@ msgstr "Wall of Shame"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "For file storage, the root path of the storage"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -846,11 +862,13 @@ msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
 msgstr ""
+"The Documents repository gives you access to all attachments, such as mails, "
+"project documents, invoices etc."
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "For each entry here, virtual files will appear in this folder."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
@@ -860,7 +878,7 @@ msgstr "ir.attachment"
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr "Шинэ файлууд"
+msgstr "Шинэ файл"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -884,6 +902,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+"what is typed here."
 
 #. module: document
 #: view:report.document.user:0
@@ -900,6 +920,7 @@ msgstr "Тэмдэглэл"
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
 msgstr ""
+"Auto directory configuration for Sale Orders and Quotation with report."
 
 #. module: document
 #: help:document.directory,type:0
@@ -910,6 +931,11 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -937,12 +963,12 @@ msgstr "Хадгалах зам нь давхцаж болохгүй!"
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr "Талбарууд"
+msgstr "Талбар"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr "Хэрэв чагтлавал, төхөөрөмж зөвхөн уншигдана"
+msgstr "If set, media is for reading only"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -962,6 +988,8 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Only members of these groups will have access to this directory and its "
+"files."
 
 #. module: document
 #: view:document.directory:0
@@ -969,11 +997,13 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr "MIME Төрөл"
+msgstr "Дүрслэх төрөл"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -989,17 +1019,17 @@ msgstr "Агуулгын нэр"
 #: code:addons/document/document.py:0
 #, python-format
 msgid "File name must be unique!"
-msgstr "Файлын нэр давхардаж болохгүй!"
+msgstr "Файлын нэр давхцахгүй!"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr "Дотоод файлын төхөөрөмж"
+msgstr "Дотор хадгалах файл"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Directory must have a parent or a storage"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1043,134 +1073,8 @@ msgstr "Баримтын төрөл"
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
 
-#~ msgid "Preview"
-#~ msgstr "Урьдчилан харах"
-
-#~ msgid "Document Configuration"
-#~ msgstr "Баримтын тохиргоо"
-
-#~ msgid "Storing Method"
-#~ msgstr "Хадгалах арга"
-
-#~ msgid "Other Resources"
-#~ msgstr "Бусад нөөц"
-
-#~ msgid "Document Management System."
-#~ msgstr "Баримтын удирдлагын систем"
-
-#~ msgid "Directorie's Structure"
-#~ msgstr "Хавтасын бүтэц"
-
-#~ msgid "File Information"
-#~ msgstr "Файлын мэдээлэл"
-
-#~ msgid "Resource Title"
-#~ msgstr "Нөөцийн нэр"
-
-#~ msgid "Link"
-#~ msgstr "Холбоос"
-
-#~ msgid "Filesystem"
-#~ msgstr "Файлсистем"
-
-#~ msgid "History"
-#~ msgstr "Түүх"
-
-#~ msgid "Server Address"
-#~ msgstr "Сервер хаяг"
-
-#~ msgid "Search a File"
-#~ msgstr "Файл хайх"
-
-#~ msgid "Cancel"
-#~ msgstr "Болих"
-
-#~ msgid "Files Per Month"
-#~ msgstr "Сарын файлууд"
-
-#~ msgid "All Months"
-#~ msgstr "Бүх сар"
-
-#~ msgid "My files"
-#~ msgstr "Миний файлууд"
-
-#~ msgid "Parent Item"
-#~ msgstr "Толгой элемент"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
-#~ msgid ""
-#~ "Check this field if you want that the name of the file start by the record "
-#~ "name."
-#~ msgstr ""
-#~ "Хэрэв файлын нэрийг бичлэгийн нэрээр эхлүүлэхийг хүсэж байгаа бол энэ "
-#~ "талбарыг чагтлана."
-
-#~ msgid ""
-#~ "This is a complete document management system:\n"
-#~ "    * FTP Interface\n"
-#~ "    * User Authentication\n"
-#~ "    * Document Indexation\n"
-#~ msgstr ""
-#~ "Баримтын иж бүрэн систем:\n"
-#~ "    * FTP интерфэйс\n"
-#~ "    * Хэрэглэгчийн шалгалт\n"
-#~ "    * Баримтын индекслэлт\n"
-
-#~ msgid "document.configuration.wizard"
-#~ msgstr "document.configuration.wizard"
-
-#~ msgid ""
-#~ "This wizard will configure the URL of the server of the document management "
-#~ "system."
-#~ msgstr "Энэ визард нь баримтын удирдлагын серверийн хаягыг тохируулна."
-
-#~ msgid ""
-#~ "Put here the server address or IP. Keep localhost if you don't know what to "
-#~ "write."
-#~ msgstr ""
-#~ "Энд серверийн хаяг эсвэл IP дугаарыг бичнэ. Юу бичихээ мэдэхгүй бол "
-#~ "localhost хэвээр нь үлдээнэ."
-
-#~ msgid "Others Info"
-#~ msgstr "Бусад мэдээлэл"
-
-#~ msgid "Browse Files Using FTP"
-#~ msgstr "FTP-ээр файл хайх"
-
-#~ msgid "Auto-Generated Files"
-#~ msgstr "Автоматаар үүссэн файлууд"
-
-#~ msgid "My files (This months)"
-#~ msgstr "Миний файлууд (энэ сар)"
-
-#~ msgid "My files (All months)"
-#~ msgstr "Миний файлууд (бүх сар)"
-
-#~ msgid "Last Posted File Name"
-#~ msgstr "Сүүлд оруулсан файл"
-
-#~ msgid "Document Management - Reporting"
-#~ msgstr "Баримтын удирдлага - Тайлан"
-
-#~ msgid "All Users files (All months)"
-#~ msgstr "Бүх хэрэглэгчийн файлууд (бүх сар)"
-
-#~ msgid "All Users files (This month)"
-#~ msgstr "Бүх хэрэглэгчийн файлууд (энэ сар)"
-
-#~ msgid "Browse Files"
-#~ msgstr "Файл ачаалах"
-
-#~ msgid "Configure"
-#~ msgstr "Тохиргоо"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцаж болохгүй !"
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index b3001cc33d4..9af91e6351b 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-11 15:18+0000\n"
-"Last-Translator: ZhangCheng <skyxxzc@gmail.com>\n"
+"PO-Revision-Date: 2010-12-19 07:00+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2010-12-17 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -24,17 +24,17 @@ msgstr "上级文件夹"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "自动目录配置"
 
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "名称字段"
 
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "文档一览表"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -44,7 +44,7 @@ msgstr "处理节点"
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "搜索文档文件夹"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -63,7 +63,7 @@ msgstr "目录名包含特殊字符！"
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -129,12 +129,12 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "该年"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "路径"
 
 #. module: document
 #: code:addons/document/document_directory.py:0
@@ -166,7 +166,7 @@ msgstr "目录"
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "销售单"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
@@ -176,23 +176,23 @@ msgstr "用户的文件详情"
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr ""
+msgstr "产品的自动文件夹配置"
 
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "查找所有资源"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -212,7 +212,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "知识管理应用配置"
 
 #. module: document
 #: view:ir.attachment:0
@@ -224,7 +224,7 @@ msgstr "业务伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "按用户排列文件"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -236,12 +236,12 @@ msgstr "文档目录"
 #: code:addons/document/document_directory.py:0
 #, python-format
 msgid "ValidateError"
-msgstr ""
+msgstr "验证错误"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -249,7 +249,7 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "文档"
 
 #. module: document
 #: constraint:document.directory:0
@@ -260,12 +260,12 @@ msgstr "错误:你无法建立递归的目录"
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "储存空间"
 
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "配置资源目录"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -310,7 +310,7 @@ msgstr ""
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "上下文字段"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -320,7 +320,7 @@ msgstr "保存文件名"
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr ""
+msgstr "资源模型"
 
 #. module: document
 #: view:document.directory:0
@@ -337,13 +337,13 @@ msgstr "报表"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr ""
+msgstr "文档一览表"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -353,7 +353,7 @@ msgstr "扩展"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "创建时间"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -363,18 +363,18 @@ msgstr "虚拟文件"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "修改时间"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "写入文档时发生错误！"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "自动生成的文件列表"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -390,7 +390,7 @@ msgstr "说明"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "按业务伙伴排列文件"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -403,12 +403,12 @@ msgstr "最近修改用户"
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr ""
+msgstr "相关文档"
 
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -430,7 +430,7 @@ msgstr "目录文件详情"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "所有用户文件"
 
 #. module: document
 #: view:board.board:0
@@ -443,12 +443,12 @@ msgstr "按月度排列文件大小"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -490,7 +490,7 @@ msgstr ""
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果没有选中，那么介质目前是脱机的且里面的内容不可用。"
 
 #. module: document
 #: view:document.directory:0
@@ -551,7 +551,7 @@ msgstr "模块ID"
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "在线"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -576,18 +576,18 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目录不能设为自己的上级目录。"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -610,7 +610,7 @@ msgstr "生效"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: document
 #: view:ir.attachment:0
@@ -636,7 +636,7 @@ msgstr "定义"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: document
 #: view:document.directory:0
@@ -651,12 +651,12 @@ msgstr "数据库"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "项目的自动目录配置"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "关联到"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -666,7 +666,7 @@ msgstr "完整的文档管理系统"
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "请从下面选择需要自动目录配置的资源："
 
 #. module: document
 #: view:ir.attachment:0
@@ -676,7 +676,7 @@ msgstr "附属于"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "一览表"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
@@ -686,17 +686,17 @@ msgstr "用户的文件"
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "只读"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "表达式"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "目录名必须唯一！"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -715,12 +715,12 @@ msgstr "按月度排列文件"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "前缀"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -745,7 +745,7 @@ msgstr "资源ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "外部文件存储设区"
 
 #. module: document
 #: view:board.board:0
@@ -757,7 +757,7 @@ msgstr "耻辱之墙"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "文件存储区的根目录"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -767,12 +767,12 @@ msgstr "业务伙伴的文件详情"
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "字段"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目录动态上下文"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -801,7 +801,7 @@ msgstr "报表"
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -812,7 +812,7 @@ msgstr "树结构"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -829,7 +829,7 @@ msgstr "一个月内没有新文件的用户"
 msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
-msgstr ""
+msgstr "文档仓库允许您访问所有的附件，比如邮件、项目文档、发票等等。"
 
 #. module: document
 #: view:document.directory:0
@@ -839,23 +839,23 @@ msgstr ""
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "新文件"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "静态目录"
 
 #. module: document
 #: view:report.files.partner:0
@@ -899,13 +899,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "按用户排列统计数据"
 
 #. module: document
 #: field:document.directory,name:0
@@ -916,23 +916,23 @@ msgstr "名称"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "存储路径必须唯一！"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "字段列表"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果设置，该介质就是只读的。"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #. module: document
 #: field:report.document.user,nbr:0
@@ -945,7 +945,7 @@ msgstr "# 文件"
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "只有这些用户组的成员才有权限访问该目录和其中的文件。"
 
 #. module: document
 #: view:document.directory:0
@@ -957,7 +957,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "MIME 类型"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -973,23 +973,23 @@ msgstr "内容名称"
 #: code:addons/document/document.py:0
 #, python-format
 msgid "File name must be unique!"
-msgstr ""
+msgstr "文件名必须唯一！"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "内部文件存储区"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目录必须具有上级目录或一个存储区"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "目录结构"
 
 #. module: document
 #: view:board.board:0
@@ -1002,19 +1002,19 @@ msgstr "文件的资源类型"
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "存储介质"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "搜索文档存储区"
 
 #. module: document
 #: field:document.directory.content,extension:0
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index 14bddfbbe36..db9204eb64d 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@ msgid "Image"
 msgstr ""
 
 #. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
+#: field:document.ftp.configuration,host:0
+msgid "Address"
 msgstr ""
 
 #. module: document_ftp
@@ -104,6 +104,11 @@ msgstr ""
 msgid "Document FTP Browse"
 msgstr ""
 
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
 msgid "Document Browse"
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 778c4f3672d..18d858ca8f9 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-11 17:57+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-18 15:29+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -31,6 +32,12 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Indiquez l'adresse réseau sur laquelle votre serveur OpenERP doit être "
+"accessible pour les utilisateurs finaux. Ceci dépend de la topologie de "
+"votre réseau et de votre configuration, et il affectera seulement les liens "
+"affiché aux utilisateurs. Le format est HÔTE:PORT et l'hôte par défaut "
+"(localhost) est seulement approprié pour des accès depuis la machine du "
+"serveur."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -50,7 +57,7 @@ msgstr "Image"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Configuration de l'application de gestion des connaissances"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -106,7 +113,7 @@ msgstr "_Annuler"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Configurer le serveur FTP"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
new file mode 100644
index 00000000000..87b47c15702
--- /dev/null
+++ b/addons/document_ftp/i18n/zh_CN.po
@@ -0,0 +1,130 @@
+# Chinese (Simplified) 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: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2010-12-19 07:07+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "自动目录配置"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "配置进度"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "浏览文件"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "图像"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知识管理应用配置"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP 服务器"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP 服务器配置"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "浏览(_B)"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "共享仓库（FTP）"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "配置 FTP 服务器"
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "整合 FTP 服务器与文档管理系统"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "标题"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "文档 FTP 浏览"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "文档浏览"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "浏览文档"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/document_ics/i18n/document_ics.pot b/addons/document_ics/i18n/document_ics.pot
index 1f8349ea09f..a454116e955 100644
--- a/addons/document_ics/i18n/document_ics.pot
+++ b/addons/document_ics/i18n/document_ics.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -165,6 +165,11 @@ msgstr ""
 msgid "Helps you to encode the result of a phone call or to plan a list of phone calls to process."
 msgstr ""
 
+#. module: document_ics
+#: help:document.ics.crm.wizard,document_ics:0
+msgid " Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."
+msgstr ""
+
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "OpenERP Field"
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 56b2fe7cdbb..f9e2f488247 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 17:32+0000\n"
+"PO-Revision-Date: 2010-12-19 12:17+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: 2010-12-17 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -93,6 +93,7 @@ msgstr "Calendrier des Rendez Vous"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP peut créer et pré-configurer pour vous une série d'agendas intégrés."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -292,7 +293,7 @@ msgstr "catégories"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 95b1d17fb25..17127395a27 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:17+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:17+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:05+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,26 @@ msgstr ""
 msgid "PyWebDAV Import Error!"
 msgstr ""
 
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid " With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a [webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+""
+msgstr ""
+
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index bd2ef444256..49ffd971df4 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:18+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:18+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:06+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -147,6 +147,11 @@ msgstr ""
 msgid "HTML code"
 msgstr ""
 
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
 #. module: email_template
 #: help:email_template.account,name:0
 msgid "The description is used as the Sender name along with the provided From Email, unless it is already specified in the From Email, e.g: John Doe <john@doe.com>"
@@ -250,8 +255,8 @@ msgid "Attached Files"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "Standard Body"
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
 msgstr ""
 
 #. module: email_template
@@ -382,11 +387,22 @@ msgstr ""
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
 
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
@@ -404,9 +420,8 @@ msgid "Test Outgoing Connection"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,def_body_html:0
-#: help:email.template,def_body_text:0
-msgid "The text version of the mail"
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
 msgstr ""
 
 #. module: email_template
@@ -763,7 +778,6 @@ msgstr ""
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -775,8 +789,8 @@ msgid "Send/Receive"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "Send Mail"
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
 msgstr ""
 
 #. module: email_template
@@ -900,11 +914,6 @@ msgstr ""
 msgid "User Information"
 msgstr ""
 
-#. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr ""
-
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
@@ -918,8 +927,8 @@ msgid "Name of the generated report file. Placeholders can be used in the filena
 msgstr ""
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
 msgstr ""
 
 #. module: email_template
@@ -929,8 +938,8 @@ msgid "Trash"
 msgstr ""
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
 msgstr ""
 
 #. module: email_template
@@ -993,6 +1002,11 @@ msgstr ""
 msgid "Null Value"
 msgstr ""
 
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
@@ -1034,9 +1048,8 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
-#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr ""
 
@@ -1081,8 +1094,10 @@ msgid "Existing files"
 msgstr ""
 
 #. module: email_template
-#: field:email_template.account,smtpssl:0
-msgid "SSL/TLS (only in python 2.6)"
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid "\n"
+"    Email Template is extraction of Power Email basically just to send the emails.\n"
+"    "
 msgstr ""
 
 #. module: email_template
@@ -1145,8 +1160,8 @@ msgid "Mail Format"
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: view:email.template:0
+msgid "Actions"
 msgstr ""
 
 #. module: email_template
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index f2a5881a9b4..a2372fdd448 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 08:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:12+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -40,6 +40,9 @@ msgid ""
 "Either ask admin to enforce an account for this template or get yourself a "
 "personal email account."
 msgstr ""
+"Aucun compte de courriel personnel n'est configuré pour vous. \n"
+"Demandez à l'administrateur de paramétrer un compte pour ce modèle, ou alors "
+"demandez l'ouverture d'un compte de courriel personnel."
 
 #. module: email_template
 #: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
@@ -49,6 +52,10 @@ msgid ""
 "profile fields so that their names or other partner related information can "
 "be automatically inserted in it."
 msgstr ""
+"Un modèle de courriel est un courriel qui sera envoyé lors d'une campagne "
+"marketing. Vous pouvez le personnaliser en fonction de champs propres à "
+"chaque client, de façon à ce que leur noms ou d'autres informations du "
+"partenaire soient insérées automatiquement."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -58,7 +65,7 @@ msgstr "Courriels personnels"
 #. module: email_template
 #: field:email.template,file_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "Nom du fichier du rapport"
 
 #. module: email_template
 #: view:email.template:0
@@ -68,12 +75,12 @@ msgstr "Contenu du courriel  "
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send mail Wizard"
-msgstr ""
+msgstr "Assistant d'envoi de courriel"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text & HTML with no attachments"
-msgstr ""
+msgstr "Plain texte et HTML sans pièce jointe"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -83,6 +90,11 @@ msgid ""
 "in the box below\n"
 "(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
+"Sélectionnez le champ du modèle que vous souhaitez utiliser.\n"
+"Si c'est un champ de relation, vous pourrez choisir parmi les valeurs "
+"présentes dans le cadre ci-dessous\n"
+"(Remarque : si il n'y a aucune valeur, vérifiez que vous avez bien "
+"sélectionné le bon modèle)"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -104,6 +116,8 @@ msgid ""
 "Select if this mail account does not belong to specific user but to the "
 "organization as a whole. eg: info@companydomain.com"
 msgstr ""
+"Sélectionner ceci si ce compte courriel n'appartient pas à un utilisateur "
+"particulier mais à l'organisation en entier, par exemple info@societe.com"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -113,7 +127,7 @@ msgstr "Envoyer maintenant"
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Sans objet"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -133,6 +147,8 @@ msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
 msgstr ""
+"Indiquez le nom de l'utilisateur si votre serveur SMTP nécessite une "
+"authentification, sinon laisser le champ vide."
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
@@ -151,6 +167,8 @@ msgid ""
 "Carbon Copy address(es), comma-separated. Placeholders can be used here. "
 "e.g. ${object.email_cc}"
 msgstr ""
+"Adresse(s) à mettre en copie, séparées par des virgules. Des variables "
+"peuvent être utilisées, par exemple : ${object.email_cc}"
 
 #. module: email_template
 #: view:email.template:0
@@ -169,6 +187,9 @@ msgid ""
 "Email, unless it is already specified in the From Email, e.g: John Doe "
 "<john@doe.com>"
 msgstr ""
+"La description est utilisée en tant que nom de l'expéditeur en plus de "
+"l'adresse de l'expéditeur, sauf si ce nom est déjà précisé dans l'adresse "
+"(par exemple : Anne Onyme <anne@onyme.fr>)"
 
 #. module: email_template
 #: field:email.template,from_account:0
@@ -179,7 +200,7 @@ msgstr "Compte de courriel"
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "Email sending failed for one or more objects."
-msgstr ""
+msgstr "L'envoi du courriel a échoué pour un ou plusieurs objets"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -196,6 +217,8 @@ msgid ""
 "The default language for the email. Placeholders can be used here. eg. "
 "${object.partner_id.lang}"
 msgstr ""
+"La langue par défaut des courriels. Des variables peuvent être utilisées "
+"ici, par exemple : ${object.partner_id.lang}"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -203,6 +226,8 @@ msgid ""
 "When you choose relationship fields this field will specify the sub value "
 "you can use."
 msgstr ""
+"Quand vous choisissez des champs de relation, ce champ vous indiquera les "
+"sous-valeurs que vous pouvez utiliser."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
@@ -241,7 +266,7 @@ msgstr "Succès complet"
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Mixed)"
-msgstr ""
+msgstr "HTML et texte (mélangés)"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -251,24 +276,24 @@ msgstr "OK"
 #. module: email_template
 #: field:email_template.account,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Suppression automatique"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Alternative)"
-msgstr ""
+msgstr "HTML et texte (alternative)"
 
 #. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
-msgstr ""
+msgstr "N° du courriels demandés"
 
 #. module: email_template
 #: field:email.template,def_body_text:0
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,body_text:0
 msgid "Standard Body (Text)"
-msgstr ""
+msgstr "Corps de message standard (texte)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
@@ -299,7 +324,7 @@ msgstr "Comptes"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Text)"
-msgstr ""
+msgstr "Corps (texte)"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -312,6 +337,9 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Astuce : quand plusieurs courriels sont envoyés, ils sont toujours dans la "
+"même langue (proposée la première fois). Nous suggérons de regrouper les "
+"envois de courriels selon la langue."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -320,6 +348,8 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here."
 msgstr ""
+"L'adresse à laquelle les destinataires doivent répondre, si ce n'est pas "
+"celle de l'expéditeur. Des variables peuvent être utilisés ici."
 
 #. module: email_template
 #: field:email.template,def_subject:0
@@ -327,13 +357,13 @@ msgstr ""
 #: field:email_template.preview,subject:0
 #: field:email_template.send.wizard,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Objet"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Reason: %s"
-msgstr ""
+msgstr "Raison : %s"
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
@@ -353,6 +383,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Courriel du compte %s a échoué. Raison probable : Erreur d'envoi du serveur\n"
+" Description : %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -370,6 +402,8 @@ msgid ""
 "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
 "here. e.g. ${object.email_bcc}"
 msgstr ""
+"Adresse(s) pour l'envoi en \"Copie cachée\", séparées par des virgules. Des "
+"variables peuvent être utilisés ici, par exemple : ${object.email_bcc}"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -379,7 +413,7 @@ msgstr "Aperçu du modèle"
 #. module: email_template
 #: field:email.template,def_body_html:0
 msgid "Body (Text-Web Client Only)"
-msgstr ""
+msgstr "Corps (texte, uniquement pour le client web)"
 
 #. module: email_template
 #: field:email_template.account,state:0
@@ -390,12 +424,12 @@ msgstr "État"
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "Bouton d'assistant"
 
 #. module: email_template
 #: help:email_template.account,email_id:0
 msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
-msgstr ""
+msgstr "exemple : \"anne@onyme.fr\" ou \"Anne Onyme <anne@onyme.fr>\""
 
 #. module: email_template
 #: view:email.template:0
@@ -407,7 +441,7 @@ msgstr "Ressource"
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Out going connection test failed"
-msgstr ""
+msgstr "Échec du test de la connexion sortante"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -418,13 +452,13 @@ msgstr "Courriel du compte %s envoyé avec succès."
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
-msgstr ""
+msgstr "Modèles Mako"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid " (Email Attachment)"
-msgstr ""
+msgstr " (pièce jointe au courriel)"
 
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
@@ -434,7 +468,7 @@ msgstr "Éléments envoyés"
 #. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
-msgstr ""
+msgstr "Tester la connexion sortante"
 
 #. module: email_template
 #: help:email.template,def_body_html:0
@@ -448,6 +482,9 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here. e.g. ${object.email_reply_to}"
 msgstr ""
+"L'adresse à laquelle les destinataires doivent répondre, si ce n'est pas "
+"celle de l'expéditeur. Des variables peuvent être utilisées ici, par exemple "
+": ${object.email_reply_to}"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
@@ -455,6 +492,8 @@ msgid ""
 "Button in the side bar of the form view of this Resource that will invoke "
 "the Window Action"
 msgstr ""
+"Bouton dans la barre verticale de la vue formulaire de cette ressource, qui "
+"appellera la fenêtre d'action"
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
@@ -464,7 +503,7 @@ msgstr "Compte de l'utilisateur"
 #. module: email_template
 #: field:email_template.send.wizard,signature:0
 msgid "Attach my signature to mail"
-msgstr ""
+msgstr "Joindre ma signature au courriel"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
@@ -476,13 +515,13 @@ msgstr "Rapport"
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
-msgstr ""
+msgstr "Sous-champ"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avancé"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -492,7 +531,7 @@ msgstr "Mes courriels"
 #. module: email_template
 #: view:email.template:0
 msgid "Expression Builder"
-msgstr ""
+msgstr "Éditeur d'expressions"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -500,6 +539,8 @@ msgid ""
 "When a relation field is used this field will show you the type of field you "
 "have selected"
 msgstr ""
+"Quand un champ de relation est utilisé, ce champ vous montrera le type de "
+"champ que vous avez sélectionné"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -519,7 +560,7 @@ msgstr "Cette valeur est utilisée si le champ est vide"
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "Aperçu du modèle"
 
 #. module: email_template
 #: field:email_template.account,smtpserver:0
@@ -531,6 +572,8 @@ msgstr "Serveur"
 msgid ""
 "Copy and paste the value in the location you want to use a system value."
 msgstr ""
+"Copier/coller la valeur à l'endroit où vous voulez utiliser une valeur "
+"système."
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -539,138 +582,142 @@ 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 ""
+"Activez ceci si vous souhaitez inclure un marqueur de traçage spécial dans "
+"les courriels sortants, de façon à pouvoir identifier les réponses et les "
+"relier à l'enregistrement initial correspondant. Ceci est utile par exemple "
+"pour le suivi des pistes dans le module CRM (gestion de la relation client)."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
-msgstr ""
+msgstr "Corps (HTML brut)"
 
 #. module: email_template
 #: field:email.template,use_sign:0
 msgid "Signature"
-msgstr ""
+msgstr "Signature"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Sous-modèle"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
-msgstr ""
+msgstr "Corps (plein texte)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "Corps (texte)"
 
 #. module: email_template
 #: field:email_template.mailbox,date_mail:0
 msgid "Rec/Sent Date"
-msgstr ""
+msgstr "Date de réception/envoi"
 
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "Initié"
 
 #. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
-msgstr ""
+msgstr "Rapport à envoyer"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Server Information"
-msgstr ""
+msgstr "Information du serveur"
 
 #. module: email_template
 #: field:email_template.send.wizard,generated:0
 msgid "No of generated Mails"
-msgstr ""
+msgstr "Nb. de courriels générés"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Mail Details"
-msgstr ""
+msgstr "Détails du courriel"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
-msgstr ""
+msgstr "Serveur ou port SMTP non défini"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Remarque : ceci est du HTML brut"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Group by..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
-msgstr ""
+msgstr "Assistant de courriels multiples étape 1"
 
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "Utilisateur associé"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
 msgid "Body (Rich Text Clients Only)"
-msgstr ""
+msgstr "Corps (clients texte enrichi uniquement)"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "Action de fenêtre"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML, sinon texte"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "Brouillons"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #. module: email_template
 #: field:email_template.account,smtpport:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "Port SMTP"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "Contenus des courriels"
 
 #. module: email_template
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Le nom du modèle doit être unique !"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -678,22 +725,22 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
+msgstr "Copie cachée"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "Plein texte"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nom interne du modèle"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -701,12 +748,12 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "Identifiant du message"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
 msgid "Applicable for inward items only"
-msgstr ""
+msgstr "Applicable uniquement pour les éléments entrants"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -714,43 +761,49 @@ msgid ""
 "After clicking send all mails, mails will be sent to outbox and cleared in "
 "next Send/Recieve"
 msgstr ""
+"Après avoir cliqué sur 'Envoyer tous les courriels', les courriels seront "
+"envoyés vers la boîte d'expédition puis effacés lors de la prochaine action "
+"Envoyer/Recevoir (ou Relever)"
 
 #. module: email_template
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Sortant"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
 msgstr ""
+"Échec de l'extraction de la date. Date : %s                       \tError : "
+"%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
 msgid "the signature from the User details will be appended to the mail"
 msgstr ""
+"la signature provenant des détails de l'utilisateur sera ajoutée au courriel"
 
 #. module: email_template
 #: field:email_template.send.wizard,from:0
 msgid "From Account"
-msgstr ""
+msgstr "Compte de l'expéditeur"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Intermixed content"
-msgstr ""
+msgstr "Contenu mixte"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Request Re-activation"
-msgstr ""
+msgstr "Demander la ré-activation"
 
 #. module: email_template
 #: view:email.template:0
@@ -758,33 +811,33 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
 #: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "Modèles de courriels"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom de l'utilisateur"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Options avancées"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "Boîte d'envoi"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
+msgstr "Sauvegarder dans les brouillons"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -793,16 +846,18 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
+"Échec des courriels depuis le compte %s. Raison probable : Erreur MIME\n"
+"Description : %s"
 
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. module: email_template
 #: field:email.template,lang:0
 msgid "Language"
-msgstr ""
+msgstr "Langue"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -813,56 +868,59 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "Modèle de courriel"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Send/Receive"
-msgstr ""
+msgstr "Envoyer/Recevoir"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Envoyer le courriel"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
-msgstr ""
+msgstr "Suspendu"
 
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
 "Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
+"Seuls les utilisateurs de ces groupes seront autorisés à envoyer des "
+"courriels à partir de ce modèle"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "Envoyer le courriel (%s)"
 
 #. module: email_template
 #: help:email.template,def_subject:0
 msgid "The subject of email. Placeholders can be used here."
 msgstr ""
+"Le sujet du courriel. Des paramètres substituables peuvent être utilisés ici."
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "Nom de fichier du rapport"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Expression"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: email_template
 #: view:email.template:0
@@ -871,7 +929,7 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: email_template
 #: field:email_template.preview,to:0
@@ -882,75 +940,75 @@ msgstr "À"
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "Texte, sinon HTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Copy of template "
-msgstr ""
+msgstr "Copie du modèle "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "Ignorer le courriel"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Courriel modèle pour les modèles"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:0
 #, python-format
 msgid "Error sending mail: %s"
-msgstr ""
+msgstr "Erreur lors de l'envoi du courriel : %s"
 
 #. module: email_template
 #: constraint:email_template.account:0
 msgid "Error: You are not allowed to have more than 1 account."
-msgstr ""
+msgstr "Erreur : Vous n'êtes pas autorisé à avoir plus d'un (1) compte."
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
-msgstr ""
+msgstr "Corps (HTML - uniquement pour client web)"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (pièce jointe du courriel)"
 
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
-msgstr ""
+msgstr "Envoi en cours"
 
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "Groupes utilisateurs autorisés"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "Champ"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "Informations utilisateur"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -959,6 +1017,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Erreur d'envoi du serveur\n"
+"Description : %s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -966,22 +1026,24 @@ msgid ""
 "Name of the generated report file. Placeholders can be used in the filename. "
 "eg: 2009_SO003.pdf"
 msgstr ""
+"Nom du rapport généré. Des paramètres substituables peuvent être utilisés "
+"dans le nom du fichier, par exemple 2009_SO003.pdf"
 
 #. module: email_template
 #: help:email_template.mailbox,date_mail:0
 msgid "Date on which Email Sent or Received"
-msgstr ""
+msgstr "Date à laquelle le courriel a été envoyé ou reçu"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "Poubelle"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_mailbox
 msgid "Email Mailbox"
-msgstr ""
+msgstr "Boite de réception des courriels"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:0
@@ -990,38 +1052,41 @@ msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
+"Échec de l'envoi du courriel %s. Raison probable : impossible de se "
+"connecter au serveur\n"
+"Erreur : %s"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "Missing mail account"
-msgstr ""
+msgstr "Compte courriel manquant"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "Le test de connexion SMTP a réussi"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "Modèle de courriel pour OpenERP"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "Créer une action"
 
 #. module: email_template
 #: help:email_template.account,smtpserver:0
 msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
-msgstr ""
+msgstr "Saisir le nom du serveur sortant, par exemple smtp.votredomaine.com"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -1029,6 +1094,8 @@ msgid ""
 "You may attach existing files to this template, so they will be added in all "
 "emails created from this template"
 msgstr ""
+"Vous pouvez joindre des fichiers existants à ce modèle, de façon à ce qu'ils "
+"soient ajoutés à tous les courriels créés à partir de ce modèle."
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -1037,22 +1104,25 @@ msgid ""
 "that this overrides the Resource tracking option! Placeholders can be used "
 "here."
 msgstr ""
+"Définit l'en-tête SMTP du message à utiliser dans les courriels sortants. "
+"Veuillez noter que ceci écrase l'option de traçabilité de la ressource ! Des "
+"paramètres substituables peuvent être utilisés ici."
 
 #. module: email_template
 #: field:email.template,def_to:0
 #: field:email_template.mailbox,email_to:0
 msgid "Recipient (To)"
-msgstr ""
+msgstr "Récipiendaire (à)"
 
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Valeur nulle"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Langue pour les modèles"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1060,27 +1130,29 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "Copie"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "Envoyé"
 
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "Un autre paramètre existe déjà avec cet identifiant de courriel !"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
 msgstr ""
+"Action qui ouvrira ce modèle de courriel dans les enregistrements de "
+"ressource"
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #. module: email_template
 #: help:email_template.preview,message_id:0
@@ -1089,6 +1161,9 @@ msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
 msgstr ""
+"La valeur de l'en-tête de l'identifiant du message, si vous avez besoin de "
+"la définir, par exemple pour reconnaître automatiquement les réponses à ce "
+"message. Des paramètres substituables peuvent être utilisés ici."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1096,37 +1171,37 @@ msgstr ""
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "Courriels"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "Modèles"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "Nom du rapport"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: email_template
 #: field:email.template,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Traçabilité des ressources"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Aperçu du modèle de courriel"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
-msgstr ""
+msgstr "Aperçu du courriel"
 
 #. module: email_template
 #: help:email.template,def_to:0
@@ -1134,21 +1209,23 @@ msgid ""
 "The Recipient of email. Placeholders can be used here. e.g. "
 "${object.email_to}"
 msgstr ""
+"Le récipiendaire du courriel. Des paramètres substituables peuvent être "
+"utilisés ici, par exemple ${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "Fichiers existants"
 
 #. module: email_template
 #: field:email_template.account,smtpssl:0
 msgid "SSL/TLS (only in python 2.6)"
-msgstr ""
+msgstr "SSL/TLS (uniquement avec python 2.6)"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (HTML)"
-msgstr ""
+msgstr "Corps (HTML)"
 
 #. module: email_template
 #: help:email.template,table_html:0
@@ -1156,28 +1233,30 @@ msgid ""
 "Copy this html code to your HTML message body for displaying the info in "
 "your mail."
 msgstr ""
+"Copier ce code HTML dans le corps du message du courriel HTML pour afficher "
+"l'information dans votre courriel."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_account
 msgid "email_template.account"
-msgstr ""
+msgstr "email_template.account"
 
 #. module: email_template
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modèle"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "Connexion inexistante pour l'identifiant spécifié"
 
 #. module: email_template
 #: field:email_template.account,company:0
 msgid "Corporate"
-msgstr ""
+msgstr "Commun à toute la société"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -1187,67 +1266,71 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"Échec lors de la connexion au compte de courriel de %s. Raison probable : "
+"impossible de se connecter au serveur.\n"
+"Erreur : %s"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
 msgid "This is the wizard for sending mail"
-msgstr ""
+msgstr "Ceci est l'assistant pour l'envoi de courriel"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adresses"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
+msgstr "Les courriels seront envoyés depuis ce compte approuvé."
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "Format du courriel"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "Dossier"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Company Accounts"
-msgstr ""
+msgstr "Compte de la société"
 
 #. module: email_template
 #: help:email_template.account,smtpport:0
 msgid "Enter port number, eg: 25 or 587"
-msgstr ""
+msgstr "Saisir le numéro de port, par exemple 25 ou 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "email-template"
-msgstr ""
+msgstr "Modèle courriel"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
+"Échec des courriels du compte %s. Raison probable : compte non approuvé."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "Assistant simple pour l'envoi de courriel Étape 1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Has Attachments"
-msgstr ""
+msgstr "Possède des pièces jointes"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "No Description"
-msgstr ""
+msgstr "Pas de description"
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index c64d37e64ea..e47f16b9bc3 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1039,6 +1039,11 @@ msgstr ""
 msgid "_Subcribe"
 msgstr ""
 
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr ""
+
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index bf8f9386e20..25c9ccad4ef 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-03 06:14+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-20 03:56+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: 2010-12-17 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -159,7 +160,7 @@ msgstr ""
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Évènement à l'inscription"
 
 #. module: event
 #: view:report.event.registration:0
@@ -187,19 +188,19 @@ msgstr ""
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Message de confirmation automatique"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr ""
+msgstr "Billet d'opéra"
 
 #. module: event
 #: code:addons/event/event.py:0
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr ""
+msgstr "Confirmez l'évènement"
 
 #. module: event
 #: selection:event.event,state:0
@@ -226,7 +227,7 @@ msgstr ""
 #. module: event
 #: model:event.event,name:event.event_1
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Opéra de Verdi"
 
 #. module: event
 #: field:event.event,pricelist_id:0
@@ -236,7 +237,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contact du partenaire"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
@@ -262,7 +263,7 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info supplémentaires"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
@@ -274,12 +275,12 @@ msgstr ""
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr ""
+msgstr "Type d'évènement"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -297,7 +298,7 @@ msgstr ""
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr ""
+msgstr "Évènement"
 
 #. module: event
 #: view:event.registration:0
@@ -312,12 +313,12 @@ msgstr ""
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmé"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr ""
+msgstr "Confirmation d'inscription"
 
 #. module: event
 #: help:event.event,pricelist_id:0
@@ -381,18 +382,18 @@ msgstr ""
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Inscriptions confirmées"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Message d'inscription automatique"
 
 #. module: event
 #: field:event.event,type:0
 #: field:partner.event.registration,event_type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: event
 #: field:event.registration,email_from:0
@@ -402,7 +403,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "À facturer"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -420,7 +421,7 @@ msgstr ""
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr ""
+msgstr "Annuler l'inscription"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -445,6 +446,9 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Cet email sera envoyé lorsque l'évènement sera confirmé ou quand quelqu'un "
+"s'inscrira à un évènement confirmé. Ceci enverra également un courriel de "
+"rappel à propos de l'évènement."
 
 #. module: event
 #: help:event.event,register_prospect:0
@@ -469,13 +473,13 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr ""
+msgstr "Confirmer quoi qu'il en soit"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:0
@@ -489,12 +493,12 @@ msgstr ""
 #: field:event.registration.badge,registration_id:0
 #: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
-msgstr ""
+msgstr "Inscription"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr ""
+msgstr "Nombre d'évènements"
 
 #. module: event
 #: help:event.event,state:0
@@ -507,7 +511,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr ""
+msgstr "Annuler l'évènement"
 
 #. module: event
 #: view:event.event:0
@@ -543,23 +547,23 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "Envoi"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "Ticket de concert"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "Inscriptions non confirmées"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "Partenaire facturé"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -605,7 +609,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr ""
+msgstr "Évènement terminé"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
@@ -706,7 +710,7 @@ msgstr "Évènements"
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr ""
+msgstr "Nombre d'inscription"
 
 #. module: event
 #: field:event.event,child_ids:0
@@ -734,6 +738,8 @@ msgstr ""
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
 msgstr ""
+"Cocher cette case si vous voulez utiliser un envoi automatique pour chaque "
+"nouvelle inscription"
 
 #. module: event
 #: field:event.registration,write_date:0
@@ -806,7 +812,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -815,7 +821,7 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr ""
+msgstr "Confirmer l'inscription"
 
 #. module: event
 #: view:event.event:0
@@ -838,7 +844,7 @@ msgstr ""
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: event
 #: field:event.event,address_id:0
@@ -849,7 +855,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_type
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Types of Events"
-msgstr ""
+msgstr "Types d'évènements"
 
 #. module: event
 #: view:event.registration:0
@@ -865,7 +871,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Courriel de confirmation automatique"
 
 #. module: event
 #: view:report.event.registration:0
@@ -885,18 +891,18 @@ msgstr ""
 #: selection:report.event.registration,state:0
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Facture"
 
 #. module: event
 #: view:report.event.registration:0
@@ -908,7 +914,7 @@ msgstr ""
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: event
 #: view:event.confirm:0
@@ -926,7 +932,7 @@ msgstr ""
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Ouvert"
 
 #. module: event
 #: field:event.event,user_id:0
@@ -964,7 +970,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Prix unitaire"
 
 #. module: event
 #: view:report.event.registration:0
@@ -981,7 +987,7 @@ msgstr ""
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "Conférence sur le marché des ERP"
 
 #. module: event
 #: field:event.event,section_id:0
@@ -1007,7 +1013,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: event
 #: view:event.event:0
@@ -1040,12 +1046,12 @@ msgstr ""
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "Ce courriel sera envoyé quand quelqu'un s'inscrira à l'évènement."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "Billet de conférence"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
@@ -1099,7 +1105,7 @@ msgstr ""
 #: view:event.event:0
 #: field:event.registration.badge,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
@@ -1107,6 +1113,8 @@ msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
 msgstr ""
+"Cocher cette case si vous voulez utiliser un envoi de confirmation "
+"automatique ou un rappel"
 
 #. module: event
 #: field:event.event,country_id:0
@@ -1145,7 +1153,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr ""
+msgstr "Type d'évènement"
 
 #. module: event
 #: view:event.event:0
@@ -1154,7 +1162,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr ""
+msgstr "Inscriptions"
 
 #. module: event
 #: field:event.registration,date:0
@@ -1165,7 +1173,7 @@ msgstr ""
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Inscriptions maximum"
 
 #. module: event
 #: field:report.event.registration,date:0
@@ -1198,7 +1206,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Courriel d'inscription automatique"
 
 #. module: event
 #: view:event.registration:0
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/event_project.pot
index 287f18ada0e..d376f374092 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/event_project.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -49,11 +49,6 @@ msgstr ""
 msgid "Retro-Planning"
 msgstr ""
 
-#. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr ""
-
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
@@ -65,8 +60,14 @@ msgid "Project"
 msgstr ""
 
 #. module: event_project
-#: field:event.project,project_id:0
-msgid "Template of Project"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr ""
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
 msgstr ""
 
 #. module: event_project
@@ -75,9 +76,13 @@ msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
 
 #. module: event_project
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event_project.act_event_task
-msgid "Tasks"
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr ""
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
 msgstr ""
 
 #. module: event_project
@@ -96,8 +101,8 @@ msgid "Date Start"
 msgstr ""
 
 #. module: event_project
-#: constraint:event.event:0
-msgid "Error ! You cannot create recursive event."
+#: view:event.event:0
+msgid "Create Retro-Planning"
 msgstr ""
 
 #. module: event_project
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index f07b1a6d083..e90baeb6e03 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-09 08:32+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-18 17:18+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 815cb9a15fe..3d1d28b9b41 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
-msgid "Set to Draft"
+msgid "POP"
 msgstr ""
 
 #. module: fetchmail
@@ -52,6 +52,11 @@ msgstr ""
 msgid "Not Confirmed"
 msgstr ""
 
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr ""
+
 #. module: fetchmail
 #: view:email.server:0
 msgid "Type"
@@ -86,12 +91,12 @@ msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
-msgid "POP"
+msgid "# of emails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
 msgstr ""
 
 #. module: fetchmail
@@ -115,7 +120,6 @@ msgid "Password"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -145,6 +149,16 @@ msgstr ""
 msgid "Mailgateway Message"
 msgstr ""
 
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
 #. module: fetchmail
 #: field:email.server,message_ids:0
 #: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
@@ -152,9 +166,8 @@ msgid "Messages"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Email Servers"
+msgid "Fetchmail Services"
 msgstr ""
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 59ed711c33b..a804036a672 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-11 09:34+0000\n"
-"Last-Translator: Open Net Sàrl <openerp@open-net.ch>\n"
+"PO-Revision-Date: 2010-12-19 22:23+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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -26,7 +27,7 @@ msgstr ""
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmé"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -42,12 +43,12 @@ msgstr ""
 #: view:email.server:0
 #: field:email.server,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -62,18 +63,18 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP/IMAP Servers"
-msgstr ""
+msgstr "Serveurs POP/IMAP"
 
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
 msgid "Fetchmail Server"
-msgstr ""
+msgstr "Serveur Fetchmail"
 
 #. module: fetchmail
 #: view:email.server:0
 #: field:email.server,note:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: fetchmail
 #: help:email.server,object_id:0
@@ -85,7 +86,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,attach:0
 msgid "Add Attachments ?"
-msgstr ""
+msgstr "Ajouter des pièces jointes ?"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -95,27 +96,27 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,user:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom de l'utilisateur"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: fetchmail
 #: field:email.server,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Waiting for Verification"
-msgstr ""
+msgstr "En attente de vérification"
 
 #. module: fetchmail
 #: field:email.server,password:0
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -136,17 +137,17 @@ msgstr "Serveur et login"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Auto Reply?"
-msgstr ""
+msgstr "Réponse automatique ?"
 
 #. module: fetchmail
 #: field:email.server,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr ""
+msgstr "Message pour la passerelle de courriel"
 
 #. module: fetchmail
 #: field:email.server,message_ids:0
@@ -163,7 +164,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,server:0
 msgid "Server"
-msgstr ""
+msgstr "Serveur"
 
 #. module: fetchmail
 #: field:email.server,active:0
@@ -178,18 +179,18 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,is_ssl:0
 msgid "SSL ?"
-msgstr ""
+msgstr "SSL ?"
 
 #. module: fetchmail
 #: selection:email.server,type:0
 #: selection:mailgate.message,server_type:0
 msgid "IMAP Server"
-msgstr ""
+msgstr "Serveur IMAP"
 
 #. module: fetchmail
 #: field:email.server,object_id:0
 msgid "Model"
-msgstr ""
+msgstr "Modèle"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -200,7 +201,7 @@ msgstr ""
 #: view:email.server:0
 #: model:ir.model,name:fetchmail.model_email_server
 msgid "POP/IMAP Server"
-msgstr ""
+msgstr "Serveur POP/IMAP"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -211,17 +212,17 @@ msgstr ""
 #: field:email.server,type:0
 #: field:mailgate.message,server_type:0
 msgid "Server Type"
-msgstr ""
+msgstr "Type de serveur"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Login Information"
-msgstr ""
+msgstr "Information de connexion"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Server Information"
-msgstr ""
+msgstr "Information du serveur"
 
 #. module: fetchmail
 #: help:email.server,attach:0
@@ -232,12 +233,12 @@ msgstr ""
 #: selection:email.server,type:0
 #: selection:mailgate.message,server_type:0
 msgid "POP Server"
-msgstr ""
+msgstr "Serveur POP"
 
 #. module: fetchmail
 #: field:email.server,port:0
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #. module: fetchmail
 #: model:ir.module.module,description:fetchmail.module_meta_information
@@ -250,6 +251,13 @@ msgid ""
 "    * Email based Records (Add, Update)\n"
 "    "
 msgstr ""
+"Fetchmail: \n"
+"    * récupère les courriels depuis le serveur POP/IMAP\n"
+"    * est compatible avec SSL \n"
+"    * est intégré à tous les modules\n"
+"    * réceptionne automatiquement les courriels\n"
+"    * enregistre les courriels (ajouts, mises à jour)\n"
+"    "
 
 #. module: fetchmail
 #: view:email.server:0
@@ -266,7 +274,7 @@ msgstr ""
 #. module: fetchmail
 #: help:email.server,priority:0
 msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "Priorité entre 0 et 10, qui définit l'ordre de traitement"
 
 #. module: fetchmail
 #: field:email.server,action_id:0
@@ -282,12 +290,12 @@ msgstr "Priorité du serveur"
 #: view:mailgate.message:0
 #: field:mailgate.message,server_id:0
 msgid "Mail Server"
-msgstr ""
+msgstr "Serveur de courriel"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Récupérer les courriels"
 
 #~ msgid "IMAP Servers"
 #~ msgstr "Serveur IMAP"
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
index efdc37635d8..d9435a2edcc 100644
--- a/addons/google_map/i18n/google_map.pot
+++ b/addons/google_map/i18n/google_map.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:20+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:20+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,20 +16,9 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: google_map
-#: model:ir.module.module,description:google_map.module_meta_information
-msgid "The module adds google map field in partner address\n"
-"so that we can directly open google map from the\n"
-"url widget."
-msgstr ""
-
-#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
 msgstr ""
 
 #. module: google_map
@@ -39,8 +28,24 @@ msgid "Street2 : "
 msgstr ""
 
 #. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid "The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+
+#. module: google_map
+#: model:ir.module.module,shortdesc:google_map.module_meta_information
+msgid "Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
 msgstr ""
 
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index de23e1433e7..7565b451b95 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-10-18 07:54+0000\n"
-"Last-Translator: nlhnam <nlhnam@gmail.com>\n"
+"PO-Revision-Date: 2010-12-17 16:00+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -33,7 +33,7 @@ msgstr "Khởi động Google Map"
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Địa chỉ của đối tác"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7c400ecf40e..103b0534349 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -221,7 +221,7 @@ class hr_department(osv.osv):
     _inherit = 'hr.department'
     _columns = {
         'manager_id': fields.many2one('hr.employee', 'Manager'),
-        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
+        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
 
 hr_department()
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 93a764a8fcf..44dec144e79 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 17:21+0000\n"
-"PO-Revision-Date: 2010-11-30 16:45+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:08+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -131,6 +131,8 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Partenaire lié à l'employé actuel. Les transactions comptables seront "
+"comptabilisées sur ce partenaire."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -155,7 +157,7 @@ msgstr "Les employés de mon département"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Marié"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -173,7 +175,7 @@ msgstr "Informations du passeport de l'employé"
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Poste"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -193,7 +195,7 @@ msgstr ""
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "En recrutement"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -221,7 +223,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Évaluations périodiques"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
@@ -241,7 +243,7 @@ msgstr "Numéros sociaux"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Nombre d'employés occupant ce poste."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -258,7 +260,7 @@ msgstr "Catégories filles"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Description du poste"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -281,7 +283,7 @@ msgstr "Employé"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Autre information"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -333,6 +335,8 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Vous pouvez enrichir l'application RH de base en installant quelques autres "
+"fonctionnalités reliées aux RH."
 
 #. module: hr
 #: view:hr.employee:0
@@ -342,7 +346,7 @@ msgstr "Catégories"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Employés attendus"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -459,6 +463,18 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Vous pouvez gérer votre force de travail en créant des employés et en leur "
+"affectant des propriétés spécifiques dans le système. Maintenez toutes les "
+"informations relatives aux employés et faites le suivi de tout ce qui a "
+"besoin d'être enregistré à leur sujet. L'onglet des informations "
+"personnelles vous aidera à maintenir leurs données d'identité. L'onglet "
+"catégorie vous donne l'opportunité de leur affecter des catégories "
+"d'employés selon leurs postes et activités dans la société. Une catégorie "
+"peut être le niveau d'ancienneté dans la société ou un département. L'onglet "
+"feuille de temps vous permet de leur affecter une feuille de temps "
+"spécifique et un journal analytique, où ils seront capable de saisir leurs "
+"temps dans le système. Dans l'onglet note, vous pouvez entrer du texte qui "
+"doit être enregistré pour un employé spécifique."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -473,7 +489,7 @@ msgstr "Note"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
 
 #. module: hr
 #: view:hr.employee:0
@@ -502,11 +518,14 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitements, etc."
 msgstr ""
+"La structure de département de la société est utilisée pour gérer tous les "
+"documents associés aux employés par départements : validation de frais et de "
+"feuille de temps, gestion des congés, recrutements, etc."
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -551,32 +570,34 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"Dans le formulaire des employés, il existe différents types d'informations "
+"comme les coordonnées du contact."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Nombre total de salariés nécessaires pour ce travail."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Ancien"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Description du statut"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -655,39 +676,40 @@ msgstr "Adresse personnelle"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Présences"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Étend les profils de l'employé pour vous aider à gérer leurs contrats."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Paie"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Célibataire"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Nom du poste"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "En poste"
 
 #. module: hr
 #: view:hr.department:0
@@ -709,17 +731,17 @@ msgstr "Remarques"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "hr.installer"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Tableau du directeur des RH"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ressource"
 
 #. module: hr
 #: view:hr.installer:0
@@ -746,7 +768,7 @@ msgstr "Employés"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Compte bancaire"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -756,12 +778,12 @@ msgstr "Nom du département"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Numéro de sécurité sociale"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Création d'un utilisateur d'OpenERP"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -772,23 +794,23 @@ msgstr "Sous-départements"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Postes"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Mentor"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Configurer vos applications de ressources humaines"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Notes de frais"
 
 #. module: hr
 #: view:hr.department:0
@@ -801,12 +823,12 @@ msgstr "Responsable"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Veuf(ve)"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Système de paie générique intégré avec la comptabilité."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -815,6 +837,9 @@ msgid ""
 "a survey to a job position. This survey will be used in the recruitment "
 "process to evaluate the applicants for this job position."
 msgstr ""
+"Postes est utilisé pour définir les postes et leurs prérequis. Vous pouvez "
+"associer un sondage à un poste. Ce sondage sera utilisé dans le processus de "
+"recrutement pour évaluer les candidats pour ce poste."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index bfa1be527bb..a7198d83e7b 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 17:21:47+0000\n"
-"PO-Revision-Date: 2010-12-15 17:21:47+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -252,11 +252,6 @@ msgstr ""
 msgid "Office Location"
 msgstr ""
 
-#. module: hr
-#: field:hr.employee,passport_id:0
-msgid "Passport"
-msgstr ""
-
 #. module: hr
 #: view:hr.employee:0
 #: view:hr.job:0
@@ -512,6 +507,16 @@ msgstr ""
 msgid "Companies"
 msgstr ""
 
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid "\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "In the Employee form, there are different kind of information like Contact information."
@@ -582,6 +587,11 @@ msgstr ""
 msgid "Personal Information"
 msgstr ""
 
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -614,7 +624,6 @@ msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
-#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
 msgstr ""
 
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index ca8fd366d9b..d2f6562f962 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 17:21+0000\n"
-"PO-Revision-Date: 2010-11-25 19:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 18:46+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -164,7 +164,7 @@ msgstr "Манай хэлтсийн ажилчид"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Гэрлэсэн"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -339,6 +339,8 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"ХН-н аппликешн баазыг хэдэн ХН-тэй холбоотой функцууд суулган өргөтгөх "
+"боломжтой."
 
 #. module: hr
 #: view:hr.employee:0
@@ -465,6 +467,14 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Энд та ажилтнуудаа үүсгэн тэднийг системдэх тодорхойm төлөв байдалд руу "
+"оруулан өөрийн ажиллах хүчнээ удирдах боломжтой. Ажилтнуудтай холбоотой бүх "
+"мэдээлэл болон ажилтнуудад зориулсан бүх бичлэгүүдийг хадгална уу. Хувийн "
+"мэдээллийн таб нь хувь хүн бүрийн мэдээллийг хадгалахад туслана. Категориуд "
+"таб нь ажилтнуудыг албан тушаал, үйл ажиллагаа дээр нь тулгуурлан холбогдох "
+"категорид хамруулна. Категори нь компани дотор эсвэл хэлтэс дотор ахлах "
+"түвшин болох юм. Цаг бүртгэл таб нь ажилтнуудыг тодорхой цагийн бүртгэлд "
+"болон шинжилгээний бүртгэлд системийн туршид хамруулна."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -480,6 +490,7 @@ msgstr "Тэмдэглэл"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Энэ хэрэглэгчийн сонгосон компани зөвшөөрөгдсөн компаниуд дунд алга байна."
 
 #. module: hr
 #: view:hr.employee:0
@@ -508,11 +519,14 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitements, etc."
 msgstr ""
+"Таны Компанийн Хэлтсийн Бүтэц нь хэлтэс дэх ажилтнуудтай холбоотой бүх бичиг "
+"баримтуудыг удирдана: зардлын болон цаг бүргэлийн баталгаажуулалт, хоцролт "
+"болон ажилд авах г.м."
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Тохируулах"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -575,7 +589,7 @@ 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
@@ -682,7 +696,7 @@ msgstr "Цалингийн цэс"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Ганц бие"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -789,7 +803,7 @@ msgstr "Дадлагажуулагч"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Хүний Нөөцийн Аппликэшныг Тохируулах"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
@@ -807,7 +821,7 @@ msgstr "Менежер"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Бэлэвсэн"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
@@ -821,6 +835,10 @@ msgid ""
 "a survey to a job position. This survey will be used in the recruitment "
 "process to evaluate the applicants for this job position."
 msgstr ""
+"JJob Positions нь ажлын байр болон ажлын байрны шаардлагыг тодорхойлоход "
+"ашиглагдана. Ажлын байранд мөн санал асуулга хавсаргаж болно. Энэ санал "
+"асуулгыг энэхүү ажлын байранд орох ажил горилогчийг үнэлэхэд ашиглах "
+"боломжтой."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index ed26d687343..15baf00e454 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.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: 2010-12-17 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 8150be3c841..3e27bb67b22 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:21+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:21+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:09+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -182,6 +182,15 @@ msgstr ""
 msgid "Hr Attendance Search"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid "\n"
+"    This module aims to manage employee's attendances.\n"
+"    Keeps account of the attendances of the employees on the basis of the\n"
+"    actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
@@ -443,6 +452,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
 msgstr ""
 
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index 0855f95e7f4..424431c3794 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 16:18+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -112,7 +112,7 @@ msgstr "Ирцийн үйлдлийг тодорхойлох"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -335,7 +335,7 @@ msgstr "11 сар"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Алдаа! Ажилтны рекурс иерархийг үүсгэж болохгүй"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -388,6 +388,10 @@ msgid ""
 "tool. If each employee has been linked to a system user, then they can "
 "encode their time with this action button."
 msgstr ""
+"Таны ажилтан ажилдаа ирэхдээ нэвтэрдэг, ажлын өдөр дуусахад системээс гардаг "
+"байх систем хэрэгтэй бол OpenERP танд туслана. Хэрэв ажилтан бүр системийн "
+"хэрэглэгчтэй холбогдсон бол тэд энэ товчлуураар өөрсдийн ажлын цагаа кодоор "
+"шифрлэж болно."
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -495,6 +499,10 @@ msgid ""
 "has been linked to a system user, then they can encode their time with this "
 "action button."
 msgstr ""
+"Нэвтрэх / Гарах. Зарим компанид ажилчид ажилдаа ирэхдээ системрүү нэвтэрч "
+"ажлын цаг дуусахад системээс гарах шаардлагатай байдаг. Хэрэв ажилтан бүр "
+"системийн хэрэглэгчид холбогдсон бол тэд энэ товчлуураар өөрсдийн ажлын "
+"цагаа кодоор шифрлэж болно."
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 3ad44ef3065..7ed2d16d6b7 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -114,6 +114,18 @@ class hr_contract(osv.osv):
         'date_start': lambda *a: time.strftime("%Y-%m-%d"),
     }
 
+    def _check_dates(self, cr, uid, ids, context=None):
+        for contract in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
+             if contract['date_start'] and contract['date_end'] and contract['date_start'] > contract['date_end']:
+                 return False
+        return True
+
+    _constraints = [
+        (_check_dates, 'Error! contract start-date must be lower then contract end-date.', ['date_start', 'date_end'])
+    ]
+
+
+
 hr_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index c00959f7798..198b7169c91 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2009-11-17 07:19+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-18 16:05+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: 2010-12-17 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -29,27 +30,27 @@ msgstr "Brut"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Période d'essai"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Date de début de la période d'essai"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Function Arguments"
-msgstr ""
+msgstr "Arguments de la fonction"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Examen médical"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "Véhicule de service"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
@@ -59,22 +60,22 @@ msgstr "Nom du Type de Salaire"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Divers"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Actuel"
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Département"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Expiré"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -84,12 +85,12 @@ msgstr "Types de Salaire"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Calculations"
-msgstr ""
+msgstr "Calculs"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "Basique"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -102,7 +103,7 @@ msgstr "Employé"
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "Heures de travail"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -128,12 +129,12 @@ msgstr "Fonction"
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -153,33 +154,33 @@ msgstr "Contrats"
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "Est un responsable"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "Poste"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Passport"
-msgstr ""
+msgstr "Passeport"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "Rechercher dans les contrats"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Dernier contrat de l'employé"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr ""
+msgstr "Déductions"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -191,40 +192,41 @@ msgstr "Nom de la Période"
 #: field:hr.contract,advantages:0
 #: view:hr.employee:0
 msgid "Advantages"
-msgstr ""
+msgstr "Avantages"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Valid for"
-msgstr ""
+msgstr "Valide pour"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Permis de travail"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "Nombre d'enfants"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
 msgid "Contract Types"
-msgstr ""
+msgstr "Types de contrat"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "Rechercher dans les types de salaire"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer de hiérarchie récursive d'employés."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -239,12 +241,12 @@ msgstr "Salaire"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Référence du contrat"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "En kilomètres"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -258,6 +260,8 @@ msgstr "Notes"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erreur ! Vous ne pouvez pas sélectionner un département pour lequel "
+"l'employé est le responsable."
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
@@ -288,17 +292,17 @@ msgstr "Type de Contrat"
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 msgid "Search Wage Period"
-msgstr ""
+msgstr "Rechercher dans les périodes de contrat"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "Calcul du salaire"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Information concernant le poste"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -310,7 +314,7 @@ msgstr "Période Salariale"
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Titre du poste"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
@@ -321,7 +325,7 @@ msgstr "Période Salariale"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Télé-travail"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -331,7 +335,7 @@ msgstr "Date de début"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribution de la société"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -341,7 +345,7 @@ msgstr "Type"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Date de fin de la période d'essai"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -351,27 +355,27 @@ msgstr "Facteur pour le coût horaire"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
-msgstr ""
+msgstr "Période"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Payslip Line"
-msgstr ""
+msgstr "Ligne de feuille de paye"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Employee specific allowances and deductions"
-msgstr ""
+msgstr "Allocations et déductions spécifiques de l'employé"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Contract Details"
-msgstr ""
+msgstr "Détails du contrat"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Structure"
-msgstr ""
+msgstr "Structure salariale"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -386,33 +390,33 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Infos personnelles"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Date de l'examen médical"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "Allocations"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Main Data"
-msgstr ""
+msgstr "Données principales"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Rechercher dans les types de contrat"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 6431cbb60b7..227b539702a 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:10+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -181,8 +181,14 @@ msgid "Deductions"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type.period,name:0
-msgid "Period Name"
+#: model:ir.module.module,description:hr_contract.module_meta_information
+msgid "\n"
+"    Add all information on the employee form to manage contracts:\n"
+"    * Marital status,\n"
+"    * Security number,\n"
+"    * Place of birth, birth date, ...\n"
+"    You can assign several contracts per employee.\n"
+"    "
 msgstr ""
 
 #. module: hr_contract
@@ -346,6 +352,11 @@ msgstr ""
 msgid "Factor for hour cost"
 msgstr ""
 
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr ""
+
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Period"
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index d45799dc433..ff06f6d60fa 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-10-27 08:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 16:12+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -225,7 +225,7 @@ msgstr "Цалин төрлийг хайх"
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Алдаа! Ажилтны рекурс иерархийг үүсгэж болохгүй"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -258,7 +258,7 @@ msgstr "Тэмдэглэл"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй."
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index d884a36a42d..82ece4890a2 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 10:02+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 20:09+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -34,7 +33,7 @@ msgstr "Agrupar por..."
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
 msgid "Request_id"
-msgstr ""
+msgstr "id_solicitud"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,progress_bar:0
@@ -112,12 +111,12 @@ msgstr "Formulario de evaluación"
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Enviar resumen anónimo al empleado"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -127,52 +126,54 @@ msgstr "Notas"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "Solicitar entrevista"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento que tenga el empleado como "
+"responsable."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Cuerpo del correo"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr ""
+msgstr "Análisis de evaluaciones"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
 msgid "Sends Reminders to employess to fill the evaluations"
-msgstr ""
+msgstr "Envia recordatorios a los empleados para rellenar las evaluciones"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "No cumplió las expectativas"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal"
-msgstr ""
+msgstr "Evaluación"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:0
@@ -181,11 +182,13 @@ msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
 msgstr ""
+"No puede cambiar el estado porque alguna evaluación está esperando respuesta "
+"o está en borrador"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Fecha de fin"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -196,6 +199,11 @@ msgid ""
 "OpenERP manages all kind of evaluations: bottom-up, top-down, self "
 "evaluation and final evaluation by the manager."
 msgstr ""
+"Puede asignar cada empleado a un plan de evaluación. Estos planes definen la "
+"frecuencia y la forma en la que gestiona sus evaluaciones personales "
+"periodicas. Puede definir pasos y adjuntar formulario de entrevistas a cada "
+"paso. OpenERP gestiona todo tipo de evaluaciones: de abajo a arriba, de "
+"arriba a abajo, autoevaluación y evaluación final por el responsable."
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:0
@@ -221,47 +229,47 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Enviar a empleados"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "After the Date of Start"
-msgstr ""
+msgstr "Después de la fecha de inicio"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Fecha límite"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: hr_evaluation
 #: help:hr.employee,evaluation_date:0
 msgid "Date of the next evaluation"
-msgstr ""
+msgstr "Fecha de la próxima evaluación"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "solicitud.encuesta"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Evaluaciones periódicas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send evaluation reminder"
-msgstr ""
+msgstr "Enviar recordatorio de evaluación"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Evaluation Summary"
-msgstr ""
+msgstr "Resumen de evaluación"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -272,7 +280,7 @@ msgstr ""
 #: code:addons/hr_evaluation/hr_evaluation.py:0
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "Referente a "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -286,7 +294,7 @@ msgstr "Estado"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Fase del plan de evaluación"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -300,29 +308,31 @@ msgstr "Empleado"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Fecha límite excedida"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "Supera las expectativas"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,mail_feature:0
 msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
 msgstr ""
+"Marque esta casilla si quiere enviar correos a los empleados objeto de esta "
+"fase"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "Enviar todas las respuestas al responsable"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -333,34 +343,34 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "Notas públicas"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Evaluation Deadline"
-msgstr ""
+msgstr "Fecha límite de evaluación"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Print Interview"
-msgstr ""
+msgstr "Imprimir entrevista"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "cerrada"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "Cumple las expectativas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "Nº de peticiones"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
@@ -372,17 +382,17 @@ msgstr "Evaluaciones"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "Acción a realizar"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "Plan de acción"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -392,70 +402,70 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "Resumen final"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "Supera con creces las expectativas"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
 #: field:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "All Answers"
-msgstr ""
+msgstr "Todas las respuestas"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "Next Evaluation After"
-msgstr ""
+msgstr "Siguente evaluación tras"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
 msgid "Human Resources Evaluation"
-msgstr ""
+msgstr "Evaluación de recursos humanos"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "Configuración de correo"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "Empleado a entrevistar"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Question"
-msgstr ""
+msgstr "Pregunta de entrevista"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -468,6 +478,8 @@ msgid ""
 "Check this box if you want to wait that all preceding phases are finished "
 "before launching this phase."
 msgstr ""
+"Marque esta casilla si quiere esperar a que todas las fases previas estén "
+"finalizadas antes de lanzar esta."
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -476,11 +488,14 @@ msgid ""
 "employees evaluation plan. Each user receives automatic emails and requests "
 "to perform evaluation of their collegues periodically."
 msgstr ""
+"OpenERP genera automáticamente las peticiones de entrevista de acuerdo a los "
+"planes de evaluación de los empleados. Cada usuario recibe correos "
+"automáticos y peticiones para evaluar a sus compañeros periódicamente."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
-msgstr ""
+msgstr "Datos evaluación"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,note_action:0
@@ -488,6 +503,7 @@ msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
 msgstr ""
+"Si la evaluación no cumple las expectativas, puede proponer un plan de acción"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -499,7 +515,7 @@ msgstr "Borrador"
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Resumen anónimo"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -510,33 +526,33 @@ msgstr "Evaluación"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 días"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid " Year "
-msgstr ""
+msgstr " Año "
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Evaluation"
-msgstr ""
+msgstr "Comenzar evaluación"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "Muy por debajo de las expectativas"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -549,7 +565,7 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
@@ -559,37 +575,37 @@ msgstr "Activo"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar correo"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Enviar resumen anónimo al responsable"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -600,7 +616,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Evaluation Plans"
-msgstr ""
+msgstr "Planes de evaluación"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -610,38 +626,38 @@ msgstr "Fecha"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "Encuesta"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "Esta es la apreciación que resume la evaluación"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Validación final"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "Esperando apreciación"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Enviar correo para esta fase"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "Valoración general"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -652,32 +668,32 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interviewer"
-msgstr ""
+msgstr "Entrevistador"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Estadísticas de evaluaciones"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Fecha límite"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "Peticiones de evaluación arriba-abajo"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "Enviar todas las respuestas al empleado"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -685,106 +701,106 @@ msgstr ""
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realizada"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr ""
+msgstr "Fases plan de evaluación"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "En progreso"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "Por hacer"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr ""
+msgstr "Fases de evaluación"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Evaluation Interview"
-msgstr ""
+msgstr "Entrevista de evaluación"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.reminder,evaluation_id:0
 msgid "Interview"
-msgstr ""
+msgstr "Entrevista"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr ""
+msgstr "Recordatorios de evaluación"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Peticiones de autoevaluación"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "carácter"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "Formularios de evaluación"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas internas"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr ""
+msgstr "Validar evaluación"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "Entrevista final"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "Fase"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "Peticiones de evaluación abajo-arriba"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Evaluation"
-msgstr ""
+msgstr "Buscar evaluación"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_plan_id:0
@@ -793,27 +809,27 @@ msgstr ""
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr ""
+msgstr "Plan de evaluación"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "Enviar a responsables"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
 msgid "Evaluation Send Mail"
-msgstr ""
+msgstr "Enviar correo evaluación"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
@@ -823,39 +839,39 @@ msgstr "Evaluación empleado"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr ""
+msgstr "Buscar plan de evaluación"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
-msgstr ""
+msgstr "(meses)"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(firma_usuario)s: Nombre usuario"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
 msgid "Interview Requests"
-msgstr ""
+msgstr "Peticiones de entrevista"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #~ msgid "Score"
 #~ msgstr "Puntuación"
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index f1e7419848d..fc38400aec6 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -90,11 +90,6 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.employee,evaluation_date:0
-msgid "Next Evaluation"
-msgstr ""
-
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Evaluation Interviews"
@@ -116,6 +111,11 @@ msgstr ""
 msgid "Send an anonymous summary to the employee"
 msgstr ""
 
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid "This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "
+msgstr ""
+
 #. module: hr_evaluation
 #: view:hr.employee:0
 msgid "Notes"
@@ -170,6 +170,11 @@ msgstr ""
 msgid "July"
 msgstr ""
 
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr ""
+
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:0
 #, python-format
@@ -181,6 +186,11 @@ msgstr ""
 msgid "Ending Date"
 msgstr ""
 
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr ""
+
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
 msgid "Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evaluation. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager."
@@ -211,11 +221,6 @@ msgstr ""
 msgid "Send to Employees"
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr_evaluation.plan,month_next:0
-msgid "After the Date of Start"
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
 msgid "Deadline"
@@ -227,13 +232,8 @@ msgid " Month "
 msgstr ""
 
 #. module: hr_evaluation
-#: help:hr.employee,evaluation_date:0
-msgid "Date of the next evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_survey_request
-msgid "survey.request"
+#: help:hr_evaluation.plan,month_next:0
+msgid "The number of month that depicts the delay between each evaluation of this plan (after the first one)."
 msgstr ""
 
 #. module: hr_evaluation
@@ -247,8 +247,16 @@ msgid "Send evaluation reminder"
 msgstr ""
 
 #. module: hr_evaluation
-#: field:hr_evaluation.evaluation,note_summary:0
-msgid "Evaluation Summary"
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "\n"
+"          Ability to create employees evaluation.\n"
+"          An evaluation can be created by employee for subordinates,\n"
+"          juniors as well as his manager.The evaluation is done under a plan\n"
+"          in which various surveys can be created and it can be defined which\n"
+"          level of employee hierarchy fills what and final review and evaluation\n"
+"          is done by the manager.Every evaluation filled by the employees can be viewed\n"
+"          in the form of.Implements a dashboard for My Current Evaluations\n"
+"         "
 msgstr ""
 
 #. module: hr_evaluation
@@ -398,11 +406,6 @@ msgstr ""
 msgid "All Answers"
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr_evaluation.plan,month_first:0
-msgid "Next Evaluation After"
-msgstr ""
-
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
@@ -449,6 +452,11 @@ msgstr ""
 msgid "Is Evaluation?"
 msgstr ""
 
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
 msgid "Check this box if you want to wait that all preceding phases are finished before launching this phase."
@@ -475,6 +483,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr ""
+
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -659,6 +672,11 @@ msgstr ""
 msgid "Send all answers to the employee"
 msgstr ""
 
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr ""
+
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: selection:hr.evaluation.report,state:0
@@ -837,3 +855,8 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid "The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."
+msgstr ""
+
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 8d7e12890f5..3176d64b995 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:10+0000\n"
+"PO-Revision-Date: 2010-12-19 21:49+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: 2010-12-17 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr "Өмнөх үеийг хүлээх эсэх"
+msgstr "Өмнөх Шатлалыг Хүлээх"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -49,7 +49,7 @@ msgstr "Үнэлгээний төрөл"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr "Өөрийн үнэлгээ (үлдэгдэл)"
+msgstr "Миний Үлдэгдэл Үнэлгээ"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -60,12 +60,12 @@ msgstr "Ялгах тэмдэг"
 #: code:addons/hr_evaluation/hr_evaluation.py:0
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
-msgstr "Та үнэлгээгүйгээр үнэлгээг эхэлж болохгүй"
+msgstr "Та Үнэлгээгүйгээр үнэлгээг эхэлж болохгүй"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr "3 сар"
+msgstr "3-р сар"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
@@ -131,7 +131,7 @@ msgstr "Ярилцлагын хүсэлт"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -277,7 +277,7 @@ msgstr "(Огноо) Өнөөдрийн огноо"
 #: code:addons/hr_evaluation/hr_evaluation.py:0
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "Холбоотой "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -582,7 +582,7 @@ msgstr "Өргөтгөсөн хайлт..."
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Алдаа! Ажилтны рекурс иерархийг үүсгэж болохгүй"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2feedf44fba..17e0dd09bf9 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,7 +86,7 @@
                                         <newline/>
                                         <field name="unit_amount"/>
                                         <field name="unit_quantity"/>
-                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
+                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
                                     </group>
                                     <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
                                         <separator string="Customer Project" colspan="2"/>
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index d80a0ccfc92..1c6d6ee357b 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-09 10:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-17 22:21+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-12-17 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -47,7 +46,7 @@ msgstr "Agrupar por..."
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_air_product_template
 msgid "Air Ticket"
-msgstr ""
+msgstr "Billete de avión"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -60,12 +59,12 @@ msgstr "Departamento"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_expense
 #: field:hr.expense.report,invoiced:0
 msgid "# of Invoiced Lines"
-msgstr ""
+msgstr "Nº de líneas facturadas"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
@@ -107,6 +106,8 @@ msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
 msgstr ""
+"Fecha de aceptación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón aceptar."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -116,7 +117,7 @@ msgstr "Notas"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr ""
+msgstr "Factura de empleado"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -161,6 +162,8 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
+"Fecha de confirmación de la hoja de gastos. Se rellena cuando pulsamos el "
+"botón confirmar."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -176,7 +179,7 @@ msgstr "Rechazar gasto"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_car_product_template
 msgid "Car Travel"
-msgstr ""
+msgstr "Viaje en coche"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
@@ -186,7 +189,7 @@ msgstr "Precio promedio"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Total Invoiced Lines"
-msgstr ""
+msgstr "Total líneas facturadas"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -202,12 +205,12 @@ msgstr "El contable valida la hoja"
 #. module: hr_expense
 #: field:hr.expense.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "Tiempo hasta validar"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr ""
+msgstr "Da el orden de secuencia al mostrar una lista de líneas de gastos."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:0
@@ -279,12 +282,12 @@ msgstr "Mis gastos"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr ""
+msgstr "Gastos RH"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -306,7 +309,7 @@ msgstr "Diario forzado"
 #: view:hr.expense.report:0
 #: field:hr.expense.report,no_of_products:0
 msgid "# of Products"
-msgstr ""
+msgstr "Nº de productos"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -326,20 +329,20 @@ msgstr "Reemborso"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 #: field:hr.expense.report,date_valid:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Fecha de validación"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr ""
+msgstr "Análisis de gastos"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -359,24 +362,24 @@ msgstr "Líneas de gastos"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "Tiempo hasta confirmar"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
@@ -388,12 +391,12 @@ msgstr "Moneda"
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
 msgid "The employee must have a working address"
-msgstr ""
+msgstr "El empleado debe tener una dirección de trabajo"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Esperando aprobación"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
@@ -410,12 +413,12 @@ msgstr "Facturado"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Puede ser un gasto"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Año  "
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -453,7 +456,7 @@ msgstr "Gasto está aprobado."
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
@@ -468,7 +471,7 @@ msgstr "Importe total"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -478,7 +481,7 @@ msgstr "Gastos borrador"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Customer Project"
-msgstr ""
+msgstr "Proyecto de cliente"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -496,17 +499,17 @@ msgstr "Fecha"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -516,7 +519,7 @@ msgstr "Total:"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -548,13 +551,13 @@ msgstr "Hoja de gastos"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Waiting"
-msgstr ""
+msgstr "En espera"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -564,7 +567,7 @@ msgstr "Seguimiento de los gastos de los recursos humanos"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -582,7 +585,7 @@ msgstr "Refacturar"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr ""
+msgstr "Todos los gastos del empleado"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -592,7 +595,7 @@ msgstr "Otra información"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "El diario usado cuando se factura el gasto"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -642,7 +645,7 @@ msgstr "Producto"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses of My Department"
-msgstr ""
+msgstr "Gastos de mi departamento"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -654,7 +657,7 @@ msgstr "Descripción"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_expense
 #: field:hr.expense.line,unit_quantity:0
@@ -664,7 +667,7 @@ msgstr "Cantidades"
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
 msgid "# of Accounts"
-msgstr ""
+msgstr "Nº de cuentas"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -680,7 +683,7 @@ msgstr "Ref."
 #. module: hr_expense
 #: field:hr.expense.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.expense_all
@@ -692,11 +695,16 @@ msgid ""
 "and the employee can be reimbursed. You can also reinvoice the customer at "
 "the end of the flow."
 msgstr ""
+"El módulo de gestión de gastos de OpenERP le permite hacer un seguimiento de "
+"todo el proceso. Cada mes, los empleados introducen sus gastos. Al final del "
+"mes, sus responsables validan las hojas de gastos las cuales crean costes en "
+"cuentas analíticas. El contable valida las entradas propuestas y se puede "
+"reembolsar al empleado. Puede refacturar al cliente al final del proceso."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "This Month"
-msgstr ""
+msgstr "Este Mes"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
@@ -713,7 +721,7 @@ msgstr "(Fecha y firma)"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -733,17 +741,17 @@ msgstr "Crea factura de proveedor."
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
 msgid "Hotel Accommodation"
-msgstr ""
+msgstr "Alojamiento hotel"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Expense Note"
-msgstr ""
+msgstr "Nota de gasto"
 
 #. module: hr_expense
 #: help:hr.expense.expense,state:0
@@ -755,11 +763,17 @@ msgid ""
 " If an invoice is made for the expense request, the state is 'Invoiced'.\n"
 " If the expense is paid to user, the state is 'Reimbursed'."
 msgstr ""
+"Cuando la solicitud de gasto es creada el estado es 'borrador'.\n"
+" Si el usuario la confirma y se envia al responsable, el estado es "
+"'esperando confirmación'.            \n"
+"Si el responsable la acepta, el estado es 'aceptada'.\n"
+" Si se factura, el estado es 'facturada'.\n"
+" Si se paga al usuario, el estado es 'reembolsada'"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: hr_expense
 #: view:hr.expense.line:0
@@ -788,18 +802,18 @@ msgstr "Gastos"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Código EAN no válido"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para aprobar"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
@@ -807,6 +821,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Determina si el producto se puede visualizar en la lista de productos a "
+"seleccionar en una línea de la hoja de gastos."
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 483e15a3d0c..3c2980cabdc 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:23+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:23+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -114,6 +114,24 @@ msgstr ""
 msgid "Employee's Invoice"
 msgstr ""
 
+#. module: hr_expense
+#: model:ir.module.module,description:hr_expense.module_meta_information
+msgid "\n"
+"    This module aims to manage employee's expenses.\n"
+"\n"
+"    The whole workflow is implemented:\n"
+"    * Draft expense\n"
+"    * Confirmation of the sheet by the employee\n"
+"    * Validation by his manager\n"
+"    * Validation by the accountant and invoice creation\n"
+"    * Payment of the invoice to the employee\n"
+"\n"
+"    This module also uses the analytic accounting and is compatible with\n"
+"    the invoice on timesheet module so that you will be able to automatically\n"
+"    re-invoice your customer's expenses if your work by project.\n"
+"    "
+msgstr ""
+
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
 msgid "Cancelled"
@@ -313,6 +331,12 @@ msgstr ""
 msgid "Reimbursement"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:0
+#, python-format
+msgid "The employee must have a Home address"
+msgstr ""
+
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
@@ -374,12 +398,6 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
-#, python-format
-msgid "The employee must have a working address"
-msgstr ""
-
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Approval"
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index cf50d65ff23..b3c89852675 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 16:12+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -504,7 +504,7 @@ msgstr "11 сар"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Өргөтгөсөн Шүүлтүүр..."
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 5907c9ac797..8fe5da805b4 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -155,9 +155,7 @@ class hr_holidays(osv.osv):
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
-        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
-        # Todo: Add below field in view?
-        'category_holiday_id': fields.many2one('hr.holidays', 'Holiday', help='For allocation By Employee Category (Link between Employee Category holiday and related holidays for employees of that category)')
+        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
     }
 
     _defaults = {
@@ -169,14 +167,6 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
 
-    def _get_category_leave_ids(self, cr, uid, ids):
-        """Returns the leaves taken by the employees of the category if holiday type is 'category'."""
-        leave_ids = []
-        for record in self.browse(cr, uid, ids):
-            if record.holiday_type == 'category' and record.type == 'remove':
-                leave_ids += self.search(cr, uid, [('category_holiday_id', '=', record.id)])
-        return leave_ids
-
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -240,6 +230,7 @@ class hr_holidays(osv.osv):
                     list_ids = [ lr.id for lr in record.linked_request_ids]
                     self.holidays_cancel(cr, uid, list_ids)
                     self.unlink(cr, uid, list_ids)
+        return True
 
     def _check_date(self, cr, uid, ids, context=None):
         for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
@@ -257,7 +248,6 @@ class hr_holidays(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         self._update_user_holidays(cr, uid, ids)
-        ids += self._get_category_leave_ids(cr, uid, ids)
         self._remove_resouce_leave(cr, uid, ids, context=context)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
@@ -341,32 +331,35 @@ class hr_holidays(osv.osv):
                    'holiday_id': record.id
                      }
                 self._create_resource_leave(cr, uid, vals)
-            elif record.holiday_type == 'category' and record.type == 'remove':
+            elif record.holiday_type == 'category':
+                # Create leave/allocation request for employees in the category
                 emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
+                leave_ids = []
                 for emp in obj_emp.browse(cr, uid, emp_ids):
                     vals = {
-                       'name': record.name,
-                       'date_from': record.date_from,
-                       'date_to': record.date_to,
-                       'calendar_id': emp.calendar_id.id,
-                       'company_id': emp.company_id.id,
-                       'resource_id': emp.resource_id.id,
-                       'holiday_id':record.id
-                         }
-#                    self._create_resource_leave(cr, uid, vals)
-                # Validate all the leave requests of the category
-                for leave_id in self.search(cr, uid, [('category_holiday_id', '=', record.id)]):
-                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
+                    'name': record.name,
+                    'type': record.type,
+                    'holiday_type': 'employee',
+                    'holiday_status_id': record.holiday_status_id.id,
+                    'date_from': record.date_from,
+                    'date_to': record.date_to,
+                    'notes': record.notes,
+                    'number_of_days_temp': record.number_of_days_temp,
+                    'parent_id': record.id,
+                    'employee_id': emp.id
+                    }
+                    leave_ids.append(self.create(cr, uid, vals, context=None))
+                    # Confirm and validate all the leave requests of the category
+                    for leave_id in leave_ids:
+                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
+                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
         obj_hr_holiday_status = self.pool.get('hr.holidays.status')
-        obj_emp = self.pool.get('hr.employee')
-        wf_service = netsvc.LocalService("workflow")
         for record in self.browse(cr, uid, ids):
             user_id = False
             leave_asked = record.number_of_days_temp
-            leave_ids = []
             if record.holiday_type == 'employee' and record.type == 'remove':
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = obj_hr_holiday_status.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
@@ -379,23 +372,6 @@ class hr_holidays(osv.osv):
                     if leaves_rest < leave_asked:
                         raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for category %s while there are too few remaining leave days.') % (record.category_id.name))
                 nb = -(record.number_of_days_temp)
-                # Create leave request for employees in the category
-                emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
-                for emp in obj_emp.browse(cr, uid, emp_ids):
-                    vals = {
-                    'name': record.name,
-                    'holiday_status_id': record.holiday_status_id.id,
-                    'date_from': record.date_from,
-                    'date_to': record.date_to,
-                    'notes': record.notes,
-                    'number_of_days_temp': record.number_of_days_temp,
-                    'category_holiday_id': record.id,
-                    'employee_id': emp.id
-                }
-                    leave_ids.append(self.create(cr, uid, vals, context=None))
-                # Confirm all the leave requests of the category
-                for leave_id in leave_ids:
-                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
             else:
                 nb = record.number_of_days_temp
 
@@ -420,11 +396,8 @@ class hr_holidays(osv.osv):
 
     def holidays_cancel(self, cr, uid, ids, *args):
         self._update_user_holidays(cr, uid, ids)
-        self._remove_resouce_leave(cr, uid, ids)
         self.write(cr, uid, ids, {'state': 'cancel'})
-        leave_ids = self._get_category_leave_ids(cr, uid, ids)
-        if leave_ids:
-            self.unlink(cr, uid, leave_ids) # unlink all the leave requests of the category
+        self._remove_resouce_leave(cr, uid, ids)
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 3290a0b9aef..50fe56ffca1 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-05 10:18+0000\n"
+"PO-Revision-Date: 2010-12-17 22:48+0000\n"
 "Last-Translator: Carlos @ smile.fr <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: 2010-12-17 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -26,7 +26,7 @@ msgstr "Azul"
 #: field:hr.holidays,allocation_type:0
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Tipo de asignación"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -37,12 +37,12 @@ msgstr "A la espera de segunda aprobación"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,taken_leaves:0
 msgid "Taken Leaves"
-msgstr ""
+msgstr "Ausencias cogidas"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Máximas ausencias permitidas - Ausencias ya cogidas"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -83,7 +83,7 @@ msgstr "Categoría de empleado"
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
 msgid "Company Allocation"
-msgstr ""
+msgstr "Asignación de compañía"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -111,6 +111,8 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"El responsable de ausencias puede dejar este campo vacío si esta "
+"petición/asignación de ausencia es para cada empleado."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -189,6 +191,9 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Escoja 'petición de ausencia' si alguien quiere cogerse un día libre. \n"
+"Escoja 'petición de asignación' si quiere incrementar el número de ausencias "
+"disponible para alguien."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -208,6 +213,8 @@ msgid ""
 "You cannot validate leaves for category %s while there are too few remaining "
 "leave days."
 msgstr ""
+"No puede validar ausencias de la categoría %s mientras el número de días "
+"disponibles sea insuficiente."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -262,6 +269,10 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"Cuando la petición de vacaciones se crea el estado es 'borrador'.\n"
+" Si se confirma y es enviada al responsable, el estado es 'esperando "
+"aprobación'. Si el responsable la acepta, el estado es 'aprobada'. Si es "
+"rechazada, el estado es 'rechazada'."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
@@ -287,6 +298,8 @@ msgid ""
 "This field is only for informative purposes, to depict if the leave "
 "request/allocation comes from an employee or from the company"
 msgstr ""
+"Este campo es sólo para fines informativos, para indicar si la petición "
+"/asignación de ausencia viene de un empleado o de la compañía"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -334,6 +347,40 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'\n"
 "            .\n"
 msgstr ""
+"Recursos humanos: Gestión de vacaciones y flujo de trabajo\n"
+"\n"
+"    Este módulo le permite gestionar las ausencias y las peticiones de "
+"ausencias.\n"
+"    Implementa un tablero para gestión de recursos humanos que incluye:\n"
+"        * Mis ausencias\n"
+"        * Mis gastos\n"
+"    Tenga en cuenta que:\n"
+"    - Puede sincronizar con una agenda interna (uso del módulo CRM): para "
+"crear un caso automáticamente cuando una solicitud de vacaciones es "
+"aceptada, tiene que enlazar el estado de las vacaciones con una sección de "
+"caso. Puede configurar esta opción y su color en\n"
+"                RH / Configuración / Estados de vacaciones\n"
+"    - Un empleado puede pedir más días libres haciendo una nueva asignación. "
+"Incrementará su total disponible de ese tipo de ausencia (si se acepta la "
+"petición)\n"
+"    - Hay dos formas de imprimir las vacaciones de los empleados:\n"
+"        * La primera le permitirá escoger empleados por departamento y se "
+"usa pinchando la opción de menú:\n"
+"                RH / Peticiones de vacaciones / Imprimir resumen de "
+"vacaciones\n"
+"        * La segunda le permitirá elegir el informe de vacaciones para "
+"empleados específicos. Vaya a:\n"
+"                RH / Empleados / Empleados\n"
+"            y seleccione aquellos que quiera, pulse sobre el icono imprimir "
+"y seleccione la opción\n"
+"                'Imprimir resumen de vacaciones de empleados'\n"
+"    - El asistente le permite escoger si quiere imprimir las confirmadas y "
+"validadas o sólo las validadas.\n"
+"Estos estados deben ser configurados por un usuario del grupo 'RH'. Puede "
+"definir estas opciones en la pestaña seguridad de los datos del usuario\n"
+"                Administración / Usuarios / Usuarios\n"
+"            por ejemplo, puede hacerlo para el usuario 'admin'\n"
+"            .\n"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -403,6 +450,8 @@ msgstr "Trigo"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -415,22 +464,22 @@ msgstr "Número de días"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,max_leave:0
 msgid "Allocated Leaves"
-msgstr ""
+msgstr "Ausencias asignadas"
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Remaining Leave by Type and User"
-msgstr ""
+msgstr "Ausencias disponibles por tipo y usuario"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Buscar tipo de ausencia"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -438,11 +487,13 @@ msgid ""
 "If its True then its Allocation/Request have to be validated by second "
 "validator"
 msgstr ""
+"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+"segundo validador"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Esperando aprobación"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -452,12 +503,12 @@ msgstr "Empleado(s)"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Leaves By Month"
-msgstr ""
+msgstr "Ausencias por mes"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -466,6 +517,8 @@ msgid ""
 "You cannot validate leaves for employee %s while there are too few remaining "
 "leave days."
 msgstr ""
+"No puede validar ausencias para el empleado %s mientras no haya suficientes "
+"días disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -474,11 +527,14 @@ msgid ""
 "synchronize each leave asked with a case in this category, to display it in "
 "the company shared calendar for example."
 msgstr ""
+"Si enlaza este tipo de ausencia con una categoría del CRM, sincronizará cada "
+"petición de ausencia con un caso en esta categoría para mostrarlo en un "
+"calendario compartido por ejemplo."
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Padre"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -486,21 +542,24 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia en segundo nivel (si el tipo de ausencia necesita segunda "
+"validación)"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
 msgid "Remaining Leaves by User"
-msgstr ""
+msgstr "Ausencias disponibles por usuario"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -511,30 +570,30 @@ msgstr "Lavanda"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Peticiones de ausencia"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Permite sobrepasar límite"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Vacaciones del empleado"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -542,23 +601,25 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Este valor es la suma de todas la peticiones de vacaciones con un valor "
+"positivo."
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Available Holidays"
-msgstr ""
+msgstr "Vacaciones disponibles"
 
 #. module: hr_holidays
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Todas las ausencias del empleado"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "No user related to the selected employee."
-msgstr ""
+msgstr "El empleado seleccionado no tiene un usuario asociado"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -569,7 +630,7 @@ msgstr "Coral claro"
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr ""
+msgstr "Vacaciones por departamento"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -579,7 +640,7 @@ msgstr "Negro"
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Fiesta"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -589,7 +650,7 @@ msgstr "Máximo de vacaciones permitidas"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
-msgstr ""
+msgstr " Año "
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -599,12 +660,12 @@ msgstr "Marfil"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -632,43 +693,43 @@ msgstr "Activo"
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
 msgid "Employee Request"
-msgstr ""
+msgstr "Petición de empleado"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "Primera aprobación"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Casual Leave"
-msgstr ""
+msgstr "Ausencia ocasional"
 
 #. module: hr_holidays
 #: field:available.holidays.report,date:0
@@ -679,13 +740,13 @@ msgstr "Fecha"
 #: view:hr.holidays:0
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "Resumen de ausencias"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -698,11 +759,13 @@ msgid ""
 "Start date should not be larger than end date!\n"
 "Number of Days should be greater than 1!"
 msgstr ""
+"¡La fecha de inicio no debe ser mayor que la de fin!\n"
+"¡El número de días debe ser mayor que 1!"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Tipo de petición"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -710,18 +773,20 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Si el campo activo no está marcado, le permitirá esconder el tipo de "
+"ausencia sin eliminarla."
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:available.holidays.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Razones"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -731,12 +796,17 @@ msgid ""
 "agenda of the employee. You can define several allowance types (paid "
 "holidays, sickness, etc) and manage allowances per type."
 msgstr ""
+"Las peticiones de ausencia pueden ser introducidas por los empleados y "
+"validadas por sus responsables. Una vez que una petición es validada aparece "
+"automáticamente en la agenda del empleado. Puede definir varios tipos de "
+"permisos (vacaciones pagadas, enfermedad, etc) y gestionar los permisos por "
+"tipo."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Análisis de ausencias"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -751,6 +821,8 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Este color se usará en el resumen de ausencias situado en Informes\\"
+"Ausencias por departamento"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -765,17 +837,17 @@ msgstr "Validado"
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Petición de asignación"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalle ausencia"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Aplicar doble validación"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -786,13 +858,13 @@ msgstr "Imprimir"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: hr_holidays
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
 msgid "My Leaves"
-msgstr ""
+msgstr "Mis ausencias"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -803,7 +875,7 @@ msgstr "Departamento(s)"
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Petición de ausencia"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -813,7 +885,7 @@ msgstr "Descripción"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -827,11 +899,13 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Por empleado: Asignación/Petición para empleado individual. Por categoría de "
+"empleado: Asignación/Petición para un grupo de empleados en la categoría."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Buscar ausencia"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -841,27 +915,27 @@ msgstr "Seleccionar un tipo de vacaciones"
 #. module: hr_holidays
 #: field:available.holidays.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "Leaves by Month"
-msgstr ""
+msgstr "Ausencias por mes"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "Por categoría de empleado"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Este Mes"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Segunda aprobación"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
@@ -871,12 +945,12 @@ msgstr "Caso"
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha fin"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -884,6 +958,8 @@ msgid ""
 "If you tick this checkbox, the system will allow, for this section, the "
 "employees to take more leaves than the available ones."
 msgstr ""
+"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+"sección, cogerse más ausencias de las disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -891,6 +967,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Este valor se calcula sumando todas las peticiones de vacaciones con un "
+"valor negativo."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -900,7 +978,7 @@ msgstr "Violeta"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
@@ -910,28 +988,30 @@ msgstr "Recursos humanos: Gestión de vacaciones"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "Informe RH resumen de vacaciones por departamento"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automaticly filled by the user who validate the leave"
 msgstr ""
+"Este espacio es rellenado automáticamente por el usuario que valida la "
+"ausencia"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr ""
+msgstr "Peticiones asociadas"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Peticiones de asignación"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -947,28 +1027,28 @@ msgstr "Rosa claro"
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Wrong leave definition."
-msgstr ""
+msgstr "Definición de ausencia errónea"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Para confirmar"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:available.holidays.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para aprobar"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -976,6 +1056,8 @@ msgstr ""
 msgid ""
 "You Cannot Validate leaves while available leaves are less than asked leaves."
 msgstr ""
+"No puede validar ausencias mientras haya menos ausencias disponibles que "
+"peticiones."
 
 #~ msgid "Notification"
 #~ msgstr "Notificación"
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index e88c1d6e47e..a75944cb6b6 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 05:21+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-19 10:04+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -349,6 +348,25 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'\n"
 "            .\n"
 msgstr ""
+"Ressources humaines : Suivi des vacances et déroulement des opérations\n"
+"\n"
+"    Ce module vous permet de gérer les congés et les demandes de congés.\n"
+"    Il fournit un tableau de bord pour la gestion des ressources humaines "
+"qui inclut :\n"
+"        * Mes congés\n"
+"        * Mes frais\n"
+"    Remarquez que :\n"
+"    - Une synchronisation avec un agenda interne (utilisation du module CRM) "
+"est possible : dans le but de créer automatiquement un cas quand une demande "
+"de vacances est acceptée, vous devez associer le statut de vacances à une "
+"section de cas. Vous pouvez confirer cette information et vos préférences de "
+"couleur dans :\n"
+"                RH / Configuration / Statut de vacances\n"
+"    - Un employé peut faire une demande pour plus de congé en faisant une "
+"nouvelle allocation, cela va augmenter son total disponible pour ce type de "
+"congés (si la demande est acceptée).\n"
+"    - Il y a 2 moyens d'imprimer les vacances de l'employé :\n"
+".\n"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -509,6 +527,9 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Cet espace est rempli automatiquement par l'utilisateur qui valide les "
+"congés au deuxième niveau (si les congés ont besoin d'une deuxième "
+"validation)"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
@@ -760,6 +781,11 @@ msgid ""
 "agenda of the employee. You can define several allowance types (paid "
 "holidays, sickness, etc) and manage allowances per type."
 msgstr ""
+"Les demandes de congé peuvent être enregistrées par les employés et validées "
+"par leurs gestionnaires. Quand une demande de congés est validée, elle "
+"apparaît automatiquement dans l'agenda de l'employé. Vous pouvez définir "
+"plusieurs types d'allocation (vacances payées, maladie, etc.) et gérer les "
+"allocations par type."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
@@ -817,7 +843,7 @@ msgstr "Imprimer"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -858,6 +884,8 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Par employé : Allocation/demande pour l'employé individuel, par catégorie "
+"d'employés : Allocation/demande par groupe d'employés dans une catégorie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index a4e18c22646..cabd8244022 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:24+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:24+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:12+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -414,6 +414,11 @@ msgstr ""
 msgid "If its True then its Allocation/Request have to be validated by second validator"
 msgstr ""
 
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid "    Month-1    "
+msgstr ""
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 0725e34f0f9..b305e6bf92b 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -55,9 +55,9 @@
         'wizard/hr_payroll_year_salary.xml',
     ],
     'test': [
-#         'test/payslip.yml',
-#         'test/payment_advice.yml',
-#         'test/payroll_register.yml',
+         'test/payslip.yml',
+         'test/payment_advice.yml',
+         'test/payroll_register.yml',
 #         'test/hr_payroll_report.yml',
     ],
     'demo_xml': [
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index cb8897f141e..8ecd991ce8d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -87,18 +87,6 @@
         <!-- End Passport Views -->
 
         <!-- Employee View -->
-        <record id="view_employee_bank_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id"/>
-                </field>
-            </field>
-        </record>
-
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index 4f65a760204..59dd2b301bd 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-24 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 17:35+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -34,12 +35,12 @@ msgstr ""
 #: field:hr.payslip,net:0
 #: report:salary.structure:0
 msgid "Net Salary"
-msgstr ""
+msgstr "Salaire net"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Recalculer la feuille"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -49,7 +50,7 @@ msgstr "Détails sur le salaire des employés"
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Allowances with Basic:"
-msgstr ""
+msgstr "Allocations de base :"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -60,30 +61,30 @@ msgstr ""
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Deductions:"
-msgstr ""
+msgstr "Déductions :"
 
 #. module: hr_payroll
 #: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
-msgstr ""
+msgstr "Utiliser comme prime ?"
 
 #. module: hr_payroll
 #: field:hr.contract,working_days_per_week:0
 #: field:hr.payslip,working_days:0
 #: report:payslip.pdf:0
 msgid "Working Days"
-msgstr ""
+msgstr "Jours de travail"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan"
-msgstr ""
+msgstr "Prêt"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Registre de paiement des salaires"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
@@ -91,18 +92,18 @@ msgstr ""
 #: field:hr.payroll.register,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr ""
+msgstr "Feuilles de paye"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
 msgid "Year Salary Report"
-msgstr ""
+msgstr "Rapport salarial annuel"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr ""
+msgstr "Salaire payé"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -124,12 +125,12 @@ msgstr ""
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "The Manager"
-msgstr ""
+msgstr "Le gestionnaire"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Détails de la lettre"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -158,7 +159,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Vacances avec demi-salaire"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -176,38 +177,40 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Détail du contrat :"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
 #: field:hr.payslip,inet:0
 msgid "Calculaton Field"
-msgstr ""
+msgstr "Champ pour le calcul"
 
 #. module: hr_payroll
 #: help:hr.payroll.advice,bank_id:0
 #: help:hr.payroll.register,bank_id:0
 msgid "Select the Bank Address from whcih the salary is going to be paid"
 msgstr ""
+"Sélectionner l'adresse de la banque à partir de laquelle le salarié va être "
+"payé."
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+msgstr "Avis bancaire"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Reject"
-msgstr ""
+msgstr "Rejetée"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
-msgstr ""
+msgstr "Congés"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,register_id:0
@@ -226,7 +229,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Deductions"
-msgstr ""
+msgstr "Total des déductions"
 
 #. module: hr_payroll
 #: field:company.contribution.line,value:0
@@ -237,12 +240,12 @@ msgstr ""
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Name of the Employee"
-msgstr ""
+msgstr "Nom de l'employé"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Register Lines"
-msgstr ""
+msgstr "Lignes du registre"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -261,6 +264,8 @@ msgstr ""
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
 msgstr ""
+"Veuillez vérifier la configuration de %s, l'en-tête du registre du personnel "
+"est manquante"
 
 #. module: hr_payroll
 #: selection:company.contribution,amount_type:0
@@ -276,23 +281,23 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "Pays d'émission"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
-msgstr ""
+msgstr "Déduction pour cet employé"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
-msgstr ""
+msgstr "Autre déduction"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Paid Holiday"
-msgstr ""
+msgstr "Vacance payée"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -305,12 +310,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
-msgstr ""
+msgstr "Date d'expiration du passeport"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Un-Paid Holiday"
-msgstr ""
+msgstr "Vacance sans solde"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -323,6 +328,8 @@ msgstr ""
 msgid ""
 "Calculation field used for internal calculation, do not place this on form"
 msgstr ""
+"Champ de calcul utilisé pour les calculs en interne, ne pas placer sur le "
+"formulaire"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -358,12 +365,12 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Verification"
-msgstr ""
+msgstr "En attente de vérification"
 
 #. module: hr_payroll
 #: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
 msgid "Human Resource Payroll"
-msgstr ""
+msgstr "Module de paye pour les ressources humaines"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -389,6 +396,17 @@ msgid ""
 "    * Integrated with Holiday Management\n"
 "    "
 msgstr ""
+"Système de paye générique \n"
+"    * Détail des employés\n"
+"    * Contrats des employés\n"
+"    * Contrat basé sur des passeports\n"
+"    * Allocations / déductions\n"
+"    * Permet de configurer les salaires de base / les salaires nets / les "
+"augmentations\n"
+"    * Feuilles de paye des employés\n"
+"    * Registre mensuels des salaires\n"
+"    * Intégration avec la gestion des congés\n"
+"    "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_holidays_status
@@ -413,7 +431,7 @@ msgstr "Paiements -"
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "N° de visa"
 
 #. module: hr_payroll
 #: field:company.contribution.line,from_val:0
@@ -427,7 +445,7 @@ msgstr ""
 #: field:hr.payroll.advice.line,bysal:0
 #: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Par salaire"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_to:0
@@ -439,23 +457,23 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Feuille de paye de l'employé"
 
 #. module: hr_payroll
 #: field:hr.payslip,leaves:0
 msgid "Leave Deductions"
-msgstr ""
+msgstr "Déductions pour congés"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "Authorised Signature"
-msgstr ""
+msgstr "Signature autorisée"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
 msgid "Function Value"
-msgstr ""
+msgstr "Valeur de la fonction"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
@@ -477,12 +495,12 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Paymeny Lines"
-msgstr ""
+msgstr "Lignes de paiement"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Other Lines"
-msgstr ""
+msgstr "Autres lignes"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -497,7 +515,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
 msgid "Company Contributions"
-msgstr ""
+msgstr "Contributions de la société"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,employee_id:0
@@ -517,7 +535,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
 msgid "Bank Advice Lines"
-msgstr ""
+msgstr "Lignes d'avis bancaire"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -543,23 +561,23 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Verify Sheet"
-msgstr ""
+msgstr "Vérifier la feuille"
 
 #. module: hr_payroll
 #: help:hr.contract,working_days_per_week:0
 msgid "No of Working days / week for an employee"
-msgstr ""
+msgstr "Nombre de jours travaillés par semaine pour un employé"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Nouvelle feuille de paye"
 
 #. module: hr_payroll
 #: field:hr.payslip,basic:0
 msgid "Net Basic"
-msgstr ""
+msgstr "Basique net"
 
 #. module: hr_payroll
 #: field:hr.contract,gross:0
@@ -568,24 +586,24 @@ msgstr ""
 #: field:hr.payslip,grows:0
 #: report:salary.structure:0
 msgid "Gross Salary"
-msgstr ""
+msgstr "Salaire brut"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Total Earnings"
-msgstr ""
+msgstr "Total des revenus"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
 msgid "Employee Salary Statement"
-msgstr ""
+msgstr "Déclaration de salaire de l'employé"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
-msgstr ""
+msgstr "Autre paiement"
 
 #. module: hr_payroll
 #: field:hr.employee,advantages_net:0
@@ -602,12 +620,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "N° de permis de travail"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
 msgid "Employee Salary"
-msgstr ""
+msgstr "Salaire de l'employé"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,chaque_nos:0
@@ -640,18 +658,18 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Variable Error !"
-msgstr ""
+msgstr "Erreur de variable !"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
 msgid "hr.payroll.employees.detail"
-msgstr ""
+msgstr "hr.payroll.employees.detail"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
-msgstr ""
+msgstr "Payer le salaire"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,name:0
@@ -661,7 +679,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
-msgstr ""
+msgstr "Lignes de contribution"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -676,7 +694,7 @@ msgstr "Pour le mois de"
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Déduction"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -687,29 +705,29 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
 msgid "Contibution Register"
-msgstr ""
+msgstr "Registre des contributions"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Feuille de paye"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr ""
+msgstr "Acompte pour un prêt"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Complete HR Checking"
-msgstr ""
+msgstr "Vérification complète des RH"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Yours Sincerely"
-msgstr ""
+msgstr "Cordialement"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -719,22 +737,22 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Net Amount"
-msgstr ""
+msgstr "Montant net"
 
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary Structure:"
-msgstr ""
+msgstr "Structure salariale :"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
 msgid "Employees Salary Detail"
-msgstr ""
+msgstr "Détail du salaire de l'employé"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
 msgid "Function Line"
-msgstr ""
+msgstr "Ligne de fonction"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -742,7 +760,7 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Confirm Sheet"
-msgstr ""
+msgstr "Confirmer la feuille"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -753,13 +771,13 @@ msgstr ""
 #: view:company.contribution:0
 #: selection:company.contribution,amount_type:0
 msgid "Function Calculation"
-msgstr ""
+msgstr "Calcul de la fonction"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days:0
 #: report:payslip.pdf:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Jour travaillé"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,monthly_total_by_comp:0
@@ -774,17 +792,17 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country & Address"
-msgstr ""
+msgstr "Pays et adresse"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Employee Code"
-msgstr ""
+msgstr "Code de l'employé"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary – Leaves"
-msgstr ""
+msgstr "Salaire de base - congés"
 
 #. module: hr_payroll
 #: field:company.contribution,amount_type:0
@@ -793,7 +811,7 @@ msgstr ""
 #: field:hr.payslip.line.line,amount_type:0
 #: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Type de montant"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -807,7 +825,7 @@ msgstr ""
 #: field:hr.payslip.line,company_contrib:0
 #: model:ir.model,name:hr_payroll.model_company_contribution
 msgid "Company Contribution"
-msgstr ""
+msgstr "Contribution de la société"
 
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
@@ -817,7 +835,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Imprimer la déclaration"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -844,7 +862,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
 #: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
 msgid "Salary Register"
-msgstr ""
+msgstr "Registre des salaires"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -855,7 +873,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
 msgid "Passport Detail"
-msgstr ""
+msgstr "Détail du passeport"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,amount_type:0
@@ -886,7 +904,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Fonction de l'employé"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -896,12 +914,12 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Approve Sheet"
-msgstr ""
+msgstr "Approuver la feuille"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "Payé ? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
@@ -916,7 +934,7 @@ msgstr "Titre"
 #. module: hr_payroll
 #: view:company.contribution:0
 msgid "Search Company Contribution"
-msgstr ""
+msgstr "Rechercher dans les contributions de la société"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
@@ -931,7 +949,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Calculer la feuille"
 
 #. module: hr_payroll
 #: field:company.contribution,active:0
@@ -942,12 +960,12 @@ msgstr ""
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Applique cette rubrique pour le calcul si la condition est vraie"
 
 #. module: hr_payroll
 #: report:year.salary:0
 msgid "Yearly Salary Details"
-msgstr ""
+msgstr "Détails du salaire annuel"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -963,12 +981,12 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for HR Verification"
-msgstr ""
+msgstr "En attente de vérification par les RH"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Payment Advice:"
-msgstr ""
+msgstr "Avis de paiement :"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -994,22 +1012,22 @@ msgstr ""
 #: field:hr.payslip,basic_before_leaves:0
 #: report:payslip.pdf:0
 msgid "Basic Salary"
-msgstr ""
+msgstr "Salaire de base"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Categoty Code"
-msgstr ""
+msgstr "Code de catégorie"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Salary Information"
-msgstr ""
+msgstr "Information sur le salaire"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_company_contribution_line
 msgid "Allowance Deduction Categoty"
-msgstr ""
+msgstr "Catégorie allocation / déduction"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1019,7 +1037,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Authorized Signature"
-msgstr ""
+msgstr "Signature autorisée"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
@@ -1030,12 +1048,12 @@ msgstr "Contrat"
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
 msgid "Draft Sheet"
-msgstr ""
+msgstr "Brouillon de feuille de paye"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Next Month Date"
-msgstr ""
+msgstr "Date pour le mois prochain"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,date:0
@@ -1048,12 +1066,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr ""
+msgstr "Date d'expiration du visa"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "Rechercher dans les passeports"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1086,7 +1104,7 @@ msgstr ""
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Other No."
-msgstr ""
+msgstr "Autre n°"
 
 #. module: hr_payroll
 #: field:company.contribution,code:0
@@ -1103,12 +1121,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
 msgid "Payment Advice"
-msgstr ""
+msgstr "Avis de paiement"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Number :"
-msgstr ""
+msgstr "Numéro :"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,base:0
@@ -1121,7 +1139,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "Vue d'ensemble du calcul"
 
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
@@ -1152,7 +1170,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Ligne du registre"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -1181,7 +1199,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
-msgstr ""
+msgstr "Date du mois actuel"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1202,17 +1220,17 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Total Salary"
-msgstr ""
+msgstr "Salaire total"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "for period"
-msgstr ""
+msgstr "pour la période"
 
 #. module: hr_payroll
 #: field:hr.holidays.status,head_id:0
 msgid "Payroll Head"
-msgstr ""
+msgstr "Rubrique de la fiche de paye"
 
 #. module: hr_payroll
 #: field:company.contribution,register_id:0
@@ -1230,13 +1248,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
 msgid "Salary Heads"
-msgstr ""
+msgstr "Rubriques du salaire"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimer le rapport"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1254,6 +1272,9 @@ msgid ""
 "Contribute 5% then company will and here 0.50 defined then company will "
 "contribute 50% on employee 5% contribution"
 msgstr ""
+"Définit le ratio de contribution de la société : 1.00 = 100%. Si l'employé "
+"contribue pour 5% et que la valeur ici est définie à 0.50, la société "
+"contribuera à hauteur de 50% de la contribution de 5% de l'employé."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1268,17 +1289,17 @@ msgstr "Mois"
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "Émission"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Dynamic Computation"
-msgstr ""
+msgstr "Calcul dynamique"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Basic Salary without Leave:"
-msgstr ""
+msgstr "Salaire de base sans les congés :"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1303,12 +1324,12 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
 msgid "Allowance Deduction Heads"
-msgstr ""
+msgstr "Rubriques d'allocation / de déduction"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "Salaire brut"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1350,14 +1371,14 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Registres des contributions"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
 #: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
-msgstr ""
+msgstr "Paye"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
@@ -1367,7 +1388,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "Salaire net"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
@@ -1377,12 +1398,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
 msgid "Categoty Name"
-msgstr ""
+msgstr "Nom de la catégorie"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
 msgid "hr.payroll.year.salary"
-msgstr ""
+msgstr "hr.payroll.year.salary"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1395,12 +1416,12 @@ msgstr "Adresse"
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
 msgid "Slip Line"
-msgstr ""
+msgstr "Ligne de feuille de paye"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Number of Leaves"
-msgstr ""
+msgstr "Nombre de congés"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1413,7 +1434,7 @@ msgstr "Banque"
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Cancel Sheet"
-msgstr ""
+msgstr "Annuler la feuille de paye"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -1424,7 +1445,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
+msgstr "Allocations et déductions spéciales pour l'employé"
 
 #. module: hr_payroll
 #: field:company.contribution,name:0
@@ -1446,7 +1467,7 @@ msgstr "Nom"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leaved Deduction"
-msgstr ""
+msgstr "Déduction pour congés"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1471,28 +1492,28 @@ msgstr "Compte bancaire"
 #. module: hr_payroll
 #: help:company.contribution,register_id:0
 msgid "Contribution register based on company"
-msgstr ""
+msgstr "Registre des contributions par société"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,sequence:0
 msgid "Use to arrange calculation sequence"
-msgstr ""
+msgstr "À utiliser pour définir les séquences de calcul"
 
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Paiement total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Leave Deductions Line:"
-msgstr ""
+msgstr "Ligne de déductions pour congés :"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Account Verification"
-msgstr ""
+msgstr "En attente de vérification par la comptabilité"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,comp_deduction:0
@@ -1502,18 +1523,18 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Configuration de la paye"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Veuillez définir le compte bancaire pour l'employé %s."
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
 msgid "Passport Issue Date"
-msgstr ""
+msgstr "Date d'émission du passeport"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1522,17 +1543,17 @@ msgstr ""
 #: field:hr.payslip,allounce:0
 #: selection:hr.payslip.line,type:0
 msgid "Allowance"
-msgstr ""
+msgstr "Allocation"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
 msgid "No of Leaves"
-msgstr ""
+msgstr "Nombre de congés"
 
 #. module: hr_payroll
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Autre identifiant"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1542,7 +1563,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Slip ID"
-msgstr ""
+msgstr "Identifiant de la fiche de paye"
 
 #. module: hr_payroll
 #: field:company.contribution.line,sequence:0
@@ -1556,33 +1577,33 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
 #: model:ir.ui.menu,name:hr_payroll.menu_department_tree
 msgid "Employee Payslip"
-msgstr ""
+msgstr "Fiche de paye de l'employé"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Content"
-msgstr ""
+msgstr "Contenu de la lettre"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Year Salary"
-msgstr ""
+msgstr "Salaire annuelle"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
-msgstr ""
+msgstr "Allocation / Déduction"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
 msgid "Bank Payment Advice"
-msgstr ""
+msgstr "Avis de paiement bancaire"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Search Payslips"
-msgstr ""
+msgstr "Rechercher dans les feuilles de paye"
 
 #. module: hr_payroll
 #: report:employees.salary:0
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 98a92e7cf76..c5a94bcc69d 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -528,6 +528,11 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -1181,12 +1186,12 @@ msgid "Salary"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,passport_id:0
 #: field:hr.passport,name:0
 msgid "Passport No"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
 #: view:hr.passport:0
 msgid "Passport"
 msgstr ""
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index 2d9fb8465c5..c10ada27c56 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -19,19 +19,14 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Richie
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a new payment advice record
 -
   !record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
-    account_id: account.cash
     line_ids:
       - amount: 5500.0
         bysal: 5000.0
@@ -56,7 +51,7 @@
 
 -
   Print Payroll Advice
-- 
+-
   !python {model: hr.payroll.advice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {})
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 7327688d22a..8bc346a34e1 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -18,25 +18,17 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Keith
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a payroll register record.
 -
   !record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
-    bank_journal_id: account.bank_journal
     date: '2010-07-02'
-    journal_id: account.expenses_journal
     line_ids:
       - employee_id: hr_payroll.hr_employee_keith0
-        bank_journal_id: account.bank_journal
-        journal_id: account.expenses_journal
     name: payroll1
 -
   I click on Compute button.
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index ca204a62241..aa739d2c9a1 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -29,14 +29,10 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Richard
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
     bank_account_id: res_partner_bank_0
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a new payroll structure for software developer
@@ -44,8 +40,7 @@
   !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
     code: SD
     line_ids:
-      - account_id: account.a_expense
-        amount: 0.40000000000000002
+      - amount: 0.40000000000000002
         amount_type: per
         category_id: hr_payroll.HRA
         code: HRA
@@ -54,8 +49,7 @@
         sequence: 5
         total: 0.0
         type: allowance
-      - account_id: account.a_expense
-        amount: 10000.0
+      - amount: 10000.0
         amount_type: fix
         category_id: hr_payroll.CA
         code: CA
@@ -64,8 +58,7 @@
         sequence: 10
         total: 0.0
         type: allowance
-      - account_id: account.a_pay
-        amount: 10000.0
+      - amount: 10000.0
         amount_type: fix
         category_id: hr_payroll.PT
         code: PT
@@ -74,8 +67,7 @@
         sequence: 15
         total: 0.0
         type: deduction
-      - account_id: account.a_pay
-        amount: 0.125
+      - amount: 0.125
         amount_type: per
         category_id: hr_payroll.PF
         code: PF
@@ -89,9 +81,8 @@
   I create a employee payslip record
 -
   !record {model: hr.payslip, id: hr_payslip_0}:
-    bank_journal_id: account.bank_journal
     employee_id: hr_payroll.hr_employee_richard0
-    journal_id: account.expenses_journal
+
 -
   I click on 'Compute Sheet' button
 -
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index 749bcd54fce..8e9b84563f3 100644
--- a/addons/hr_payroll_account/i18n/fr.po
+++ b/addons/hr_payroll_account/i18n/fr.po
@@ -7,76 +7,77 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-16 07:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 17:12+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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
 msgid "Accounting Lines"
-msgstr ""
+msgstr "Lignes comptables"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,bank_journal_id:0
 #: field:hr.payslip,bank_journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Journal de banque"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
 msgid "Contribution Register Line"
-msgstr ""
+msgstr "Ligne du registre de contribution"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
 msgid "Contribution Register"
-msgstr ""
+msgstr "Registre de contribution"
 
 #. module: hr_payroll_account
 #: help:hr.employee,analytic_account:0
 msgid "Analytic Account for Salary Analysis"
-msgstr ""
+msgstr "Compte analytique pour l'analyse du salaire"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Période"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Employé"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Autres informations"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,journal_id:0
 #: field:hr.payslip,journal_id:0
 msgid "Expanse Journal"
-msgstr ""
+msgstr "Journal des dépenses"
 
 #. module: hr_payroll_account
 #: field:hr.employee,salary_account:0
 msgid "Salary Account"
-msgstr ""
+msgstr "Compte du salaire"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
 msgid "Payroll Register"
-msgstr ""
+msgstr "Registre des feuilles de paye"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
 msgid "Account Move Link to Pay Slip"
-msgstr ""
+msgstr "Lien du mouvement comptable avec la fiche de paye"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -88,6 +89,8 @@ msgstr "Description"
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
+"Veuillez confirmer que toutes les factures de dépenses doivent apparaître "
+"pour remboursement"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -98,7 +101,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Informations"
-msgstr ""
+msgstr "Informations comptables"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -110,28 +113,29 @@ msgstr ""
 #: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
 msgid "Human Resource Payroll Accounting"
 msgstr ""
+"Module de comptabilité des feuilles de paye pour les ressources humaines"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 #: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Lignes de paiement"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please define fiscal year for perticular contract"
-msgstr ""
+msgstr "Veuillez définir l'exercice fiscale pour ce contrat particulier"
 
 #. module: hr_payroll_account
 #: help:hr.employee,property_bank_account:0
 msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
+msgstr "Sélectionnez le compte bancaire à partir duquel le salaire sera payé"
 
 #. module: hr_payroll_account
 #: help:hr.employee,salary_account:0
 msgid "Expanse account when Salary Expanse will be recorded"
-msgstr ""
+msgstr "Compte de frais à utiliser pour l'enregistrement du salaire"
 
 #. module: hr_payroll_account
 #: constraint:hr.employee:0
@@ -141,23 +145,23 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Account Lines"
-msgstr ""
+msgstr "Lignes de compte"
 
 #. module: hr_payroll_account
 #: field:hr.holidays.status,account_id:0
 #: field:hr.payroll.advice,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: hr_payroll_account
 #: field:hr.employee,property_bank_account:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Compte bancaire"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -168,16 +172,22 @@ msgid ""
 "    * Company Contribution Management\n"
 "    "
 msgstr ""
+"Système générique de gestion des feuilles de paye, intégré avec la "
+"comptabilité.\n"
+"    * Saisie des dépenses\n"
+"    * Saisies des paiements\n"
+"    * Gestion de la contribution de l'entreprise\n"
+"    "
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr ""
+msgstr "Ligne de feuille de paye"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Vouchers"
-msgstr ""
+msgstr "Pièces comptables"
 
 #. module: hr_payroll_account
 #: constraint:hr.employee:0
@@ -190,42 +200,44 @@ msgstr ""
 #: help:hr.payslip,period_id:0
 msgid "Keep empty to use the period of the validation(Payslip) date."
 msgstr ""
+"Laisser vide si vous voulez utiliser la période de la date de validation (de "
+"la feuille de paye)"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Avis bancaire"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,move_id:0
 msgid "Expense Entries"
-msgstr ""
+msgstr "Saisies de frais"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_ids:0
 msgid "Accounting vouchers"
-msgstr ""
+msgstr "Pièces comptables"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: hr_payroll_account
 #: field:hr.employee,employee_account:0
 msgid "Employee Account"
-msgstr ""
+msgstr "Compte de l'employé"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.line,account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Compte général"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total par employé"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,sequence:0
@@ -236,18 +248,18 @@ msgstr "Séquence"
 #: field:hr.payslip.account.move,slip_id:0
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip
 msgid "Pay Slip"
-msgstr ""
+msgstr "Feuille de paie"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,period_id:0
 #: field:hr.payslip,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forcer la période"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Type de congé"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -262,28 +274,28 @@ msgstr ""
 #: field:hr.payroll.structure,account_id:0
 #: field:hr.payslip.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte analytique"
 
 #. module: hr_payroll_account
 #: help:hr.employee,employee_account:0
 msgid "Employee Payable Account"
-msgstr ""
+msgstr "Compte créditeur de l'employé"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total par société"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
 msgid "Salary Structure"
-msgstr ""
+msgstr "Structure salariale"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
-msgstr ""
+msgstr "Veuillez configuer le compte à recevoir des partenaires !"
 
 #. module: hr_payroll_account
 #: view:hr.contibution.register:0
@@ -299,21 +311,21 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.employee:0
 msgid "Accounting"
-msgstr ""
+msgstr "Comptabilité"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Details"
-msgstr ""
+msgstr "Détails comptables"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
-msgstr ""
+msgstr "Veuillez configurer le compte à payer des partenaires !"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Integrity Error !"
-msgstr ""
+msgstr "Erreur d'intégrité !"
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index e8d5bd21523..6953f24bffa 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -105,6 +105,15 @@ msgstr ""
 msgid "Please defined bank account for %s !"
 msgstr ""
 
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid "Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
 #. module: hr_payroll_account
 #: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
 msgid "Human Resource Payroll Accounting"
@@ -143,6 +152,7 @@ msgid "Account Lines"
 msgstr ""
 
 #. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
 #: field:hr.holidays.status,account_id:0
 #: field:hr.payroll.advice,account_id:0
 msgid "Account"
@@ -158,15 +168,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: hr_payroll_account
-#: model:ir.module.module,description:hr_payroll_account.module_meta_information
-msgid "Generic Payroll system Integrated with Accountings\n"
-"    * Expense Encoding\n"
-"    * Payment Encoding\n"
-"    * Company Contribution Management\n"
-"    "
-msgstr ""
-
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
 msgid "Payslip Line"
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 40e821c94d9..2affa3c24a8 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-14 22:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-19 12:50+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -23,27 +23,28 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Si el campo activo es falso, le permitirá ocultar el caso sin eliminarlo."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: field:hr.recruitment.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Requerimientos"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Retraso promedio para abrir"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Nº de casos"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -52,12 +53,12 @@ msgstr ""
 #: field:hr.recruitment.report,department_id:0
 #: field:hr.recruitment.stage,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Fecha próxima acción"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -69,12 +70,12 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email de los observadores"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
@@ -84,12 +85,12 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Días para abrir"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Objetivos"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
@@ -101,7 +102,7 @@ msgstr ""
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Crear empresa"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -112,32 +113,32 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Datos del contrato"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Añadir nota interna"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Móvil"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: hr_recruitment
 #: field:hr.applicant,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next Actions"
-msgstr ""
+msgstr "Próximas acciones"
 
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job2
@@ -168,14 +169,14 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: hr_recruitment
 #: view:board.board:0
 #: view:hr.applicant:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
 msgid "Applicants Status"
-msgstr ""
+msgstr "Estatus del candidato"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -185,12 +186,12 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Próxima acción"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
 msgid "Recruitment"
-msgstr ""
+msgstr "Proceso de selección"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop:0
@@ -202,7 +203,7 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -213,7 +214,7 @@ msgstr ""
 #: view:hr.applicant:0
 #: field:hr.recruitment.report,available:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilidad"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -225,22 +226,22 @@ msgstr ""
 #: view:hr.applicant:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Llamada telefónica"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Convertir a empresa"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
 msgid "Recruitments Statistics"
-msgstr ""
+msgstr "Estadísticas del proceso de selección"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next"
-msgstr ""
+msgstr "Siguiente"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_job
@@ -250,7 +251,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Enviar nuevo email"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
@@ -264,53 +265,53 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: hr_recruitment
 #: field:hr.applicant,availability:0
 msgid "Availability (Days)"
-msgstr ""
+msgstr "Disponibilidad (días)"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
-msgstr ""
+msgstr "Disponible"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Good"
-msgstr ""
+msgstr "Bueno"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
 #: view:hr.recruitment.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,deadline:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Fecha prevista"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Apreciación"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -324,12 +325,12 @@ msgstr ""
 #: field:hr.recruitment.report,stage_id:0
 #: view:hr.recruitment.stage:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapa"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Segunda entrevista"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp:0
@@ -345,7 +346,7 @@ msgstr ""
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -357,7 +358,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applicants"
-msgstr ""
+msgstr "Candidatos"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -367,12 +368,12 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Dates"
-msgstr ""
+msgstr "Fechas"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -382,7 +383,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant
 msgid "Applicant"
-msgstr ""
+msgstr "Candidato"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
@@ -392,34 +393,34 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Qualification"
-msgstr ""
+msgstr "Calificación"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
 msgid "Stage of Recruitment"
-msgstr ""
+msgstr "Etapa de selección"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
 msgid "Stages"
-msgstr ""
+msgstr "Etapas"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "In progress"
-msgstr ""
+msgstr "En curso"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -429,17 +430,17 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Probabilidad"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_recruitment
 #: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
@@ -454,18 +455,18 @@ msgstr ""
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Primera entrevista"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Fecha de actualización"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed:0
 #: view:hr.recruitment.report:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Salario propuesto"
 
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job1
@@ -480,18 +481,18 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_name:0
 msgid "Applicant's Name"
-msgstr ""
+msgstr "Nombre del candidato"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Very Good"
-msgstr ""
+msgstr "Muy bueno"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -501,18 +502,18 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Abierto"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Group By ..."
-msgstr ""
+msgstr "Agrupar por ..."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -522,7 +523,7 @@ msgstr ""
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected:0
 msgid "Salary Expected by Applicant"
-msgstr ""
+msgstr "Salario esperado por el candidato"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_cc:0
@@ -531,22 +532,25 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_closed:0
 #: field:hr.recruitment.report,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Cerrado"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Definición de etapa"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Answer"
-msgstr ""
+msgstr "Respuesta"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
@@ -556,12 +560,12 @@ msgstr ""
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
 msgid "Salary Proposed by the Organisation"
-msgstr ""
+msgstr "Salario propuesto por la organización"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -569,17 +573,17 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -589,12 +593,12 @@ msgstr ""
 #: field:hr.recruitment.report,type_id:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
 msgid "Degree"
-msgstr ""
+msgstr "Título"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -604,7 +608,7 @@ msgstr ""
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
@@ -614,43 +618,43 @@ msgstr ""
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Rechazado por la compañía"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Días para cerrar"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Excellent"
-msgstr ""
+msgstr "Excelente"
 
 #. module: hr_recruitment
 #: field:hr.applicant,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_recruitment
 #: field:hr.applicant,response:0
 msgid "Response"
-msgstr ""
+msgstr "Respuesta"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
@@ -660,7 +664,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
 msgid "Avg Salary Proposed"
-msgstr ""
+msgstr "Salario promedio propuesto"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
@@ -672,12 +676,12 @@ msgstr ""
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Estas personas recibirán un email."
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -689,12 +693,12 @@ msgstr ""
 #: field:hr.applicant,date:0
 #: field:hr.recruitment.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Descripción de la llamada telefónica"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
@@ -709,7 +713,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Attachments"
-msgstr ""
+msgstr "Documentos adjuntos"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
@@ -722,23 +726,23 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.job2phonecall:0
 #: view:hr.recruitment.partner.create:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
 msgid "Applicant Categories"
-msgstr ""
+msgstr "Categorías de candidatos"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
@@ -756,14 +760,14 @@ msgstr ""
 #: field:hr.applicant,user_id:0
 #: view:hr.recruitment.report:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
 msgid "Recruitment Analysis"
-msgstr ""
+msgstr "Análisis del proceso de selección"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -773,17 +777,17 @@ msgstr ""
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Casos por etapa y estimaciones"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -793,41 +797,41 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Interview"
-msgstr ""
+msgstr "Entrevista"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_recruitment
 #: field:hr.applicant,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato firmado"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: selection:hr.applicant,state:0
 #: selection:hr.recruitment.report,state:0
 msgid "Refused"
-msgstr ""
+msgstr "Rechazado"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:0
 #, python-format
 msgid "Applicant '%s' is being hired."
-msgstr ""
+msgstr "Candidato '%s' en proceso de contratación"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -835,18 +839,18 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Hired"
-msgstr ""
+msgstr "Contratado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Rechazado por el empleado"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "On Average"
-msgstr ""
+msgstr "En promedio"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
@@ -856,19 +860,19 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_recruitment
 #: field:hr.applicant,name:0
 #: field:hr.recruitment.degree,name:0
 #: field:hr.recruitment.stage,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
@@ -878,23 +882,23 @@ msgstr ""
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_recruitment
 #: model:crm.case.section,name:hr_recruitment.section_hr_department
 msgid "HR Department"
-msgstr ""
+msgstr "Departamento de RRHH"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.degree,sequence:0
 #: field:hr.recruitment.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Asignar a"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/hr_recruitment.py:0
@@ -906,7 +910,7 @@ msgstr ""
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.report,delay_close:0
@@ -918,4 +922,4 @@ msgstr ""
 #: field:hr.applicant,survey:0
 #: field:hr.job,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "Encuesta"
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index a039ad7b0b8..a8bd80c01e0 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-20 03:19+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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -22,6 +23,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Si le champ actif est à \"Faux\", cela vous permettra de cacher le cas sans "
+"le supprimer."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
@@ -32,7 +35,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Délai moyen pour ouvrir"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
@@ -78,12 +81,12 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Fermer l'offre d'emploi"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Jours pour ouvrir"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,note:0
@@ -93,7 +96,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Nom du contact chez le partenaire"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -111,7 +114,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Données du contrat"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -136,7 +139,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next Actions"
-msgstr ""
+msgstr "Actions suivantes"
 
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job2
@@ -174,17 +177,17 @@ msgstr ""
 #: view:hr.applicant:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
 msgid "Applicants Status"
-msgstr ""
+msgstr "Statut de la candidature"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "My Recruitment"
-msgstr ""
+msgstr "Mes recrutements"
 
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Action suivante"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
@@ -194,7 +197,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop:0
 msgid "Salary Proposed"
-msgstr ""
+msgstr "Proposition salariale"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_id:0
@@ -206,7 +209,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Avg Proposed Salary"
-msgstr ""
+msgstr "Proposition salariale moyenne"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -229,12 +232,12 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Convertir en partenaire"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
 msgid "Recruitments Statistics"
-msgstr ""
+msgstr "Statistiques des recrutements"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -255,7 +258,7 @@ msgstr ""
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Un partenaire est déjà défini pour cette candidature"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -273,7 +276,7 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,availability:0
 msgid "Availability (Days)"
-msgstr ""
+msgstr "Disponibilité (en jours)"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -323,7 +326,7 @@ msgstr ""
 #: field:hr.recruitment.report,stage_id:0
 #: view:hr.recruitment.stage:0
 msgid "Stage"
-msgstr ""
+msgstr "Étape"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
@@ -333,13 +336,13 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp:0
 msgid "Salary Expected"
-msgstr ""
+msgstr "Attente salariale"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected:0
 #: view:hr.recruitment.report:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Salaire demandé"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -356,7 +359,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applicants"
-msgstr ""
+msgstr "Candidats"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index a153d4007a4..dbac449f470 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:27+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:27+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:15+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -594,6 +594,11 @@ msgstr ""
 msgid "Global CC"
 msgstr ""
 
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "June"
@@ -764,8 +769,15 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "October"
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid "\n"
+"Manages job positions and the recruitement process. It's integrated with the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document management\n"
+"system to store and search in your CV base.\n"
+"    "
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index f51baa13892..e75c386eb79 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:28+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:28+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:16+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -252,6 +252,21 @@ msgstr ""
 msgid "novembre"
 msgstr ""
 
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid "\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+"    "
+msgstr ""
+
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
 #: code:addons/hr_timesheet/report/users_timesheet.py:0
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 93d50595e18..676ca8280b6 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:16+0000\n"
+"PO-Revision-Date: 2010-12-20 01:09+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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -114,6 +114,10 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
+"Ажилтнууд хуваарилагдсан төсөл дээрээ зарцуулсан цагаа кодоор шифрлэх "
+"боломжтой. Төсөл нь шинжилгээний бүртгэл ба төсөл дээр зарцуулагдсан цаг нь "
+"үнийн гаргалгааг хийнэ. Энэ боломж нь оролцогч болон цаг бүртгэлийг нэг зэрэ "
+"бичих боломжийг олгоно."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -134,7 +138,7 @@ msgstr "Сүүлийн мөчлөгт ажил дууссан"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -419,7 +423,7 @@ msgstr "11 сар"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Алдаа! Ажилтны рекурс иерархийг үүсгэж болохгүй"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 64576cb68f0..d087915ae46 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-23 09:33+0000\n"
+"PO-Revision-Date: 2010-12-20 00:16+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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Underhåll på tidsrapporter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -42,7 +42,7 @@ msgstr "No employee defined for your user !"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -52,11 +52,14 @@ msgid ""
 "analytic account. This feature allows to record at the same time the "
 "attendance and the timesheet."
 msgstr ""
+"Anställda kan anteckna tidsåtgång i olika projekt. Ett projekt är ett "
+"analyserande konto som ger möjlighet att både registrera närvaro och "
+"tidsrapport samtitidigt."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr ""
+msgstr "Idag"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -111,6 +114,9 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
+"Anställda kan anteckna tidsåtgång i olika projekt. Ett projekt är ett "
+"analyserande konto som ger möjlighet att både registrera närvaro och "
+"tidsrapport samtitidigt."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -120,7 +126,7 @@ msgstr "Minimum Analytic Amount"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Månatlig tidsrapport"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -131,7 +137,7 @@ msgstr "Utfört arbete i senaste perioden"
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Fel ! Du kan inte välja en avdelning där den anställde är chef"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -143,18 +149,18 @@ msgstr "Aktuell status"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Namn på anställda"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr ""
+msgstr "Skriv ut tidrapport för anställda"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
@@ -184,7 +190,7 @@ msgstr "Objekt"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -195,7 +201,7 @@ msgstr "Human Resources (Timesheet encoding)"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Logga in eller ut projekt"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -216,6 +222,8 @@ msgstr "Sun"
 msgid ""
 "Working Hours allows you to log your working hours by project every day."
 msgstr ""
+"Arbetstider ger dig möjlighet att dagligen anteckna dina arbetstimmar i "
+"projekten."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -237,7 +245,7 @@ msgstr "juli"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Månatliga tidsrapporter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -255,7 +263,7 @@ msgstr "Startdatum"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -296,7 +304,7 @@ msgstr "Tidrapportrad"
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "anställda"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -365,13 +373,13 @@ msgstr "Tidrapporter"
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr ""
+msgstr "Anger den anställda som en produkt av typen 'tjänst'"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "août"
-msgstr ""
+msgstr "Augusti"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -401,7 +409,7 @@ msgstr "mars"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -413,7 +421,7 @@ msgstr "November"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Fel! Du kan inte skapa omvänd rangordning av anställda."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -454,13 +462,13 @@ msgstr "Analysis stats"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr ""
+msgstr "Skriv ut tidsrapport(er)"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "Anställningsnummer"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -470,7 +478,7 @@ msgstr "Allmän information"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Timesheet"
-msgstr ""
+msgstr "Min tidsrapport"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -509,13 +517,13 @@ msgstr "februari"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Anställd"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -537,7 +545,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr ""
+msgstr "Denna wizard skriver ut månatlig tidsrapport"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -548,7 +556,7 @@ msgstr "Produkt"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -583,7 +591,7 @@ msgstr "Arbetstimmar"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "Logga in per projekt"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -600,12 +608,12 @@ msgstr "Analytic line"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "Logga utper projekt"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "Anställda"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -656,7 +664,7 @@ msgstr "Status per anställd"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
 #, python-format
 msgid "No employee defined for this user"
-msgstr ""
+msgstr "Inga anställda definierade för användaren"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -667,12 +675,12 @@ msgstr "År"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Redovisning"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "Partner ID"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index b479ea56d95..7e5308d01d1 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 16:06+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 20:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 404876b029d..4d1d5f428cf 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -35,10 +35,10 @@ def lengthmonth(year, month):
 
 class report_custom(report_rml):
 
-    def get_month_name(self, cr, uid, month):
+    def get_month_name(self, cr, uid, month, context=None):
         _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
         return _months[month]
-    def get_weekday_name(self, cr, uid, weekday):
+    def get_weekday_name(self, cr, uid, weekday, context=None):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
@@ -54,8 +54,8 @@ class report_custom(report_rml):
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
 
-        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
-        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
+        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
 
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index f7f78d72fd7..e6b366d627a 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -68,11 +68,11 @@ def emp_create_xml(cr, id, som, eom, emp):
 
 class report_custom(report_rml):
 
-    def get_month_name(self, cr, uid, month):
+    def get_month_name(self, cr, uid, month, context=None):
         _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
         return _months[month]
 
-    def get_weekday_name(self, cr, uid, weekday):
+    def get_weekday_name(self, cr, uid, weekday, context=None):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
@@ -81,8 +81,8 @@ class report_custom(report_rml):
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
-        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
-        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
+        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 3d118622bd0..270a762ce42 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-24 09:27+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-19 10:01+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr "Timesheets par utilisateur"
+msgstr "Feuille de temps par utilisateur"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -42,7 +41,7 @@ msgstr "Compte analytique incomplet"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr ""
+msgstr "Créer facture depuis une feuille de temps terminée"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -55,11 +54,13 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+"Cette liste regroupe toutes les tâches que vous pouvez facturer au client. "
+"Sélectionnez les lignes dans l'ordre pour créer les factures automatiquement."
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 jours    "
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -69,7 +70,7 @@ msgstr "Revenus"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "À facturer"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 275892e5c38..0b69b771880 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:29+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:29+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:17+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -359,6 +359,14 @@ msgstr ""
 msgid "Gratis"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
+msgid "\n"
+"Module to generate invoices based on costs (human resources, expenses, ...).\n"
+"You can define price lists in analytic account, make some theoretical revenue\n"
+"reports, eso."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
 msgid "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."
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 80c58c86b73..4633cec454a 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-01 09:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 21:51+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: 2010-12-17 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -71,7 +72,7 @@ msgstr "Département"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Tâches de la feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -127,7 +128,7 @@ msgstr "Date de fin"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Basé sur la feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -171,6 +172,8 @@ msgstr "Refuser"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Vous ne pouvez pas saisir une date de présence hors de l'intervalle de date "
+"de la feuille de présence actuelle !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -182,6 +185,13 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"Ma Feuille de temps ouvre une feuille de temps de façon à vous permettre de "
+"saisir vos activités dans le système. Sur le même formulaire, vous pouvez "
+"enregistrer vos présences (entrées/sorties) et décrire les heures de travail "
+"effectuées sur les différents projets. A la fin de la période définie par la "
+"société, la feuille de temps est confirmée par l'utilisateur et peut être "
+"validée par son responsable. Si nécessaire, et comme défini pour chaque "
+"projet, vous pouvez générer les factures en fonction des feuilles de temps."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -209,7 +219,7 @@ msgstr "Avertissement !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Saisie de la feuille de temps de l'employé"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -228,7 +238,7 @@ msgstr "Feuille de présence par projet"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -282,7 +292,7 @@ msgstr "Lignes des feuilles de présence"
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -294,7 +304,7 @@ msgstr "État"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "L'état est à 'Confirmée'."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
@@ -338,12 +348,14 @@ msgstr "Heures"
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "Coût"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Erreur : un pointage en entrée (resp. en sortie) doit suivre un pointage en "
+"sortie (resp. en entrée)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -359,7 +371,7 @@ msgstr "Action invalide !"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Le chef de projet valide les feuilles de temps."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -379,11 +391,13 @@ msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
 msgstr ""
+"Vous ne pouvez pas créer de feuille de temps pour un employé qui n'est "
+"défini en tant qu'utilisateur !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Travaille sur une tâche"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -394,7 +408,7 @@ msgstr "Vue Journalière"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "Quantité"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -405,7 +419,7 @@ msgstr "Total des feuilles de présence"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Présence disponible"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -416,12 +430,12 @@ msgstr "Pointer l'entrée"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "Total des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -443,7 +457,7 @@ msgstr "Décembre"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Ceci ouvrira votre feuille de temps actuelle"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -458,22 +472,22 @@ msgstr "Mois"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "Différence totale"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "A l'état \"Brouillon\""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Pointer l'entrée / la sortie"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Facturation"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -481,11 +495,15 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"La ligne de feuille de temps représente le temps passé par l'employé sur un "
+"service effectué en particulier."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
+"Vous devez sélectionner une date actuelle qui est dans l'intervalle de dates "
+"de la feuille de temps !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -511,7 +529,7 @@ msgstr "Brouillon"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Différence autorisée (en heure) sur les feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -523,12 +541,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "La facture est créée selon la feuille de temps."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Feuille de temps à l'état \"Brouillon\""
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -556,7 +574,7 @@ msgstr "Juin"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr "État actuel"
+msgstr "Statut actuel"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -606,7 +624,7 @@ msgstr "Filtres étendus..."
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Plage de la feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -618,7 +636,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Ma présence totale par semaine"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -635,7 +653,7 @@ msgstr "Janvier"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "L'employé pointe l'entrée et la sortie."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -653,7 +671,7 @@ msgstr "Quantité"
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Compte général"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -661,6 +679,9 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
+"Différence autorisée entre les heures de pointage en entrée/sortie et le "
+"calcul de la feuille de temps pour une feuille. Mettez \"0\" si vous ne "
+"souhaitez aucun contrôle."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -672,7 +693,7 @@ msgstr "Période"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+msgstr "Vous ne pouvez pas dupliquer une feuille de temps !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -681,7 +702,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Ma feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -698,7 +719,7 @@ msgstr "L'état est 'Brouillon'"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -736,18 +757,24 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * L'état \"Brouillon\" est utilisé quand un utilisateur saisit une nouvelle "
+"feuille de temps non confirmée.\n"
+" * L'état \"Confirmé\" est utilisé pour confirmer la feuille de temps par "
+"utilisateur.\n"
+" * L'état \"Terminé\" est utilisé quand la feuille de temps de l'utilisateur "
+"est acceptée par sa/son responsable."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr ""
+msgstr "Analyse des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Rechercher dans les feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -756,6 +783,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain equal no. of sign "
 "ins and sign outs!"
 msgstr ""
+"La feuille de temps ne peut pas être validée car le nombre de pointages en "
+"entrée n'est pas égal à celui en sortie !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -768,7 +797,7 @@ msgstr "Ligne de feuille de temps"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -787,7 +816,7 @@ msgstr "Description"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "L'employé valide périodiquement sa propre feuille de temps."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -798,7 +827,7 @@ msgstr "Mai"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Définit le résumé du travail pour la tâche"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -809,7 +838,7 @@ msgstr "Pointer la sortie"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
-msgstr ""
+msgstr "Impossible de supprimer une feuille qui a des saisies de présence !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -825,7 +854,7 @@ msgstr "Par Jour"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
 msgid "Timesheet Sheet Analysis"
-msgstr ""
+msgstr "Analyse des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -853,7 +882,7 @@ msgstr "Employés"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Information sur le temps passé pour réaliser un service"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -896,7 +925,7 @@ msgstr "Type de facturation"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "Présence totale"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -905,6 +934,10 @@ msgid ""
 "You can also encode time spent on a project that is an analytic account and "
 "the time spent on a project generate costs on the analytic account."
 msgstr ""
+"Cette vue permet de vérifier le suivi des feuilles de temps sur une période "
+"donnée. Vous pouvez aussi saisir les temps passés sur un projet qui est lié "
+"à un compte analytique, et le temps passé sur un tel projet générera des "
+"coûts sur ce compte analytique."
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -920,7 +953,7 @@ msgstr "Date actuelle"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Feuille de temps RH"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -934,7 +967,7 @@ msgstr "Année"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "À approuver"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -944,7 +977,7 @@ msgstr "Total"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Mes feuilles de présence à confirmer"
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 12a9aff9faf..beab0a3d3da 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -260,8 +260,26 @@ msgid "Confirm"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
-msgid "Timesheet lines"
+#: model:ir.module.module,description:hr_timesheet_sheet.module_meta_information
+msgid "\n"
+"This module helps you to easily encode and validate timesheet and attendances\n"
+"within the same view. The upper part of the view is for attendances and\n"
+"track (sign in/sign out) events. The lower part is for timesheet.\n"
+"\n"
+"Other tabs contains statistics views to help you analyse your\n"
+"time or the time of your team:\n"
+"* Time spent by day (with attendances)\n"
+"* Time spent by project\n"
+"\n"
+"This module also implements a complete timesheet validation process:\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"* Period size (day, week, month, year)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -292,6 +310,12 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -579,9 +603,8 @@ msgid "Timesheet range"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#, python-format
-msgid "You can not modify an entry in a confirmed timesheet !"
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -638,7 +661,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
-msgid "You cannot duplicate a timesheet !"
+msgid "You can not modify an entry in a confirmed timesheet !"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -682,6 +705,12 @@ msgstr ""
 msgid "Timesheet by Accounts"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index f4c60dd846b..ee62c16fed0 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -21,13 +21,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-25 19:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 19:03+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -184,6 +184,8 @@ msgstr "Татгалзах"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Та оролцогчийн огноог одоогийн цаг бүртгэлийн огноогоос гадуур оруулж "
+"болохгүй."
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -301,7 +303,7 @@ msgstr "Цаг бүртгэлийн мөрүүд"
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -363,6 +365,8 @@ msgstr "#Үнэ"
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Алдаа: Нэвтэрсэн (эсвэл Гарсан) бүртгэлийн араас Гарсан (эсвэл Нэвтэрсэн) "
+"бүртгэл хийгдэх ёстой."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -463,7 +467,7 @@ msgstr "12 сар"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Таны одоогийн цаг бүртгэлийг нээнэ."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -507,7 +511,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
-msgstr ""
+msgstr "Та цаг бүртгэлийн огноонд байгаа Одоогийн огноог сонгох ёстой."
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -517,6 +521,10 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Энэ тайлан нь системдэх хүний нөөцийн үүсгэсэн цаг бүртгэл дээр шинжилгээ "
+"хийнэ. Энэ нь таны ажилтнуудын оруулсан өгөгдлүүдийг ерөнхий байдлаар харах "
+"боломж олгоно. Хайлтын хэрэгслийн тусламжтайгаар тэдгээрийг тодорхой "
+"хэмжүүрээр ангилж болно."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -925,6 +933,9 @@ msgid ""
 "You can also encode time spent on a project that is an analytic account and "
 "the time spent on a project generate costs on the analytic account."
 msgstr ""
+"Энэ харагдац нь цаг бүртгэлийг тодорхой үе шаттайгаар харуулна. Мөн төсөл "
+"дэх шинжилгээний бүртгэлд зарцуулагдсан цаг болон шинжилгээний бүртгэл дээрх "
+"үнийн гаргалгаанд зарцуулагдсан цагийг кодоор шифрлэх боломжтой."
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index e56b0dc010a..c7c2abe8946 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,6 +46,13 @@ msgstr ""
 msgid "Banks"
 msgstr ""
 
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid "\n"
+"    This is the test module which shows html tag supports in normal xml form view.\n"
+"    "
+msgstr ""
+
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
 msgid "html.view"
diff --git a/addons/html_view/i18n/mn.po b/addons/html_view/i18n/mn.po
index 7a4d87a95a6..8f0843d9b15 100644
--- a/addons/html_view/i18n/mn.po
+++ b/addons/html_view/i18n/mn.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13+0000\n"
+"PO-Revision-Date: 2010-12-17 19:07+0000\n"
 "Last-Translator: badralb <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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
 #: field:html.view,name:0
 msgid "Name"
-msgstr ""
+msgstr "Нэр"
 
 #. module: html_view
 #: field:html.view,comp_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: html_view
 #: model:ir.actions.act_window,name:html_view.action_html_view_form
@@ -46,7 +46,7 @@ msgstr "HTML Харагдац"
 #. module: html_view
 #: field:html.view,bank_ids:0
 msgid "Banks"
-msgstr ""
+msgstr "Банкууд"
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index 5cf9c329225..fe854bbe28c 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/i18n/es.po
@@ -7,25 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2009-11-17 06:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 13:00+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-12-17 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "Si es verdadero, el creador de la idea será visible para otros"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Seleccionar idea"
 
 #. module: idea
 #: view:idea.idea:0
@@ -43,13 +42,13 @@ msgstr "Comentarios"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Enviar voto"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "Análisis de ideas"
 
 #. module: idea
 #: view:idea.category:0
@@ -57,7 +56,7 @@ msgstr ""
 #: view:idea.vote:0
 #: view:report.vote:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
@@ -67,24 +66,24 @@ msgstr "Gestión de ideas"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
-msgstr ""
+msgstr "La idea debe estar en estado 'abierto' antes de votar por ella."
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "Rechazar"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
@@ -94,7 +93,7 @@ msgstr "Cómputo de votos"
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Estadística de votos de ideas"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -107,7 +106,7 @@ msgstr "Mala"
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: idea
 #: view:idea.category:0
@@ -119,7 +118,7 @@ msgstr "Categoría de ideas"
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: idea
 #: view:idea.idea:0
@@ -129,12 +128,12 @@ msgstr "Su comentario"
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Voto de idea"
 
 #. module: idea
 #: field:idea.category,parent_id:0
@@ -158,18 +157,18 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nº de líneas"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "No puede votar esta idea más de %s veces"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Categorías de ideas"
 
 #. module: idea
 #: help:idea.idea,description:0
@@ -179,7 +178,7 @@ msgstr "Contenido de la idea"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Categoría de idea"
 
 #. module: idea
 #: view:idea.idea:0
@@ -198,12 +197,12 @@ msgstr "No votada"
 #. module: idea
 #: sql_constraint:idea.category:0
 msgid "The name of the category must be unique"
-msgstr ""
+msgstr "El nombre de la categoría debe ser único"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "seleccionar idea"
 
 #. module: idea
 #: view:idea.stat:0
@@ -218,7 +217,7 @@ msgstr "Categorías hijas"
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Siguiente"
 
 #. module: idea
 #: view:idea.idea:0
@@ -226,7 +225,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -239,12 +238,12 @@ msgstr "Buena"
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Fecha de apertura de idea"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Detalle de idea"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -253,17 +252,20 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Cuando se crea la idea el estado es 'borrador'.\n"
+" Al abrirla el usuario, el estado es 'abierto'.            \n"
+"Si la idea es aceptada, el estado es 'aceptada'."
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "¿Idea abierta?"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: idea
 #: view:idea.idea:0
@@ -271,7 +273,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Aceptada"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -282,12 +284,12 @@ msgstr "Categorías"
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Fecha apertura"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -304,12 +306,12 @@ msgstr "Estadísticas de votos"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Votos máximos por usuario"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Categoría padre"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -323,18 +325,18 @@ msgstr "Comentario"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
@@ -363,7 +365,7 @@ msgstr "Muy buena"
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Año  "
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -374,7 +376,7 @@ msgstr "Abierta"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Votos de la idea"
 
 #. module: idea
 #: view:idea.idea:0
@@ -401,7 +403,7 @@ msgstr "Borrador"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -414,13 +416,13 @@ msgstr "Normal"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Nombre usuario"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
@@ -438,12 +440,12 @@ msgstr "Usuario"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Enviar"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -453,7 +455,7 @@ msgstr "Mi voto"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: idea
 #: field:idea.comment,create_date:0
@@ -464,7 +466,7 @@ msgstr "Fecha de creación"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
@@ -484,7 +486,7 @@ msgstr "Resumen de la idea"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: idea
 #: view:idea.idea:0
@@ -517,7 +519,7 @@ msgstr ""
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
-msgstr ""
+msgstr "Establecer a uno si sólo requiere un voto por usuario"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -538,7 +540,7 @@ msgstr "Abierta"
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Análisis de votos"
 
 #. module: idea
 #: view:idea.idea:0
@@ -552,7 +554,7 @@ msgstr "Ideas"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Enviar voto"
 
 #. module: idea
 #: view:idea.idea:0
@@ -568,7 +570,7 @@ msgstr "Puntuación"
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Comentarios:"
 
 #. module: idea
 #: view:idea.category:0
@@ -580,34 +582,34 @@ msgstr "Descripción"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Rechazada"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
-msgstr ""
+msgstr "No puede votar ideas borrador/aceptada/cancelada"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Fecha voto"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Hoy    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -617,7 +619,7 @@ msgstr "Número de votos"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
@@ -627,7 +629,7 @@ msgstr "Cómputo de comentarios"
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Estado voto"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -649,7 +651,7 @@ msgstr "Idea"
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index 41617e31783..1a2b05e139d 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-15 03:16+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-19 16:53+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: 2010-12-17 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -24,7 +25,7 @@ msgstr "Si Vrai, le créateur de l'idée sera visible pour les autres"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Sélectionner l'idée"
 
 #. module: idea
 #: view:idea.idea:0
@@ -89,12 +90,12 @@ msgstr "Refuser"
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Comptage des votes"
 
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Statistiques de vote de l'idée"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -107,7 +108,7 @@ msgstr "Mauvais"
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: idea
 #: view:idea.category:0
@@ -119,7 +120,7 @@ msgstr "Catégories d'Idée"
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: idea
 #: view:idea.idea:0
@@ -129,17 +130,17 @@ msgstr "Votre commentaire"
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mois   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Vote de l'idée"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr "Catégorie Parente"
+msgstr "Catégories parentes"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -152,7 +153,7 @@ msgstr "Très mauvais"
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Vote des idées"
 
 #. module: idea
 #: view:report.vote:0
@@ -164,12 +165,12 @@ msgstr "Nb. de lignes"
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "Vous ne pouvez pas voter pour cette idée plus de %s fois"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Catégories d'idées"
 
 #. module: idea
 #: help:idea.idea,description:0
@@ -179,7 +180,7 @@ msgstr "Contenu de l'Idée"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Catégorie de l'idée"
 
 #. module: idea
 #: view:idea.idea:0
@@ -198,17 +199,17 @@ msgstr "Pas de vote"
 #. module: idea
 #: sql_constraint:idea.category:0
 msgid "The name of the category must be unique"
-msgstr ""
+msgstr "Le nom de la catégorie doit être unique"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "Sélectionner l'idée"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "Stat"
 
 #. module: idea
 #: field:idea.category,child_ids:0
@@ -218,7 +219,7 @@ msgstr "Catégories filles"
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #. module: idea
 #: view:idea.idea:0
@@ -226,7 +227,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -239,12 +240,12 @@ msgstr "Bon"
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Date d'ouverture de l'idée"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Détail de l'idée"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -253,17 +254,20 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Quand l'idée est créée, le statut est \"Brouillon\"\n"
+" Quand l'idée est ouverte par l'utilisateur, le statut est \"Ouverte\"\n"
+"Si l'idée est acceptée, le statut est \"Acceptée\""
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Ouvrir l'idée ?"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: idea
 #: view:idea.idea:0
@@ -271,7 +275,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Acceptée"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -282,12 +286,12 @@ msgstr "Catégories"
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Date d'ouverture"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -304,12 +308,12 @@ msgstr "Statistiques des Votes"
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Nombre maximum de vote par utilisateur"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Catégorie parente"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -323,18 +327,18 @@ msgstr "Commentaire"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
@@ -363,7 +367,7 @@ msgstr "Très bien"
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Année  "
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -374,7 +378,7 @@ msgstr "Ouvert"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Votes de l'idée"
 
 #. module: idea
 #: view:idea.idea:0
@@ -384,7 +388,7 @@ msgstr "Nouvelle Idée"
 #. module: idea
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "Statistiques de vote des idées"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
@@ -401,7 +405,7 @@ msgstr "Brouillon"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -414,13 +418,13 @@ msgstr "Normal"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Nom de l'utilisateur"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
@@ -438,22 +442,22 @@ msgstr "Utilisateur"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Publier"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr "Mes Votes"
+msgstr "Mon vote"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: idea
 #: field:idea.comment,create_date:0
@@ -464,12 +468,12 @@ msgstr "Date de création"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -484,22 +488,22 @@ msgstr "Résumé de l'Idée"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Statistiques de vote"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Tri par date"
 
 #. module: idea
 #: view:idea.idea:0
@@ -512,12 +516,13 @@ msgstr "Créateur"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Donner le vote"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
 msgstr ""
+"Passer ce paramètre à 1 si vous ne voulez qu'un seul vote par utilisateur"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -533,12 +538,12 @@ msgstr "Fermer"
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr "Ouvert"
+msgstr "Ouvrir"
 
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Analyse des votes de l'idée"
 
 #. module: idea
 #: view:idea.idea:0
@@ -552,12 +557,12 @@ msgstr "Idées"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Publier le vote"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "Actuelle"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
@@ -568,7 +573,7 @@ msgstr "Score"
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Commentaires :"
 
 #. module: idea
 #: view:idea.category:0
@@ -580,34 +585,36 @@ msgstr "Description"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Refusée"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
 msgstr ""
+"Vous ne pouvez pas voter pour des idées au statut "
+"Brouillon/Acceptée/Annulée/Refusée"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Date du vote"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Aujourd'hui    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -617,17 +624,17 @@ msgstr "Nombre de Votes"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Comptage des commentaires"
 
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Statut du vote"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -649,23 +656,23 @@ msgstr "Idée"
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Publier le vote"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Sélectionner l'idée pour le vote"
 
 #~ msgid "My Ideas"
 #~ msgstr "Mes Idées"
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index a4bfb6c0f63..329f879048a 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -57,6 +57,17 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
+#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid "\n"
+"    This module allows your user to easily and efficiently participate in the innovation of the enterprise.\n"
+"    It allows everybody to express ideas about different subjects.\n"
+"    Then, other users can comment on these ideas and vote for particular ideas.\n"
+"    Each idea has a score based on the different votes.\n"
+"    The managers can obtain an easy view on best ideas from all the users.\n"
+"    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
diff --git a/addons/idea/i18n/ru.po b/addons/idea/i18n/ru.po
index c84ec705fac..7326b3ac780 100644
--- a/addons/idea/i18n/ru.po
+++ b/addons/idea/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-29 07:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 07:45+0000\n"
+"Last-Translator: Andrey Olykainen <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: 2010-12-17 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "Если отмечено создатель идеи будит виден остальным"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Выбор идеи"
 
 #. module: idea
 #: view:idea.idea:0
@@ -42,13 +42,13 @@ msgstr "Комментарии"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Голосовать"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "Анализ идей"
 
 #. module: idea
 #: view:idea.category:0
@@ -72,7 +72,7 @@ msgstr "Март"
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
-msgstr ""
+msgstr "Идея должна быть \"Открыта\" перед голосованием за идею."
 
 #. module: idea
 #: view:report.vote:0
@@ -93,7 +93,7 @@ msgstr "Подсчет голосов"
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Статистика голосованя идеи"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -133,7 +133,7 @@ msgstr "   Месяц   "
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Голосование идеи"
 
 #. module: idea
 #: field:idea.category,parent_id:0
@@ -151,24 +151,24 @@ msgstr "Очень плохо"
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Голосование идей"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# линий"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "Вы не можете голосовать за идею больше %s раз"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Категории идей"
 
 #. module: idea
 #: help:idea.idea,description:0
@@ -178,7 +178,7 @@ msgstr "Содержимое идеи"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Категория идеи"
 
 #. module: idea
 #: view:idea.idea:0
@@ -197,12 +197,12 @@ msgstr "Не голосовали"
 #. module: idea
 #: sql_constraint:idea.category:0
 msgid "The name of the category must be unique"
-msgstr ""
+msgstr "Название категории должно быть уникальным"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "выбор идеи"
 
 #. module: idea
 #: view:idea.stat:0
@@ -238,12 +238,12 @@ msgstr "Хорошо"
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Дата открытия идеи"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Детали идеи"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -257,7 +257,7 @@ msgstr ""
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Открыть идею?"
 
 #. module: idea
 #: selection:report.vote,month:0
@@ -286,7 +286,7 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Дата открытия"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -493,7 +493,7 @@ msgstr "Журнал"
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Статистика голосования"
 
 #. module: idea
 #: field:report.vote,date:0
@@ -511,7 +511,7 @@ msgstr "Автор"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Проголосовать"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
@@ -537,7 +537,7 @@ msgstr "Открыть"
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Анализ голосования идеи"
 
 #. module: idea
 #: view:idea.idea:0
@@ -596,7 +596,7 @@ msgstr ""
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Дата голосования"
 
 #. module: idea
 #: selection:report.vote,month:0
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index 60ebb5b95f3..3fbf36f429b 100644
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-24 09:42+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-19 09:51+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -30,7 +29,7 @@ msgstr "Créer un exemple de structure pour un manuel qualité standard"
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Share information within the company with these specific Addons."
-msgstr ""
+msgstr "Partager les informations au sein de la société avec ces modules."
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
@@ -71,7 +70,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: knowledge
 #: view:knowledge.installer:0
@@ -140,7 +139,7 @@ msgstr "knowledge.installer"
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure Your Knowledge Application"
-msgstr ""
+msgstr "Configurer vos applications de gestion des connaissances"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index f7cc7167570..e934613de1a 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -76,6 +76,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr ""
+
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
@@ -101,13 +106,17 @@ msgstr ""
 msgid "Internal FAQ"
 msgstr ""
 
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
 msgstr ""
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index f607efc0783..2d85d63a6ed 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-01 09:44+0000\n"
+"PO-Revision-Date: 2010-12-19 23:48+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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -25,17 +25,17 @@ msgstr "Баримт"
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
 msgid "Creates an example skeleton for a standard quality manual."
-msgstr ""
+msgstr "Стандарт чанарын зааварчилгаа бүхий  загвар жишээ үүсгэнэ."
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Share information within the company with these specific Addons."
-msgstr ""
+msgstr "Энэхүү тодорхой Addons ээр компани дотроо мэдээллийг хуваалцах"
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
 msgid "Shared Repositories (FTP)"
-msgstr "Дундын хадгалах газар (FTP)"
+msgstr "Дундын агуулах  (FTP)"
 
 #. module: knowledge
 #: model:ir.module.module,shortdesc:knowledge.module_meta_information
@@ -53,6 +53,8 @@ msgid ""
 "Provides an FTP access to your OpenERP's Document Management System. It lets "
 "you access attachments and virtual documents through a standard FTP client."
 msgstr ""
+"OpenERP-н Баримтын удирдлагын систем рүү FTP хандалт гаргана. Стандарт файл "
+"браузер ашиглан хавсралт, FTP клиентрүү хандах боломжтой. болно."
 
 #. module: knowledge
 #: help:knowledge.installer,document_webdav:0
@@ -61,11 +63,13 @@ msgid ""
 "you access attachments and virtual documents through your standard file "
 "browser."
 msgstr ""
+"OpenERP-н Баримтын удирдлагын систем рүү WebDAV хандалт гаргана. Стандарт "
+"файл браузер ашиглан хавсралт, баримтууд руу хандах боломжтой болно."
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Тохируулах"
 
 #. module: knowledge
 #: view:knowledge.installer:0
@@ -78,7 +82,7 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
-"Мэдлэг-суурьтай багажуудын суулгагч\n"
+"Мэдлэгийн багажуудад зориулсан суулгагч\n"
 "    "
 
 #. module: knowledge
@@ -89,12 +93,12 @@ msgstr "Тохиргоо"
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
-msgstr "Чанартай удирдлага"
+msgstr "Чанарын зааварчилгаа"
 
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
 msgid "Shared Repositories (WebDAV)"
-msgstr "Дундын хадгалах газар (WebDAV)"
+msgstr "Дундын агуулах (WebDAV)"
 
 #. module: knowledge
 #: field:knowledge.installer,progress:0
@@ -107,6 +111,8 @@ msgid ""
 "Creates a skeleton internal FAQ pre-filled with documentation about "
 "OpenERP's Document Management System."
 msgstr ""
+"OpenERP-н Баримтын удирдлагын системийн тухай мэдээлэл бүхий дотоод ТТА "
+"хуудас үүсгэнэ."
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
@@ -122,17 +128,17 @@ msgstr "Зураг"
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 #: view:knowledge.installer:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Баримтын програмын тохиргоо"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
 msgid "knowledge.installer"
-msgstr "Баримт суулгагч"
+msgstr "knowledge.installer"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure Your Knowledge Application"
-msgstr ""
+msgstr "Мэдлэгийн Аппликэшнийг Тохируулах"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
@@ -157,17 +163,5 @@ msgstr "Агуулгын загвар"
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдэлийн тодорхойлолтод буруу моделийн нэр заасан байна."
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 18b974632d4..57c45a0cf93 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -11,7 +11,7 @@
         <record id="user_type_capitaux" model="account.account.type">
             <field name="name">Capital</field>
             <field name="code">capital</field>
-            <field name="report_type">asset</field>
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="user_type_immo" model="account.account.type">
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index 14c131362fa..071d8436301 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:32+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:32+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -500,6 +500,28 @@ msgstr ""
 msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
 msgstr ""
 
+#. module: l10n_be
+#: model:ir.module.module,description:l10n_be.module_meta_information
+msgid "\n"
+"    This is the base module to manage the accounting chart for Belgium in OpenERP.\n"
+"\n"
+"    After Installing this module,The Configuration wizard for accounting is launched.\n"
+"    * We have the account templates which can be helpful to generate Charts of Accounts.\n"
+"    * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.\n"
+"        Thus,the pure copy of Chart Template is generated.\n"
+"    * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"\n"
+"    Wizards provided by this module:\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format.\n"
+"                           Path to access : Financial Management/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.\n"
+"                           Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration\n"
+"    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year\n"
+"                           Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_payment:0
 msgid "It indicates whether a payment is to made or not?"
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index 8c9b4014c1a..285539b0cc7 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:15+0000\n"
-"PO-Revision-Date: 2010-12-04 08:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 17:06+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: 2010-12-15 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
@@ -60,13 +61,13 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "No bank account for the company."
-msgstr ""
+msgstr "N ° de compte bancaire pour la société"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Record found after total record!"
-msgstr ""
+msgstr "Enregistrement trouvé après total enregistrement !"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvrpost
@@ -82,7 +83,7 @@ msgstr ""
 #: view:bvr.import.wizard:0
 #: model:ir.actions.act_window,name:l10n_ch.wizard_bvr_import
 msgid "BVR Import"
-msgstr ""
+msgstr "Importation BVR"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_equity
@@ -183,7 +184,7 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Total record different from the computed!"
-msgstr ""
+msgstr "Total enregistré différent de celui calculé !"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_partner
@@ -197,22 +198,24 @@ msgid ""
 "No bank specified on invoice:\n"
 "%s"
 msgstr ""
+"Aucune banque indiquée sur la facture :\n"
+"%s"
 
 #. module: l10n_ch
 #: field:res.partner.bank,bvr_number:0
 msgid "BVR account number"
-msgstr ""
+msgstr "Numéro de compte BVR"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Number record different from the computed!"
-msgstr ""
+msgstr "Numéro de dossier différent de celui calculé !"
 
 #. module: l10n_ch
 #: field:res.bank,clearing:0
 msgid "Clearing number"
-msgstr ""
+msgstr "Numéro clearing"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvbank
@@ -233,7 +236,7 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "No IBAN for the company bank account."
-msgstr ""
+msgstr "N ° IBAN pour le compte bancaire de la société"
 
 #. module: l10n_ch
 #: view:bvr.invoices.report:0
@@ -245,7 +248,7 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/create_dta.py:0
 #, python-format
 msgid "You must provide a Clearing Number for your bank account."
-msgstr ""
+msgstr "Vous devez fournir un numéro de clearing pour votre compte bancaire"
 
 #. module: l10n_ch
 #: view:create.dta.wizard:0
@@ -255,7 +258,7 @@ msgstr ""
 #. module: l10n_ch
 #: view:create.dta.wizard:0
 msgid "DTA file creation - Results"
-msgstr ""
+msgstr "Création de fichier DTA : résultats"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_sir
@@ -286,7 +289,7 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "The properties account payable account receivable"
-msgstr ""
+msgstr "Les propriétés du compte débit  ou crédit"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_mme_m
@@ -371,7 +374,7 @@ msgstr ""
 #. module: l10n_ch
 #: model:ir.actions.act_window,name:l10n_ch.action_account_bvr_invoices_report
 msgid "Invoices BVR"
-msgstr ""
+msgstr "BVR des factures"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -386,12 +389,12 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Recursive mod10 is invalid for reference: %s"
-msgstr ""
+msgstr "Récursif mod10 est incorrect pour la référence : %s"
 
 #. module: l10n_ch
 #: view:account.bank.statement:0
 msgid "Import BVR"
-msgstr ""
+msgstr "Importer un BVR"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_adj_liability
@@ -443,7 +446,7 @@ msgstr ""
 #. module: l10n_ch
 #: field:res.partner.bank,bvr_adherent_num:0
 msgid "BVR adherent number"
-msgstr ""
+msgstr "Numéro d'adhérent BVR"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -462,7 +465,7 @@ msgstr ""
 #. module: l10n_ch
 #: field:res.company,bvr_delta_horz:0
 msgid "BVR Horz. Delta (mm)"
-msgstr ""
+msgstr "BVR Horz. Delta (mm)"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_receivable
@@ -545,7 +548,7 @@ msgstr ""
 #. module: l10n_ch
 #: field:res.partner.bank,dta_code:0
 msgid "DTA code"
-msgstr ""
+msgstr "Code DTA"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle
@@ -631,7 +634,7 @@ msgstr ""
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Too much total record found!"
-msgstr ""
+msgstr "Trop d'enregistrement total trouvé!"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_create_dta_wizard
@@ -666,7 +669,7 @@ msgstr ""
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvrbank
 msgid "DTA-BVRBANK"
-msgstr ""
+msgstr "DTA-BVRBANK"
 
 #. module: l10n_ch
 #: field:bvr.invoices.report,name:0
@@ -706,7 +709,7 @@ msgstr ""
 #. module: l10n_ch
 #: help:res.company,bvr_delta_vert:0
 msgid "vert. delta in mm 1.2 will print the bvz 1.2mm lefter"
-msgstr ""
+msgstr "vert. delta de 1,2 mm imprime le bvz 1.2mm sur la gauche"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_non_ope_result
@@ -716,7 +719,7 @@ msgstr ""
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.dta_iban
 msgid "DTA-IBAN"
-msgstr ""
+msgstr "DTA-IBAN"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type.field,name:l10n_ch.acc_num_field_bvbank
@@ -726,7 +729,7 @@ msgstr "acc_number"
 #. module: l10n_ch
 #: field:res.company,bvr_delta_vert:0
 msgid "BVR Vert. Delta (mm)"
-msgstr ""
+msgstr "BVR Vert. Delta (mm)"
 
 #. module: l10n_ch
 #: model:ir.actions.todo,note:l10n_ch.config_call_account_template_l10n_ch
@@ -746,7 +749,7 @@ msgstr ""
 #. module: l10n_ch
 #: help:res.company,bvr_delta_horz:0
 msgid "horiz. delta in mm 1.2 will print the bvz 1.2mm lefter"
-msgstr ""
+msgstr "horiz. delta de 1,2 mm imprime le bvz 1.2mm sur la gauche"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_building_asset
@@ -762,7 +765,7 @@ msgstr ""
 #: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrbank
 #: model:res.partner.bank.type.field,name:l10n_ch.bvr_num_field_bvrpost
 msgid "bvr_number"
-msgstr ""
+msgstr "bvr_number"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_sir
diff --git a/addons/l10n_chart_uk_minimal/i18n/fr.po b/addons/l10n_chart_uk_minimal/i18n/fr.po
index 0b0c77735ea..f7ea1976cc2 100644
--- a/addons/l10n_chart_uk_minimal/i18n/fr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-12-04 08:39+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-19 09:47+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -25,12 +24,12 @@ msgstr "Recevable"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_asset_view
 msgid "Asset View"
-msgstr ""
+msgstr "Vue actif"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_expense_view
 msgid "Expense View"
-msgstr ""
+msgstr "Vue dépense"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
@@ -43,6 +42,13 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+"Génère le plan comptable à partir d'un modèle. On vous demandera de donner "
+"le nom de la société, le plan comptable à suivre, le nombre de chiffres pour "
+"générer le code des comptes et le compte bancaire, la devise pour créer les "
+"journaux. Ainsi, une copie complète du modèle de plan est générée.\n"
+"    C'est le même assistant que celui disponible dans Gestion financière / "
+"Configuration / Comptabilité financière / Comptes financiers / Générer le "
+"plan comptable depuis un modèle de plan."
 
 #. module: l10n_chart_uk_minimal
 #: constraint:account.account.template:0
@@ -52,7 +58,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de modèle de compte récursif."
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_income_view
 msgid "Income View"
-msgstr ""
+msgstr "Vue revenus"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
@@ -72,7 +78,7 @@ msgstr "Liquidités"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Passif"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
@@ -82,7 +88,7 @@ msgstr "À payer"
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr ""
+msgstr "Royaume-Uni - minimal"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
@@ -90,6 +96,8 @@ msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "OpenERP."
 msgstr ""
+"C'est le module de base pour gérer le plan comptable du Royaume-Uni dans "
+"OpenERP."
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
@@ -104,7 +112,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de codes de taxe récursifs"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_liability_view
 msgid "Liability View"
-msgstr ""
+msgstr "Vue passif"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index aa5087b216d..3e5e90d0007 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -43,6 +43,11 @@ msgstr ""
 msgid "Terceros - A Cobrar"
 msgstr ""
 
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.capital
+msgid "Capital"
+msgstr ""
+
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.terceros
 msgid "Terceros"
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index d0b74bb0246..eae28ab62dd 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-16 21:54+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-20 01:16+0000\n"
+"Last-Translator: Carlos-smile <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: 2010-12-17 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index 5abf5d0bda2..a9665579cc6 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:28+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,11 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_bilan_report
+msgid "Account Bilan Report"
+msgstr ""
+
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_report
 msgid "Report for l10n_fr"
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index cd8d8d5fb1c..5564bce48de 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:29+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "This is the base module to manage the accounting chart for Greece."
 msgstr ""
 
 #. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_equity
-msgid "Equity"
+#: model:account.account.type,name:l10n_gr.account_type_income
+msgid "Income"
 msgstr ""
 
 #. module: l10n_gr
@@ -62,8 +62,13 @@ msgid "Other"
 msgstr ""
 
 #. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
+#: model:account.account.type,name:l10n_gr.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_equity
+msgid "Equity"
 msgstr ""
 
 #. module: l10n_gr
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index 0c5fe5f24e5..da81c7b11e4 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -50,6 +50,11 @@ msgstr ""
 msgid "Ingresos"
 msgstr ""
 
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_activo
+msgid "Activo"
+msgstr ""
+
 #. module: l10n_gt
 #: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
 msgid "Generar la nomenclatura contable a partir de un modelo.  Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios."
diff --git a/addons/l10n_in/i18n/fr.po b/addons/l10n_in/i18n/fr.po
new file mode 100644
index 00000000000..cde0f82954c
--- /dev/null
+++ b/addons/l10n_in/i18n/fr.po
@@ -0,0 +1,98 @@
+# French 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: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2010-12-19 09:47+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Language-Team: French <fr@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: 2010-12-20 04:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Comptabilité indienne : plan de comptes\n"
+"    "
+
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Erreur ! Vous ne pouvez pas créer de modèle de compte récursif."
+
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Générer un plan comptable à partir d'un modèle. Vous devrez fournir le nom "
+"de l'entreprise, le modèle de plan comptable utilisé, le nombre de chiffres "
+"des numéros de compte, ainsi que les coordonnées bancaires et la monnaie de "
+"tenue de chaque journal. Ainsi une copie du plan comptable sera générée.\n"
+"\t Cet assistant peut être lancé depuis Finance & "
+"Comptabilité/Configuration/Comptabilité financière/Modèles/Générer le plan "
+"de comptes à partir d'un modèle."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Passif"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Actifs"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Fermé"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Revenus"
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Erreur ! Vous ne pouvez pas créer de code de taxe récursif."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Dépense"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr "Plan comptable indien"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Vue"
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index b061dd58922..7ba3b01b31c 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,15 @@ msgid "Asset View"
 msgstr ""
 
 #. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
+#: model:ir.module.module,description:l10n_in.module_meta_information
+msgid "\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense_view
+msgid "Expense View"
 msgstr ""
 
 #. module: l10n_in
@@ -62,8 +69,8 @@ msgid "Liability View"
 msgstr ""
 
 #. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense_view
-msgid "Expense View"
+#: model:account.account.type,name:l10n_in.account_type_expense1
+msgid "Expense"
 msgstr ""
 
 #. module: l10n_in
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index 45a35294044..c1d6d6de6fd 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:32+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,8 +47,13 @@ msgid "Luxembourg"
 msgstr ""
 
 #. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
+#: model:ir.module.module,description:l10n_lu.module_meta_information
+msgid "\n"
+"This module installs:\n"
+"\n"
+"    *the KLUWER Chart of Accounts,\n"
+"    *the Tax Code Chart for Luxembourg\n"
+"    *the main taxes used in Luxembourg"
 msgstr ""
 
 #. module: l10n_lu
@@ -67,6 +72,11 @@ msgstr ""
 msgid "VAT Declaration"
 msgstr ""
 
+#. module: l10n_lu
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
+msgstr ""
+
 #. module: l10n_lu
 #: model:account.account.type,name:l10n_lu.account_type_asset
 msgid "Asset"
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
index 9c1bf71c02c..55df22a3175 100644
--- a/addons/l10n_ma/i18n/fr.po
+++ b/addons/l10n_ma/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-08 09:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-18 15:30+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ma
@@ -26,129 +27,134 @@ msgid ""
 "cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
 "d'expertise comptable Seddik au cours du troisième trimestre 2010"
 msgstr ""
+"Ce module charge le modèle du plan de comptes standard marocain et permet de "
+"générer les états comptables aux normes marocaines (bilan, CPC (comptes de "
+"produits et charges), balance générale à 6 colonnes, grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
 msgid "Immobilisations"
-msgstr ""
+msgstr "Immobilisations"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_ach
 msgid "Charges Achats"
-msgstr ""
+msgstr "Charges d'achats"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_tpl
 msgid "Titres de placement"
-msgstr ""
+msgstr "Titres de placement"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_vue
 msgid "Vue"
-msgstr ""
+msgstr "Vue"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_dct
 msgid "Dettes à court terme"
-msgstr ""
+msgstr "Dettes à court terme"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.report:0
 msgid "The code report must be unique !"
-msgstr ""
+msgstr "Le code de rapport doit être unique !"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_stk
 msgid "Stocks"
-msgstr ""
+msgstr "Stocks"
 
 #. module: l10n_ma
 #: field:l10n.ma.line,code:0
 msgid "Variable Name"
-msgstr ""
+msgstr "Nom de variable"
 
 #. module: l10n_ma
 #: field:l10n.ma.line,definition:0
 msgid "Definition"
-msgstr ""
+msgstr "Définition"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_dlt
 msgid "Dettes à long terme"
-msgstr ""
+msgstr "Dettes à long terme"
 
 #. module: l10n_ma
 #: field:l10n.ma.line,name:0
 #: field:l10n.ma.report,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: l10n_ma
 #: field:l10n.ma.report,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Lignes"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_tax
 msgid "Taxes"
-msgstr ""
+msgstr "Taxes"
 
 #. module: l10n_ma
 #: field:l10n.ma.line,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: l10n_ma
 #: model:ir.model,name:l10n_ma.model_l10n_ma_line
 msgid "Report Lines for l10n_ma"
-msgstr ""
+msgstr "Lignes de rapport pour l10n_ma"
 
 #. module: l10n_ma
 #: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
 msgid "Maroc - Plan Comptable Général"
-msgstr ""
+msgstr "Maroc - Plan comptable général"
 
 #. module: l10n_ma
 #: sql_constraint:l10n.ma.line:0
 msgid "The variable name must be unique !"
-msgstr ""
+msgstr "Le nom de variable doit être unique !"
 
 #. module: l10n_ma
 #: model:ir.model,name:l10n_ma.model_l10n_ma_report
 msgid "Report for l10n_ma_kzc"
-msgstr ""
+msgstr "Rapport pour l10n_ma_kzc"
 
 #. module: l10n_ma
 #: field:l10n.ma.report,code:0
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_per
 msgid "Charges Personnel"
-msgstr ""
+msgstr "Charges personnel"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_liq
 msgid "Liquidité"
-msgstr ""
+msgstr "Liquidité"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_pdt
 msgid "Produits"
-msgstr ""
+msgstr "Produits"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_reg
 msgid "Régularisation"
-msgstr ""
+msgstr "Régularisation"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_cre
 msgid "Créances"
-msgstr ""
+msgstr "Créances"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_aut
 msgid "Charges Autres"
-msgstr ""
+msgstr "Autres charges"
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index f1ee14babd2..7913362a486 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:33+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,8 +46,8 @@ msgid "Dettes à court terme"
 msgstr ""
 
 #. module: l10n_ma
-#: sql_constraint:l10n.ma.report:0
-msgid "The code report must be unique !"
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
 msgstr ""
 
 #. module: l10n_ma
@@ -87,8 +87,8 @@ msgid "Taxes"
 msgstr ""
 
 #. module: l10n_ma
-#: field:l10n.ma.line,report_id:0
-msgid "Report"
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
 msgstr ""
 
 #. module: l10n_ma
@@ -136,6 +136,11 @@ msgstr ""
 msgid "Régularisation"
 msgstr ""
 
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cp
+msgid "Capitaux Propres"
+msgstr ""
+
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_cre
 msgid "Créances"
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 85b09c8dd4f..1c3372445c6 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:49+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:49+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:36+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -76,6 +76,11 @@ msgstr ""
 msgid "This is the base module to manage the accounting chart for United Kingdom in OpenERP."
 msgstr ""
 
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_asset
+msgid "Asset"
+msgstr ""
+
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_equity
 msgid "Equity"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index a209e91427c..f262558ff6b 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:50+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:50+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,6 +56,16 @@ msgstr ""
 msgid "    7 Days    "
 msgstr ""
 
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid "\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
 #. module: lunch
 #: view:lunch.cashmove:0
 #: view:lunch.order:0
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index 93d18880196..06ca7604705 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -123,6 +123,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
 #. module: mail_gateway
 #: help:mailgate.message,references:0
 msgid "References emails."
@@ -179,8 +184,9 @@ msgid "Stage"
 msgstr ""
 
 #. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " added note on "
 msgstr ""
 
 #. module: mail_gateway
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index f98ba17ad35..48b2e7a3d7f 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-20 04:47+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
-msgstr "Menú para marketing"
+msgstr "Menú para marqueting"
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign:0
@@ -55,7 +54,7 @@ msgstr "Imagen"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Configure su marqueting"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -87,11 +86,13 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP permite extensiones para manejar sus ventas y procesos de "
+"marqueting. Seleccione el que usted le interese."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Configuración de marqueting"
 
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
@@ -110,7 +111,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configure"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index 9cc91488748..92e026d1f1d 100644
--- a/addons/marketing/i18n/fr.po
+++ b/addons/marketing/i18n/fr.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: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 09:32+0000\n"
+"PO-Revision-Date: 2010-12-18 15:31+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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -54,7 +54,7 @@ msgstr "Image"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Configurer votre application marketing"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -86,11 +86,13 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP fournit des modules pour mieux gérer vos ventes et vos processus "
+"marketing. Sélectionnez ceux qui vous intéressent."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Configuration de l'application marketing"
 
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
@@ -109,7 +111,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index b865ae5beb8..e54e8b7142d 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "title"
 msgstr ""
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
-msgid "Marketing"
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
 msgstr ""
 
 #. module: marketing
@@ -61,8 +61,8 @@ msgid "marketing.installer"
 msgstr ""
 
 #. module: marketing
-#: model:ir.actions.act_window,name:marketing.action_marketing_installer
-msgid "Marketing Applications Configuration"
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
 msgstr ""
 
 #. module: marketing
@@ -80,6 +80,11 @@ msgstr ""
 msgid "Marketing Application Configuration"
 msgstr ""
 
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr ""
+
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 69cb0d50f0f..4b2660acd36 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-10-22 10:44+0000\n"
+"PO-Revision-Date: 2010-12-17 11:23+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -72,7 +72,7 @@ msgstr "marketing.installer"
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
 msgid "Marketing Applications Configuration"
-msgstr "Маркетингийн тохируулга"
+msgstr "Marketing Applications Configuration"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
@@ -101,17 +101,13 @@ msgstr "Маркетингийн компанит ажил"
 msgid ""
 "Helps you to perform segmentation of partners and design segmentation "
 "questionnaires"
-msgstr ""
-"Харилцагчдыг хуваах, дараа нь хуваалтаар асуулга зохиомжлоход туслана"
+msgstr "Харилцагчдыг хувааж асуулга зохион байгуулахад туслана."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
 msgstr ""
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -120,23 +116,3 @@ msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Marketing Modules Installation"
-#~ msgstr "Маркетинг модулиудын суулгац"
-
-#~ msgid "Automated E-Mails"
-#~ msgstr "Автомат и-мэйлүүд"
-
-#~ msgid ""
-#~ "Helps you to perform segmentation within partners and design questionaires."
-#~ msgstr "Харилцагчдыг хувааж асуулга зохион байгуулахад туслана."
-
-#~ msgid ""
-#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
-#~ "mailings."
-#~ msgstr ""
-#~ "Энэ модуль нь бөөн имэйл илгээх ажлыг автоматжуулах mailchimp.com үйлчилгээг "
-#~ "OpenERP-тай нэгтгэнэ."
-
-#~ msgid "Mailchimp Integration"
-#~ msgstr "Mailchimp нэгтгэл"
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index d9dda01d3b5..4ca3ec382c4 100644
--- a/addons/marketing/i18n/sk.po
+++ b/addons/marketing/i18n/sk.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-03 07:46+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"PO-Revision-Date: 2010-12-19 14:16+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
-msgstr "Ponuka pre Marketing"
+msgstr "Menu pre reklamu"
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign:0
@@ -28,23 +28,23 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
-"Pomáha pri riadení marketingových kampaní a automatizáciu udalostí a krokov "
+"Pomáha pri správe reklamných kampaní a automatizáciu udalostí a krokov "
 "komunikácie."
 
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
-msgstr "Stav konfigurácie"
+msgstr "Priebeh nastavenia"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr "názov"
+msgstr "titul"
 
 #. module: marketing
 #: model:ir.module.module,shortdesc:marketing.module_meta_information
 msgid "Marketing"
-msgstr "Marketing"
+msgstr "Reklama"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
@@ -54,7 +54,7 @@ msgstr "Obrázok"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Nastaviť Vašu reklamnú aplikáciu"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -72,12 +72,12 @@ msgstr "marketing.installer"
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
 msgid "Marketing Applications Configuration"
-msgstr "Konfigurácia marketingových aplikácii"
+msgstr "Nastavenie reklamných aplikácií"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
 msgid "Profiling Tools"
-msgstr "Nástroje profilovania"
+msgstr "Analytické nástroje"
 
 #. module: marketing
 #: view:marketing.installer:0
@@ -85,16 +85,18 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP poskytuje doplny na lepšiu správu Vášich obchodných a reklamných "
+"procesov. Vyberte tie ktoré Vás zaujímajú."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Nastavenia reklamnej aplikácie"
 
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
-msgstr "Marketingové kampane"
+msgstr "Reklamné kampane"
 
 #. module: marketing
 #: help:marketing.installer,crm_profiling:0
@@ -107,7 +109,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Nastaviť"
 
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "ID certifikát modulu musí byť jedinečný!"
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index 48a783d6aea..0c639ff4c9b 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 08:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 15:34+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: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -31,11 +32,15 @@ msgstr "Activité précédente"
 #, python-format
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
+"L'étape actuelle pour cet article n'a pas de courriel ou de rapport à "
+"prévisualiser."
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
+"L'activité avant et après la transition doivent appartenir à la même "
+"campagne. "
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
@@ -44,11 +49,13 @@ msgid ""
 "The campaign cannot be started: it doesn't have any starting activity (or "
 "any activity with a signal and no previous activity)"
 msgstr ""
+"La campagne ne peut pas être démarrée : elle ne possède pas d'activité de "
+"démarrage (ou aucune activité avec un signal et sans activité précédente)"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Time"
-msgstr ""
+msgstr "Temps"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
@@ -62,6 +69,8 @@ msgid ""
 "The campaign cannot be started: the email account is missing in email "
 "activity '%s'"
 msgstr ""
+"La campagne ne peut pas être démarrée : le compte de courriel est manquant "
+"dans l'activité '%s'."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -78,6 +87,10 @@ msgid ""
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
 msgstr ""
+"Définit un chiffre d'affaires espéré en considérant que chaque article de la "
+"campagne qui a atteint ce point a généré un certain chiffre d'affaires. Vous "
+"pouvez obtenir des statistiques sur les chiffres d'affaires dans la section "
+"\"rapports\"."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
@@ -87,12 +100,12 @@ msgstr "Déclencheur"
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
-msgstr ""
+msgstr "Nb. d'actions"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "Éditeur de campagne"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -131,6 +144,15 @@ msgid ""
 "   - transitions: list of campaign transitions outgoing from this activity\n"
 "...- re: Python regular expression module"
 msgstr ""
+"Expression python qui va décider si une activité peut être exécutée, ou doit "
+"être supprimée ou annulée. L'expression peut utiliser les variable suivantes "
+":\n"
+"   - activity : l'activité de la campagne\n"
+"   - workitem : l'objet de la campagne\n"
+"   - resource : la ressource que représente l'objet de cette campagne\n"
+"   - transitions : la liste des transitions qui suivent cette activité dans "
+"cette campagne\n"
+"...- re: Module des expressions régulières de Python"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -174,28 +196,29 @@ msgstr "Jour"
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transitions sortantes"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr ""
+msgstr "Réinitialiser"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
-msgstr ""
+msgstr "Dernière synchronisation"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "Année(s)"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "Sorry, campaign duplication is not supported at the moment."
 msgstr ""
+"Désolé, la duplication de campagnes n'est pas supporté pour le moment."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
@@ -203,6 +226,8 @@ msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
 msgstr ""
+"Date à laquelle ce segment a été synchronisé pour la dernière fois "
+"(automatiquement ou manuellement)"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -210,12 +235,12 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Automatic"
-msgstr ""
+msgstr "Automatique"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,mode:0
@@ -229,11 +254,20 @@ msgid ""
 "Normal - the campaign runs normally and automatically sends all emails and "
 "reports (be very careful with this mode, you're live!)"
 msgstr ""
+"Test - va créer et dérouler directement toutes les activités (sans attendre "
+"les délais des transitions) mais n'envoie pas de courriels et ne produit pas "
+"de rapport.\n"
+"Test en Temps Réel - va créer et dérouler directement toutes les activités "
+"mais n'envoie pas de courriels et ne produit pas de rapport.\n"
+"Avec confirmation manuelle - la campagne fonctionne normalement mais "
+"l'utilisateur doit valider manuellement chaque objet.\n"
+"Normal - la campagne fonctionne normalement et envoie automatiquement tous "
+"les courriels et les rapports (attention avec ce mode : c'est pour de vrai !)"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_run:0
 msgid "Initial start date of this segment."
-msgstr ""
+msgstr "Date de début initiale de ce segment"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -245,12 +279,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,campaign_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Campagne"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,start:0
 msgid "Start"
-msgstr ""
+msgstr "Démarrer"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,partner_field_id:0
@@ -258,6 +292,8 @@ msgid ""
 "The generated workitems will be linked to the partner related to the record. "
 "If the record is the partner itself leave this field empty."
 msgstr ""
+"L'objet généré sera associé au partenaire associé à l'enregistrement. Si "
+"l'enregistrement est le partenaire lui-même, laisser ce champ vide."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -266,12 +302,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,segment_id:0
 msgid "Segment"
-msgstr ""
+msgstr "Segment"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Cost / Revenue"
-msgstr ""
+msgstr "Coût / Revenu"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -284,16 +320,26 @@ msgid ""
 "of the resource record\n"
 "  "
 msgstr ""
+"Le type d'action à effectuer quand l'objet entre dans cette activité, par "
+"exemple:\n"
+"   - Courriel : envoyer un courriel utilisant un modèle prédéfini\n"
+"   - Rapport : imprimer un rapport existant défini sur l'objet ressource, et "
+"le sauvegarder dans un répertoire spécifique\n"
+"   - Action personnalisée : exécuter une action prédéfinie, par exemple "
+"modifier les champs de l'enregistrement ressource.\n"
+"  "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_next_sync:0
 msgid "Next time the synchronization job is scheduled to run automatically"
 msgstr ""
+"La prochaine fois, le travail de synchronisation est programmé pour "
+"s'exécuter automatiquement."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "Mois"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -301,17 +347,17 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_res_partner
 #: field:marketing.campaign.workitem,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "Transitions"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
 msgid "Don't delete workitems"
-msgstr ""
+msgstr "Ne pas supprimer les objets"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -328,12 +374,12 @@ msgstr "État"
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Marketing Reports"
-msgstr ""
+msgstr "Rapports marketing"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
@@ -341,44 +387,44 @@ msgstr ""
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.workitem,res_name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nom de la ressource"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
 msgid "Synchronization mode"
-msgstr ""
+msgstr "Mode de synchronisation"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Run"
-msgstr ""
+msgstr "Exécuter"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,from_ids:0
 msgid "Previous Activities"
-msgstr ""
+msgstr "Activités précédentes"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
 msgid "Date this segment was last closed or cancelled."
-msgstr ""
+msgstr "Dernière date à laquelle ce segment a été fermé ou annulé."
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activities"
-msgstr ""
+msgstr "Activités des campagnes marketing"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Message d'erreur"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
@@ -386,33 +432,33 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
 #: view:marketing.campaign:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Campagnes"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Unité de l'intervalle"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Pays"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
 #: selection:marketing.campaign.activity,type:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: marketing_campaign
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,variable_cost:0
@@ -421,23 +467,26 @@ msgid ""
 "reached this point has entailed a certain cost. You can get cost statistics "
 "in the Reporting section"
 msgstr ""
+"Définit un coût variable en considérant que chaque objet qui a atteint ce "
+"point doit porter un certain coût. Vous pouvez obtenir des statistiques de "
+"coût dans la section Rapports."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
-msgstr ""
+msgstr "Heure(s)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
 msgid "Campaign Segment"
-msgstr ""
+msgstr "Segment de la campagne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,keep_if_condition_not_met:0
@@ -445,109 +494,114 @@ msgid ""
 "By activating this option, workitems that aren't executed because the "
 "condition is not met are marked as cancelled instead of being deleted."
 msgstr ""
+"En activant cette option, les objets qui ne peuvent être exécutés parce que "
+"les conditions ne sont pas remplies seront marqués comme 'Annulé' au lieu "
+"d'être supprimés."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Exceptions"
-msgstr ""
+msgstr "Exceptions"
 
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "Objets"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
 msgid "Fixed Cost"
-msgstr ""
+msgstr "Coût fixe"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Modified"
-msgstr ""
+msgstr "Modifié récemment"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_nbr:0
 msgid "Interval Value"
-msgstr ""
+msgstr "Valeur de l'intervalle"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,revenue:0
 #: field:marketing.campaign.activity,revenue:0
 msgid "Revenue"
-msgstr ""
+msgstr "Revenu"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_to_id:0
 msgid "Next Activity"
-msgstr ""
+msgstr "Activité suivante"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
 msgid "Campaign Follow-up"
-msgstr ""
+msgstr "Suivi de la campagne"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
 msgid "The e-mail to send when this activity is activated"
-msgstr ""
+msgstr "Le courriel à envoyer lorsque cette activité commence"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "This Month"
-msgstr ""
+msgstr "Ce mois"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Test Mode"
-msgstr ""
+msgstr "Mode test"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records modified after last sync (no duplicates)"
 msgstr ""
+"Uniquement les enregistrement modifiés depuis la dernière synchro (pas de "
+"doublons)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
 msgid "Campaign Statistics"
-msgstr ""
+msgstr "Statistiques de campagne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Identifiant de la ressource"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
-msgstr ""
+msgstr "L'action à effectuer lorsque cette activité commence"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,partner_field_id:0
 msgid "Partner Field"
-msgstr ""
+msgstr "Champ partenaire"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -555,37 +609,37 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_campaign_analysis
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
 msgid "Campaign Analysis"
-msgstr ""
+msgstr "Analyse des campagnes"
 
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "L'intervalle doit être positif ou égal à zéro"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
-msgstr ""
+msgstr "Test en temps réel"
 
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Le nom du modèle doit être unique !"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
-msgstr ""
+msgstr "Test direct"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Répertoire"
 
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -593,32 +647,32 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
-msgstr ""
+msgstr "Aperçu"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Related Resource"
-msgstr ""
+msgstr "Ressource liée"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,start:0
 msgid "This activity is launched when the campaign starts."
-msgstr ""
+msgstr "Cette activité est lancée lorsque la campagne démarre."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,signal:0
@@ -626,55 +680,57 @@ msgid ""
 "An activity with a signal can be called programmatically. Be careful, the "
 "workitem is always created when a signal is sent"
 msgstr ""
+"Une activité avec un signal peut être appelé par programmation. Attention, "
+"l'objet est toujours créé quand un signal est envoyé"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "All records (no duplicates)"
-msgstr ""
+msgstr "Tous les enregistrements (pas de doublons)"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Created"
-msgstr ""
+msgstr "Créé récemment"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,date:0
 #: view:marketing.campaign.workitem:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condition"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_id:0
 msgid "The report to generate when this activity is activated"
-msgstr ""
+msgstr "Le rapport à générer quand cette activité démarre"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Exception"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
@@ -683,89 +739,93 @@ msgid ""
 "The campaign cannot be started: the email account is not approved in email "
 "activity '%s'"
 msgstr ""
+"La campagne ne peut pas démarrer : le compte de courriel n'est pas approuvé "
+"dans l'activité courriel \"%s\"."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Modèle de courriel"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,date:0
 msgid "Execution Date"
-msgstr ""
+msgstr "Date d'exécution"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
 msgid "Campaign Workitem"
-msgstr ""
+msgstr "Objet de la campagne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtrer"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_directory_id:0
 msgid "This folder is used to store the generated reports"
-msgstr ""
+msgstr "Ce dossier est utilisé pour sauvegarder les rapports générés"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,server_action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Action"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "Automatic transition"
-msgstr ""
+msgstr "Transition automatique"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the model on which you want this campaign to be run"
 msgstr ""
+"Choisissez le modèle selon lequel vous voulez faire fonctionner cette "
+"campagne"
 
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
 msgid "marketing_campaign"
-msgstr ""
+msgstr "marketing_campaign"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Process"
-msgstr ""
+msgstr "Processus"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
-msgstr ""
+msgstr "Cosmétique"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
 msgid "How is the destination workitem triggered"
-msgstr ""
+msgstr "Comment l'objet de destination est déclenché"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -774,40 +834,44 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "Opération non supportée"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Modèle de courriel pour les modèles de campagne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
+"Le modèle du filtre doit être le même que le modèle de ressource de la "
+"campagne. "
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronize Manually"
-msgstr ""
+msgstr "Synchroniser manuellement"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are done"
 msgstr ""
+"La campagne ne peut pas être marquée comme \"Terminée\" tant que tous les "
+"segments ne sont pas terminés."
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
@@ -818,11 +882,16 @@ msgid ""
 "possible action could be sending an email template that has previously been "
 "created in the system."
 msgstr ""
+"Une campagne marketing est un événement ou une activité qui vous aide à "
+"gérer et à rejoindre vos partenaires avec des messages spécifiques. Une "
+"campagne peut avoir plusieurs activités qui seront appelées lors d'une "
+"situation spécifique. Une action possible peut être d'envoyer un modèle de "
+"courriel qui a été précédemment créer dans le système."
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
-msgstr ""
+msgstr "Transition de la campagne"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -830,50 +899,50 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "À faire"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Campaign Step"
-msgstr ""
+msgstr "Étape de la campagne"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
 #: view:marketing.campaign.segment:0
 msgid "Segments"
-msgstr ""
+msgstr "Segments"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
 msgid "All Segments"
-msgstr ""
+msgstr "Tous les segments"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transitions entrantes"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "Courriel"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Jour(s)"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "Activités"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -881,28 +950,28 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "En cours"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
-msgstr ""
+msgstr "Après %(interval_nbr)d %(interval_type)s"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
 msgid "Marketing Campaign"
-msgstr ""
+msgstr "Campagne marketing"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "Date de fin"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -913,7 +982,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ressource"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -922,39 +991,44 @@ msgid ""
 "revenue on each campaign activity. Cost and Revenue statistics are included "
 "in Campaign Reporting."
 msgstr ""
+"Coûts fixes pour effectuer cette campagne. Vous pouvez aussi définir des "
+"coûts variables et des revenus pour chaque activité de la campagne. Les "
+"statistiques de coût et de revenu sont inclus dans les rapports de la "
+"campagne."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "Aperçu du courriel"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
 msgid "Signal"
-msgstr ""
+msgstr "Signal"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "The campaign cannot be started: there are no activities in it"
-msgstr ""
+msgstr "La campagne ne peut pas démarrer : elle ne contient aucune activité."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.workitem,date:0
 msgid "If date is not set, this workitem has to be run manually"
 msgstr ""
+"Si aucune date n'est définie, cet objet devra être lancé manuellement"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -963,7 +1037,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,activity_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Activité"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,ir_filter_id:0
@@ -973,52 +1047,58 @@ msgid ""
 "view of the Resource. If no filter is set, all records are selected without "
 "filtering. The synchronization mode may also add a criterion to the filter."
 msgstr ""
+"Filtrez pour sélectionner les enregistrements d'une ressource qui "
+"appartiennent à ce segment. De nouveaux filtres peuvent être créés et "
+"sauvegardés en utilisant la recherche avancée dans la vue liste de la "
+"ressource. Si aucun filtre n'est défini, tous les enregistrement sont "
+"sélectionnés. Le mode synchronisation peut aussi ajouter un critère au "
+"filtre."
 
 #. 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"
-msgstr ""
+msgstr "Suivi de la campagne"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
 msgid "Next Synchronization"
-msgstr ""
+msgstr "Prochaine synchronisation"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
 msgid "Campaign Activity"
-msgstr ""
+msgstr "Activité de la campagne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "Tous"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records created after last sync"
-msgstr ""
+msgstr "Uniquement les enregistrements créés depuis la dernière synchro"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
 msgid "Variable Cost"
-msgstr ""
+msgstr "Coût variable"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "With Manual Confirmation"
-msgstr ""
+msgstr "Avec confirmation manuelle"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,total_cost:0
 #: view:marketing.campaign:0
 msgid "Cost"
-msgstr ""
+msgstr "Coût"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,year:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 348470b76b9..fa2b4e99a00 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -166,6 +166,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
@@ -308,6 +313,11 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
 #: field:marketing.campaign.activity,name:0
@@ -569,8 +579,19 @@ msgid "Preview"
 msgstr ""
 
 #. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-msgid "Related Resource"
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid "\n"
+"This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).\n"
+"         The campaigns are dynamic and multi-channels. The process is as follows:\n"
+"          * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc.\n"
+"          * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.)\n"
+"          * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it\n"
+"          * You may also start the real campaign in manual mode, where each action requires manual validation\n"
+"          * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. \n"
+"          While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc.\n"
+"          \n"
+"          Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads.\n"
+"    "
 msgstr ""
 
 #. module: marketing_campaign
@@ -670,9 +691,8 @@ msgid "Campaign Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: view:marketing.campaign.segment:0
-#: field:marketing.campaign.segment,ir_filter_id:0
-msgid "Filter"
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
 msgstr ""
 
 #. module: marketing_campaign
@@ -704,11 +724,6 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#. module: marketing_campaign
-#: help:marketing.campaign,object_id:0
-msgid "Choose the model on which you want this campaign to be run"
-msgstr ""
-
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
 msgid "marketing_campaign"
@@ -938,8 +953,9 @@ msgid "Next Synchronization"
 msgstr ""
 
 #. module: marketing_campaign
-#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
-msgid "Campaign Activity"
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
 msgstr ""
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 041515da436..91af27db4ad 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -87,7 +87,7 @@ class marketing_campaign(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'object_id': fields.many2one('ir.model', 'Resource', required=True,
-                                      help="Choose the model on which you want \
+                                      help="Choose the resource on which you want \
 this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index 82921ddb724..8a76632f807 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/fr.po
@@ -7,19 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-17 19:01+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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
 msgid "Marketing campaign demo report"
-msgstr ""
+msgstr "Rapport de démo de campagne marketing"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
@@ -27,6 +28,8 @@ msgid ""
 "Hello,Thanks for generous interest you have shown in the "
 "openERP.Regards,OpenERP Team,"
 msgstr ""
+"Bonjour, merci pour tout l'intérêt que vous avez montré pour OpenERP. "
+"Cordialement, l'équipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
@@ -38,11 +41,19 @@ msgid ""
 "            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour, nous avons une offre très intéressante qui pourrait vous plaire.\n"
+"                     Nous vous proposons de participer à la journée "
+"\"Découverte d'OpenERP\" en mai 2010.\n"
+"                     Si vous souhaitez des informations supplémentaires, "
+"merci de nous recontacter.\n"
+"                     Nous apprécions sincèrement votre coopération sur ce "
+"point.\n"
+"                     Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
-msgstr ""
+msgstr "Merci d'avoir acheté le livre OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
@@ -54,41 +65,50 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour, nous avons une offre très intéressante qui pourrait vous plaire.\n"
+"                     Pour nos partenaires Silver, nous proposons une "
+"formation technique payante en juin 2010.\n"
+"                     Si vous souhaitez des informations supplémentaires, "
+"merci de nous recontacter.\n"
+"                     Nous apprécions sincèrement votre coopération sur ce "
+"point.\n"
+"                     Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Proposer une formation technique gratuite aux partenaires Or"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
 msgid "Demo data for the module marketing_campaign."
-msgstr ""
+msgstr "Données de démonstration pour le module de campagne marketing"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
 msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
+msgstr "Merci pour l'abonnement à la journée \"Découverte d'OpenERP\""
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
 msgid "Dummy Action"
-msgstr ""
+msgstr "Action factice"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
 msgid "Thanks for showing interest in OpenERP"
-msgstr ""
+msgstr "Merci pour l'intérêt que vous portez pour OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
 msgid "marketing_campaign_crm_demo"
-msgstr ""
+msgstr "marketing_campaign_crm_demo"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
 msgstr ""
+"Proposer de participer à la journée \"Découverte d'OpenERP\" en mai 2010."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
@@ -99,11 +119,19 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour, nous avons une offre très intéressante qui pourrait vous plaire.\n"
+"                     Pour nos partenaires Argent, nous proposons un "
+"partenariat Or.\n"
+"                     Si vous souhaitez des informations supplémentaires, "
+"merci de revenir vers nous.\n"
+"                     Nous apprécions sincèrement votre coopération sur ce "
+"point.\n"
+"                     Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "Proposer un partenariat Or aux partenaires Argent"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
@@ -113,6 +141,13 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour. Merci pour l'intérêt que vous nous portez, ainsi que pour l'achat "
+"du livre OpenERP.\n"
+"                 Si vous avez besoin d'informations supplémentaires, "
+"n'hésitez pas à revenir vers nous.\n"
+"                 Nous apprécions sincèrement votre coopération sur ce "
+"point.\n"
+"                 Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
@@ -124,6 +159,14 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour, nous avons une offre très intéressante qui pourrait vous plaire.\n"
+"                     Pour nos partenaires Or, nous proposons une formation "
+"technique gratuite en juin 2010.\n"
+"                     Si vous souhaitez des informations supplémentaires, "
+"merci de nous recontacter.\n"
+"                     Nous apprécions sincèrement votre coopération sur ce "
+"point.\n"
+"                     Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
@@ -134,16 +177,23 @@ msgid ""
 "             I really appreciate your co-operation on this.\n"
 "             Regards,OpenERP Team,"
 msgstr ""
+"Bonjour. Merci pour l'intérêt que vous nous portez et pour l'inscription à "
+"la journée \"Découverte d'OpenERP\".\n"
+"                           Si vous avez besoin d'informations "
+"supplémentaires, merci de nous recontacter.  \n"
+"                           Nous apprécions sincèrement votre coopération sur "
+"ce point.\n"
+"                           Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
 msgid "Thanks for subscribing to technical training"
-msgstr ""
+msgstr "Merci pour l'inscription à la formation technique"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
 msgid "Partner :"
-msgstr ""
+msgstr "Partenaire :"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
@@ -153,8 +203,13 @@ msgid ""
 "appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Bonjour. Merci pour l'intérêt que vous nous portez et pour l'inscription à "
+"la formation technique. Si vous avez besoin d'informations supplémentaires, "
+"merci de nous recontacter.  Nous apprécions sincèrement votre coopération "
+"sur ce point.\n"
+"                  Cordialement, l'équipe OpenERP."
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
 msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Proposer une formation payée aux partenaires Argent"
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index 78fbf3ee653..f58277884ca 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:52+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:52+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,46 +26,26 @@ msgid "Hello,Thanks for generous interest you have shown in the openERP.Regards,
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
-msgid "Hello,We have very good offer that might suit you.\n"
-"            We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
-"            If any further information required kindly revert back.\n"
-"            We really appreciate your co-operation on this.\n"
-"            Regards,OpenERP Team,"
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
-msgid "Thanks for buying the OpenERP book"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid "Hello, We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on june,2010.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
 "            If any further information required kindly revert back.\n"
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
-msgid "Propose a free technical training to Gold partners"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
@@ -74,13 +54,13 @@ msgid "Thanks for showing interest in OpenERP"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
@@ -93,18 +73,31 @@ msgid "Hello, We have very good offer that might suit you.\n"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
+#: report:crm.lead.demo:0
+msgid "Partner :"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
-msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
-"            If any further information required kindly revert back.\n"
-"            I really appreciate your co-operation on this.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
 msgid "Hello, We have very good offer that might suit you.\n"
@@ -123,23 +116,35 @@ msgid "Hello,Thanks for showing intrest and for subscribing to the OpenERP Disco
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
-msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid "Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
 
 #. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid "Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
 msgstr ""
 
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index ad0df867ab4..b8a26b0efcd 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -7,19 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-15 02:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 08:54+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: 2010-12-17 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "facturer au membre de l'association"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
@@ -31,7 +32,7 @@ msgstr "Processus d'adhésion"
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr "Membre Cotisant"
+msgstr "Membre payant"
 
 #. module: membership
 #: view:report.membership:0
@@ -41,7 +42,7 @@ msgstr "Grouper par ..."
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "Nb. payant"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
@@ -51,7 +52,7 @@ msgstr "Montant récolté"
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Analyse des adhésions"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -66,7 +67,7 @@ msgstr "Définissez un membre associé du partenaire."
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "La facture est payée"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
@@ -83,12 +84,12 @@ msgstr "Date de fin"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "En attente de facturation"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Date de fin de l'adhésion"
 
 #. module: membership
 #: view:res.partner:0
@@ -108,13 +109,13 @@ msgstr "Date de fin d'adhésion"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Produit au membre"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Adhérer"
 
 #. module: membership
 #: field:res.partner,associate_member:0
@@ -124,17 +125,17 @@ msgstr "Membre Associé"
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "Le membre est associé"
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Montant en attente"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "Partenaire associé."
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
@@ -144,12 +145,12 @@ msgstr ""
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Analyse des membres"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Date de fin d'adhésion"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -160,7 +161,7 @@ msgstr "Date de début"
 #: code:addons/membership/membership.py:0
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Le partenaire n'a pas d'adresse pour établir la facture."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -171,7 +172,7 @@ msgstr "Partenaire"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "Facture à payer"
 
 #. module: membership
 #: view:res.partner:0
@@ -186,7 +187,7 @@ msgstr "De"
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "Erreur, ce produit d'adhésion est expiré"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -205,11 +206,23 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Ceci indique l'état de l'adhésion.\n"
+"                   - Non Membre : un membre qui n'a fait aucune demande "
+"d'adhésion.\n"
+"                   - Membre annulé : un membre qui a annulé son adhésion.\n"
+"                   - Vieux membre : un membre dont la date d'adhésion a "
+"expiré.\n"
+"                   - Membre en attente : un membre qui a fait une demande "
+"d'adhésion pour laquelle la facture va être créée.\n"
+"                   - Membre facturé : un membre pour lequel la facture a été "
+"créée.\n"
+"                   - Membre payé : un membre qui a payé le montant de "
+"l'adhésion."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
@@ -231,7 +244,7 @@ msgstr "Erreur !"
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
-msgstr ""
+msgstr "Membre payé"
 
 #. module: membership
 #: view:res.partner:0
@@ -241,7 +254,7 @@ msgstr "Regrouper par"
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "Nb. en attente"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -260,7 +273,7 @@ msgstr "Non Membre"
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "Ouvrez la facture."
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -270,7 +283,7 @@ msgstr "Juillet"
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Adhésion Or"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -278,6 +291,8 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Un membre auquel vous voulez associer votre adhésion. Cela prendra en compte "
+"l'état de l'adhésion du membre associé."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
@@ -289,12 +304,12 @@ msgstr ""
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "Définissez le produit pour l'adhésion"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "Le membre facturé peut être membre associé."
 
 #. module: membership
 #: view:membership.invoice:0
@@ -317,7 +332,7 @@ msgstr ""
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "Produits d'adhésion"
 
 #. module: membership
 #: field:membership.membership_line,date:0
@@ -327,27 +342,27 @@ msgstr ""
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Sélectionnez ceci si vous voulez donner l'adhésion gratuitement."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "Définir l'association"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " État de l'adhésion"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Adhésions"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "La facture d'adhésion a été payée."
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
@@ -386,6 +401,18 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Ceci indique l'état de l'adhésion.\n"
+"                   - Non Membre : un membre qui n'a fait aucune demande "
+"d'adhésion.\n"
+"                   - Membre annulé : un membre qui a annulé son adhésion.\n"
+"                   - Vieux membre : un membre dont la date d'adhésion a "
+"expiré.\n"
+"                   - Membre en attente : un membre qui a fait une demande "
+"d'adhésion pour laquelle la facture va être créée.\n"
+"                   - Membre facturé : un membre pour lequel la facture a été "
+"créée.\n"
+"                   - Membre payé : un membre qui a payé le montant de "
+"l'adhésion."
 
 #. module: membership
 #: view:report.membership:0
@@ -402,7 +429,7 @@ msgstr "Regrouper par..."
 #: code:addons/membership/membership.py:0
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "Le partenaire est membre gratuitement."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
@@ -413,13 +440,13 @@ msgstr "Liste de Prix de Vente Membre"
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Membre associé"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Date à partir de laquelle l'adhésion devient active."
 
 #. module: membership
 #: view:report.membership:0
@@ -430,7 +457,7 @@ msgstr ""
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Facture de l'adhésion"
 
 #. module: membership
 #: view:report.membership:0
@@ -442,7 +469,7 @@ msgstr ""
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "Définissez le produit d'adhésion."
 
 #. module: membership
 #: view:product.product:0
@@ -465,7 +492,7 @@ msgstr "Membre Libre"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "Version membre de la liste de prix de vente"
 
 #. module: membership
 #: constraint:product.template:0
@@ -493,17 +520,17 @@ msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Date à partir de"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "Membre associé"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Informations comptables"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
@@ -525,7 +552,7 @@ msgstr "Août"
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership Products"
-msgstr ""
+msgstr "Produits d'adhésion"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -554,7 +581,7 @@ msgstr "Membre Facturé"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Date à laquelle l'adhésion du membre a été effective."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -566,7 +593,7 @@ msgstr "Membre en attente"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "Partenaire de l'association"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -601,27 +628,27 @@ msgstr "Janvier"
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Frais d'adhésion"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "Montant de l'adhésion"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "Prix négocié par le partenaire"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Adhésion de base"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Sélectionnez ceci si le produit est un produit d'adhésion."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -640,7 +667,7 @@ msgstr "A"
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "État actuel de l'adhésion"
 
 #. module: membership
 #: view:report.membership:0
@@ -655,7 +682,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "La facture brouillon est maintenant ouverte."
 
 #. module: membership
 #: view:product.product:0
@@ -675,7 +702,7 @@ msgstr "Fermer"
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Tous les non-membres"
 
 #. module: membership
 #: view:product.product:0
@@ -695,7 +722,7 @@ msgstr "Catégorisation"
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "Facture brouillon pour adhésion."
 
 #. module: membership
 #: field:membership.invoice,member_price:0
@@ -733,7 +760,7 @@ msgstr "Mai"
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Adhésion Argent"
 
 #. module: membership
 #: view:product.product:0
@@ -754,7 +781,7 @@ msgstr "Février"
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Membre facturé"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -764,7 +791,7 @@ msgstr "Avril"
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Date à laquelle l'adhésion a été annulée"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -774,7 +801,7 @@ msgstr "Date d'annulation"
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "Membre en attente"
 
 #. module: membership
 #: field:report.membership,date_from:0
@@ -785,7 +812,7 @@ msgstr ""
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 msgid "Membership product"
-msgstr ""
+msgstr "Produit d'adhésion"
 
 #. module: membership
 #: help:membership.membership_line,member_price:0
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 0bdbf73ac1e..162f7f8664d 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:53+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:53+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -297,11 +297,6 @@ msgstr ""
 msgid "Date until which membership remains active."
 msgstr ""
 
-#. module: membership
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
@@ -348,8 +343,19 @@ msgid "September"
 msgstr ""
 
 #. module: membership
-#: selection:report.membership,month:0
-msgid "December"
+#: model:ir.module.module,description:membership.module_meta_information
+msgid "\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (ex: a group subscribe for a membership for all\n"
+"  subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
 msgstr ""
 
 #. module: membership
@@ -645,6 +651,11 @@ msgstr ""
 msgid "Last 30 Days"
 msgstr ""
 
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 2028530aa59..bba683cd724 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-09 11:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 19:58+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: 2010-12-17 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -59,7 +60,7 @@ msgstr "Occupation du poste de charge"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Centers load"
-msgstr "Occupation du poste de charge"
+msgstr "Occupation des postes de charge"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -123,17 +124,17 @@ msgstr "Gammes"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr ""
+msgstr "Rechercher une nomenclature"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Pour les produits stockables et les consommables"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "À produire"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -312,7 +313,7 @@ msgstr "Biens Prévus"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr "KIt"
+msgstr "Kits / Fantôme"
 
 #. module: mrp
 #: help:mrp.bom,position:0
@@ -399,7 +400,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
 msgid "Repairs"
-msgstr ""
+msgstr "Réparations"
 
 #. module: mrp
 #: field:mrp.installer,stock_location:0
@@ -456,7 +457,7 @@ msgstr "Variation de la valeur de stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Structure de la Nomenclature des Matériaux"
+msgstr "Structure de la nomenclature"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -466,12 +467,12 @@ msgstr "le produit est de type Service"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Décomposition de la fabrication"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Pour les services."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -558,7 +559,7 @@ msgstr "Structure de la Nomenclature des Produits"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Recherche production"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -574,7 +575,7 @@ msgstr "Mars"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 msgid "Workcenter Load"
-msgstr "Charge par poste"
+msgstr "Occupation du poste"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
@@ -584,7 +585,7 @@ msgstr "Précisez le coût par cycle du poste de charge"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Hièrarchie de la nomenclature"
+msgstr "Hiérarchie de la nomenclature"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -648,7 +649,7 @@ msgstr "Erreur! Vous ne pouvez pas créer de nomenclatures récursives"
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Charge du poste de charge"
+msgstr "Occupation du poste de charge"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -698,7 +699,7 @@ msgstr "En production"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Nomenclature maîtresse"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -706,6 +707,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"L'UdV (unité de Vente) du produit est l'unité de mesure pour la facturation "
+"et la valorisation du stock"
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -723,7 +726,7 @@ msgstr "Type"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Coût total "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -923,7 +926,7 @@ msgstr "Tableau de bord"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "Occupation prévisionnelle du poste"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -981,6 +984,9 @@ msgid ""
 "Enables multiple product output from a single production order: without "
 "this, a production order can have only one output product."
 msgstr ""
+"Permet d'obtenir plusieurs produits différents en sortie d'un même ordre de "
+"fabrication ; sans cette fonction, un ordre de fabrication ne peut produire "
+"qu'un unique produit fini."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -1002,6 +1008,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Si la méthode d'approvisionnement du service est \"Acheter\", ceci va créer "
+"un appel d'offres, par exemple une demande de sous-traitance."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -1011,7 +1019,7 @@ msgstr "Déplacer le produit"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "En retard"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1048,7 +1056,7 @@ msgstr "Emplacement d'origine"
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Référence interne"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1056,11 +1064,13 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Gère les chemins et flux de produits à l'intérieur des emplacements, et "
+"entre les emplacements (par exemple, des dépôts)."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "Structure du produit"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1105,12 +1115,12 @@ msgstr ""
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
-msgstr ""
+msgstr "Détermine l'ordre d'affichage des postes de charge d'une gamme."
 
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantité à produire ne peut être ni négative ni nulle !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1131,7 +1141,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "Ordres de fabrication en attente de produits"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1176,7 +1186,7 @@ msgstr "Journal analytique"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "Postes de charge"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1189,6 +1199,9 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
+"Le système attend que les produits soient disponibles en stock. Typiquement, "
+"les besoins en ces produits sont traités manuellement ou avec une règle de "
+"stock minimum."
 
 #. module: mrp
 #: field:change.production.qty,product_qty:0
@@ -1232,7 +1245,7 @@ msgstr "Sélectionner l'unité de temps"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Occupation du poste de charge"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1251,7 +1264,7 @@ msgstr ""
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Changer le prix du parent"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -1384,7 +1397,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Postes de charge de production"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1404,12 +1417,12 @@ msgstr ""
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "Impossible de trouver l'identifiant actif"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Rechercher un poste de charge MRP"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1430,7 +1443,7 @@ msgstr "Compte Horaire"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Emplacement de destination"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
@@ -1451,7 +1464,7 @@ msgstr "Satisfaire le besoin de produit"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Occupation des postes de charge"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1485,7 +1498,7 @@ msgstr "Informations supplémentaires"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Modifier les quantités de produit"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
@@ -1524,7 +1537,7 @@ msgstr "Terminé"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Modifier le prix standard"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -1545,11 +1558,13 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"Cela va aussi changer le prix du produit parent selon la nomenclature du "
+"produit."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "Ordres de fabrication à lancer"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:0
@@ -1599,7 +1614,7 @@ msgstr "Emplacement de matière première"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Imprimer la structure des coûts du produit"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1608,7 +1623,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Ordres de fabrication"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1626,7 +1641,7 @@ msgstr "Fabrication à la commande"
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Analyse de la production"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1642,7 +1657,7 @@ msgstr "Date de fin"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ressource"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1670,7 +1685,7 @@ msgstr "très Urgent"
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Approuver"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1680,7 +1695,7 @@ msgstr "Catégories des Propriétés"
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Donne l'ordre d'affichage de la liste des ordres de fabrication"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1750,6 +1765,7 @@ msgstr "Nomenclature"
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"L'UdM (unité de mesure) est l'unité de mesure pour la gestion des stocks"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1797,9 +1813,8 @@ msgid ""
 msgstr ""
 "La liste des opérations (liste des postes de charge) pour fabriquer le "
 "produit fini. La gamme est principalement utilisée pour calculer les coûts "
-"des postes de charges pendant les opérations et pour prévoir la charge "
-"future dans les postes de charges en fonction de la planification de la "
-"production."
+"des postes de charges pendant les opérations et pour prévoir l'occupation "
+"des postes de charge en fonction de la planification de la production."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -1947,14 +1962,15 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
-"Quand un ordre de fabrication est créé, il passe à l'état 'Brouillon'.\n"
-" Si l'ordre est concirmé il passe à l'état 'En approvisionnement'.\n"
-" En cas de défaut à ce stade, l'état passe à 'Approvisionnement en défaut'.  "
-"                                                                 \n"
-"Si le stock indique la disponibilité, l'état passe à 'Fabrication "
-"possible'.\n"
-" Quand la production démarre,  l'état passe à 'Fabrication en cours'.\n"
-" Quand la production est achevée, l'état passe à 'Terminé'."
+"Quand un ordre de fabrication est créé, il passe à l'état \"Brouillon\".\n"
+" Si l'ordre est confirmé, il passe à l'état \"En approvisionnement\".\n"
+" En cas de défaut à ce stade, l'état passe à \"Approvisionnement en "
+"défaut\".                                                                   "
+"\n"
+"Si le stock indique la disponibilité, l'état passe à \"Fabrication "
+"possible\".\n"
+" Quand la production démarre,  l'état passe à \"Fabrication en cours\".\n"
+" Quand la production est achevée, l'état passe à \"Terminé\"."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1995,7 +2011,7 @@ msgstr "Besoins"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Arrondi appliqué sur la quantité des produits."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
@@ -2050,7 +2066,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
-msgstr "En attende de marchandises"
+msgstr "En attente de marchandises"
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
@@ -2090,19 +2106,19 @@ msgstr "Normal"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Étapes de fabrication."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Structure de coût"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Consommer et produire"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2127,7 +2143,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Le type produit est stockable ou consommable."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:0
@@ -2139,7 +2155,7 @@ msgstr "Erreur"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Sélectionner quantité"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2160,7 +2176,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Révision des nomenclatures"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2177,7 +2193,7 @@ msgstr "Productions"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Coût de fabrication de "
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -2211,6 +2227,7 @@ msgstr ""
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Référence du document à l'origine de la demande d'ordre de production"
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -2231,27 +2248,27 @@ msgstr "Besoins en exception"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "Produit soumis à une \"règle de stock min\""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Prix produit"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "Configuration des modules MRP"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Découper en lots de fabrication"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Changer la quantité"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2282,9 +2299,8 @@ msgid ""
 msgstr ""
 "La liste des opérations (liste des postes de charge) pour fabriquer le "
 "produit fini. La gamme est principalement utilisée pour calculer les coûts "
-"des postes de charges pendant les opérations et pour prévoir la charge "
-"future dans les postes de charges en fonction de la planification de la "
-"production."
+"des postes de charges pendant les opérations et pour prévoir l'occupation "
+"des postes de charge en fonction de la planification de la production."
 
 #. module: mrp
 #: view:board.board:0
@@ -2294,7 +2310,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Date de fin prévue"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2303,6 +2319,9 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"L'occupation des postes de charge donne une projection de l'occupation des "
+"postes de charge sur une période donnée. Elle est exprimée en nombre "
+"d'heures et en cycles-machines."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2317,7 +2336,7 @@ msgstr "Fabrication"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Prochain ordre de production"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2328,7 +2347,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Groupes de propriétés"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2360,6 +2379,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Si la méthode d'approvisionnement du service est \"Produire\", ceci va créer "
+"une tâche dans le module de gestion de projets."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2393,7 +2414,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "Donne l'ordre d'affichage d'une liste de nomenclatures."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2401,7 +2422,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Produits à consommer"
 
 #. module: mrp
 #: view:mrp.production.order:0
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 7078c97fa5e..73615f29f60 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-09 11:28+0000\n"
-"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
+"PO-Revision-Date: 2010-12-17 11:44+0000\n"
+"Last-Translator: scigghia <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: 2010-12-17 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -277,7 +277,7 @@ msgstr "titolo"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr ""
+msgstr "Distinte Base"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -313,6 +313,7 @@ msgstr "Agosto"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Si sta cercando di assegnare un lotto che non viene dallo stesso prodotto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -356,7 +357,7 @@ msgstr "Quantità"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Nr di ore"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -403,6 +404,8 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Abilita garanzia e gestione riparazione (ed il loro impatto su magazzini e "
+"fatturazione)."
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -441,7 +444,7 @@ msgstr "Struttura Distinta Base"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Il tipo di prodotto è un servizio"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -471,7 +474,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Nr di cicli"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -495,7 +498,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Errore: codice EAN non valido"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -542,7 +545,7 @@ msgstr ""
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Supplier Price per Uom"
-msgstr ""
+msgstr "Prezzo Fornitore per UM"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -646,7 +649,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Pianificazione"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -699,7 +702,7 @@ msgstr "Tipo"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Costo Totale di "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -744,6 +747,7 @@ msgstr "Azione non valida !"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
+"Un fattore di 0.9 indica una perdita del 10% nel processo di produzione."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -1331,7 +1335,7 @@ msgstr "Struttura di Costo del prodotto"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.installer"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1637,7 +1641,7 @@ msgstr "Molto Urgente"
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Approva"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1697,7 +1701,7 @@ msgstr "Costo per Ciclo"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Servizio"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1841,7 +1845,7 @@ msgstr ""
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Errore! Non si possono creare aziende ricorsive."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1859,7 +1863,7 @@ msgstr "Arrotondamento Prodotto"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Ordine di Lavoro"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -2028,7 +2032,7 @@ msgstr "Settimana"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento configurazione"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2046,7 +2050,7 @@ msgstr "Fasi di produzione."
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Struttura dei costi"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2088,7 +2092,7 @@ msgstr "Errore"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Selezionare la quantità"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2191,7 +2195,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Prezzo del prodotto"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2267,7 +2271,7 @@ msgstr "Gestione Produzione"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Prossimi ordini di produzione"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 6a3c87b5877..fd09e5a8e1f 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:54+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:54+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,11 +26,6 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of operations this workcenter can do."
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -101,6 +96,11 @@ msgstr ""
 msgid "Routings"
 msgstr ""
 
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
@@ -116,6 +116,11 @@ msgstr ""
 msgid "To Produce"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.bom:0
 #: field:mrp.bom,code:0
@@ -203,6 +208,11 @@ msgstr ""
 msgid "Define specific property groups that can be assigned to the properties of your bills of materials."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid "Fill this product to track easily your production costs in the analytic accounting."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
@@ -510,11 +520,6 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
-msgid "Workcenter Load"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Workcenter per cycle."
@@ -532,11 +537,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.product_price,number:0
-msgid "Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this qunatity."
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -579,6 +579,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
 msgstr ""
@@ -606,12 +607,11 @@ msgid "Planning"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.workcenter:0
-msgid "Costing Information"
+#: view:mrp.production:0
+msgid "Ready"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing.workcenter,hour_nbr:0
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
 msgstr ""
@@ -761,6 +761,11 @@ msgstr ""
 msgid "Procurement of raw material"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
@@ -1006,6 +1011,42 @@ msgstr ""
 msgid "Order quantity cannot be negative or zero !"
 msgstr ""
 
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid "\n"
+"    This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+"    Features:\n"
+"    * Make to Stock / Make to Order (by line)\n"
+"    * Multi-level BoMs, no limit\n"
+"    * Multi-level routing, no limit\n"
+"    * Routing and workcenter integrated with analytic accounting\n"
+"    * Scheduler computation periodically / Just In Time module\n"
+"    * Multi-pos, multi-warehouse\n"
+"    * Different reordering policies\n"
+"    * Cost method by product: standard price, average price\n"
+"    * Easy analysis of troubles or needs\n"
+"    * Very flexible\n"
+"    * Allows to browse Bill of Materials in complete structure\n"
+"        that include child and phantom BoMs\n"
+"    It supports complete integration and planification of stockable goods,\n"
+"    consumable of services. Services are completely integrated with the rest\n"
+"    of the software. For instance, you can set up a sub-contracting service\n"
+"    in a BoM to automatically purchase on order the assembly of your production.\n"
+"\n"
+"    Reports provided by this module:\n"
+"    * Bill of Material structure and components\n"
+"    * Load forecast on workcenters\n"
+"    * Print a production order\n"
+"    * Stock forecasts\n"
+"    Dashboard provided by this module::\n"
+"    * List of next production orders\n"
+"    * List of deliveries (out picking)\n"
+"    * Graph of work center load\n"
+"    * List of procurement in exception\n"
+"    "
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
@@ -1495,6 +1536,12 @@ msgstr ""
 msgid "Production Analysis"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Copy"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
@@ -1802,6 +1849,11 @@ msgstr ""
 msgid "Number of Hours"
 msgstr ""
 
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
@@ -1879,7 +1931,6 @@ msgid "BoM Revisions"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Draft"
@@ -2154,6 +2205,11 @@ msgstr ""
 msgid "In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."
 msgstr ""
 
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid "Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this quantity."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 135d5007f90..d5bc8f39e6c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -53,11 +53,23 @@ class mrp_workcenter(osv.osv):
         'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
         'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
         'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True),
+        'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to track easily your production costs in the analytic accounting."),
     }
     _defaults = {
         'capacity_per_cycle': 1.0,
         'resource_type': 'material',
      }
+
+    def on_change_product_cost(self, cr, uid, ids, product_id, context=None):
+        if context is None:
+            context = {}
+        value = {}
+
+        if product_id:
+            cost = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            value = {'costs_hour': cost.standard_price}
+        return {'value': value}
+
 mrp_workcenter()
 
 
@@ -99,8 +111,8 @@ class mrp_routing_workcenter(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
         'cycle_nbr': fields.float('Number of Cycles', required=True,
-            help="Number of operations this workcenter can do."),
-        'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for doing one cycle."),
+            help="Number of iterations this work center has to do in the specified operation of the routing."),
+        'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
         'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade',
              help="Routing indicates all the workcenters used, for how long and/or cycles." \
                 "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
@@ -323,6 +335,15 @@ class mrp_bom(osv.osv):
                 result = result + res[0]
                 result2 = result2 + res[1]
         return result, result2
+    
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        bom_data = self.read(cr, uid, id, [], context=context)
+        default.update({'name': bom_data['name'] + ' ' + _('Copy')})
+        return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
 mrp_bom()
 
@@ -738,7 +759,10 @@ class mrp_production(osv.osv):
                         'account_id': account,
                         'general_account_id': wc.costs_general_account_id.id,
                         'journal_id': wc.costs_journal_id.id,
-                        'code': wc.code
+                        'ref': wc.code,
+                        'product_id': wc.product_id.id,
+                        'unit_amount': wc_line.hour,
+                        'product_uom_id': wc.product_id.uom_id.id
                     } )
             if wc.costs_journal_id and wc.costs_general_account_id:
                 value = wc_line.cycle * wc.costs_cycle
@@ -751,7 +775,10 @@ class mrp_production(osv.osv):
                         'account_id': account,
                         'general_account_id': wc.costs_general_account_id.id,
                         'journal_id': wc.costs_journal_id.id,
-                        'code': wc.code,
+                        'ref': wc.code,
+                        'product_id': wc.product_id.id,
+                        'unit_amount': wc_line.cycle,
+                        'product_uom_id': wc.product_id.uom_id.id
                     } )
         return amount
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cf491f0d0e6..e17c3370ac3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -13,7 +13,7 @@
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
-                  groups="mrp.group_mrp_manager"
+                  groups="mrp.group_mrp_manager,mrp.group_mrp_user"
                   sequence="5" />
 
         <!--
@@ -162,12 +162,13 @@
                             </group>
                             <group col="2" colspan="2">
                             <separator colspan="2" string="Costing Information"/>
+                            <field name="product_id" on_change="on_change_product_cost(product_id)"/>
                             <field name="costs_hour"/>
                             <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
                             <field name="costs_cycle"/>
                             <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_journal_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_general_account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                            <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
                             </group>
                             <separator colspan="4" string="Description"/>
                             <field colspan="4" name="note" nolabel="1"/>
@@ -324,11 +325,11 @@
                         <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_qty"/>
-                        <field name="product_uom" widget="selection"/>
-                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
+                        <field name="product_uom"/>
+                        <field name="routing_id"  groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos_qty" groups="product.group_uos" />
-                        <field name="product_uos" widget="selection" groups="product.group_uos"/>
+                        <field name="product_uos"  groups="product.group_uos"/>
                         <newline/>
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -569,8 +570,8 @@
                         <field name="origin"/>
                         <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
-                        <group colspan="2" col="3">
-                        <field name="product_uom" widget="selection"/>
+                        <group colspan="2" col="4">
+                        <field name="product_uom"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
@@ -584,7 +585,7 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
+                            <field name="routing_id" groups="base.group_extended" select="1"/>
                             <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')]"/>
                             <separator string="" colspan="4"/>
@@ -594,7 +595,7 @@
                                 <tree colors="blue:state in ('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="UOM" widget="selection"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
@@ -613,7 +614,7 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('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="UOM" widget="selection"/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
                                        <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -634,7 +635,6 @@
                             <group col="9" colspan="4">
                                 <field name="state"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
@@ -648,12 +648,12 @@
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc." />
                                     <field name="state" invisible="1"/>
-                                    <button name="%(stock.action_partial_move)d" 
-                                        string="Partial" 
-                                        type="action" states="confirmed,assigned" 
+                                    <button name="%(stock.action_partial_move)d"
+                                        string="Partial"
+                                        type="action" states="confirmed,assigned"
                                         icon="gtk-justify-fill"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -667,7 +667,7 @@
                                    <tree colors="red:scrapped==True;blue:state in('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="UOM" widget="selection"/>
+                                       <field name="product_uom" readonly="1" string="UOM"/>
                                        <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="scrapped" invisible="1"/>
@@ -681,6 +681,10 @@
                                </field>
                         </page>
                         <page string="Work Orders" groups="base.group_extended">
+                            <button name="action_compute" states="draft"
+                                string="Compute Data" type="object"
+                                icon="terp-stock_format-scientific"
+                                colspan="4" />
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
                                     <field colspan="4" name="name"/>
@@ -699,6 +703,10 @@
                             </field>
                         </page>
                         <page string="Scheduled Products">
+                            <button name="action_compute" states="draft"
+                                string="Compute Data" type="object"
+                                icon="terp-stock_format-scientific"
+                                colspan="4" />
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
@@ -722,8 +730,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-document-new" string="Draft"
-                           domain="[('state','=','draft')]"
+                       <filter icon="terp-camera_test" string="Ready"
+                           domain="[('state','=','ready')]"
                            help="Non confirmed manufacturing orders"/>
                        <filter icon="terp-check" string="Current" name="current"
                            domain="[('state','in',('confirmed','ready','exception','in_production'))]"
@@ -905,7 +913,7 @@
 
         <act_window
             domain="[('bom_id','=',False)]"
-            context="{'search_default_product_id': [active_id]}"
+            context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
             id="act_product_product_2_mrp_bom"
             name="Bill of Materials"
             res_model="mrp.bom"
@@ -927,9 +935,9 @@
         <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
-        
+
         <!-- Planning -->
-        
+
         <menuitem id="menu_mrp_planning" name="Planning"
 		        parent="base.menu_mrp_root" sequence="2"
 		        groups="base.group_extended"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index c3b932e6129..496462b390c 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -70,4 +70,4 @@
 "access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 3e50552cd9e..8758bc09cd5 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -113,6 +113,9 @@ class StockMove(osv.osv):
                     production_obj.force_production(cr, uid, [prod.id])
                 wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
             for new_move in new_moves:
+                if new_move == move.id:
+                    #This move is already there in move lines of production order
+                    continue
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
                 res.append(new_move)
         return res
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 8e26561adad..2a685e8c833 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -25,7 +25,7 @@ class mrp_price(osv.osv_memory):
     _name = 'mrp.product_price'
     _description = 'Product Price'
     _columns = {
-        'number': fields.integer('Quantity', required=True, help="Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this qunatity."),
+        'number': fields.integer('Quantity', required=True, help="Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this quantity."),
     }
     _defaults = {
         'number': 1,
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index fc4c90f8c54..3f4fd86633a 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 
 class mrp_workcenter_load(osv.osv_memory):
     _name = 'mrp.workcenter.load'
-    _description = 'Workcenter Load'
+    _description = 'Work Center Load'
 
     _columns = {
         'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index 079ae643f09..da0621d10dc 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,3 +20,22 @@ msgstr ""
 msgid "MRP JIT"
 msgstr ""
 
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid "\n"
+"    This module allows Just In Time computation of procurement orders.\n"
+"\n"
+"    If you install this module, you will not have to run the regular procurement \n"
+"    scheduler anymore (but you still need to run the minimum order point rule \n"
+"    scheduler, or for example let it run daily.)\n"
+"    All procurement orders will be processed immediately, which could in some\n"
+"    cases entail a small performance impact.\n"
+"\n"
+"    It may also increase your stock size because products are reserved as soon\n"
+"    as possible and the scheduler time range is not taken into account anymore. \n"
+"    In that case, you can not use priorities any more on the different picking.\n"
+"    \n"
+"    \n"
+"    "
+msgstr ""
+
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 9d2f33034bf..1e75a6ed62c 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-03 07:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-20 02:08+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: 2010-12-17 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -28,7 +29,7 @@ msgstr "Ordres de Travail"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Annuler l'opération."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -45,17 +46,17 @@ msgstr "Un ordre de Production ne peux pas commencer dans l'état [%s]"
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Information issue de la définition de la gamme"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
@@ -78,7 +79,7 @@ msgstr "("
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Produit à fabriquer"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
@@ -88,18 +89,18 @@ msgstr "Opération de Production"
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Attribution libre du n° de série"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Opérations MRP"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -109,25 +110,27 @@ msgstr "Ordre de Production"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Exception de prélèvement"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Création de l'ordre de travail"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
+"Vous ne pouvez pas mettre en pause une opération qui se trouve dans un autre "
+"état que Commencée/Reprise !"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,workcenter_id:0
 msgid "Workcenter"
-msgstr "Centre de Travail"
+msgstr "Poste de Charge"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -138,19 +141,19 @@ msgstr "Les ordres de travail sont créés à partir de l'ordre de fabrication"
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulé"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr "Commandes de Travail Confirmées"
+msgstr "Ordres de travail confirmés"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -161,7 +164,7 @@ msgstr "Opérations"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Mouvement de stock"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
@@ -179,7 +182,7 @@ msgstr "Brouillon"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr ""
+msgstr "En cours de production"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -187,13 +190,13 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Ordre de travail"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -201,11 +204,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Il y a 1 ordre de travail par poste de charge. Information à propos du "
+"nombre de cycles ou du temps de cycle."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mois -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -218,34 +223,42 @@ msgid ""
 "* When the user cancels the work order it will be set in 'Canceled' state.\n"
 "* When order is completely processed that time it is set in 'Finished' state."
 msgstr ""
+"* Quand un ordre de travail est créé, il est à l'état \"Brouillon\".\n"
+"* Quand l'utilisateur passe l'ordre en mode Démarré, l'état passe à \"En "
+"cours\".\n"
+"* Quand l'ordre est en cours de fabrication, si l'utilisateur veut arrêter "
+"ou modifier l'ordre, l'utilisateur peut passer l'ordre en état \"Attente\".\n"
+"* Quand l'utilisateur annule l'ordre de travail, l'état passe à \"Annulé\".\n"
+"* Quand l'ordre est complétement terminé, l'état passe à \"Terminé\"."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
+"Vous ne pouvez pas finir l'opération sans la commencer / la reprendre !"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Date planifiée"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "Il n'y a aucune opération à annuler !"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Qté de produit"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -265,7 +278,7 @@ msgstr "Date de la Commande"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "Ordres de travail à venir"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -278,23 +291,23 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Opération annulée"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -309,7 +322,7 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Rapport des ordres de travail"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -321,7 +334,7 @@ msgstr "Date de Début"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Produits en attente"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -330,7 +343,7 @@ msgstr ""
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr "en Pause"
+msgstr "Mettre en attente"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -342,7 +355,7 @@ msgstr "En progress"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordre de fabrication"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -362,6 +375,8 @@ msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
 msgstr ""
+"Quand une opération doit être annulée, vous pouvez le faire à partir du "
+"formulaire des ordres de travail."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -373,12 +388,12 @@ msgstr "Mettre en brouillon"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Cycles totaux"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "En attente"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -390,80 +405,82 @@ msgstr "Code d'Opération de Production"
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
-" Vous ne pouvez pas Résumer une Opération qui se trouve dans un état autre "
-"que 'en Pause' !"
+" Vous ne pouvez pas reprendre une opération qui se trouve dans un autre état "
+"que \"En attente\" !"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Démarré"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Operation is already finished !"
-msgstr ""
+msgstr "Opération déjà terminée !"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Prêt à fabriquer"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Mouvements enfants"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "Planification des ordres de travail"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
+"C'est le temps nécessaire entre le début et la fin de l'opération dans ce "
+"poste de charge"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Rechercher"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Terminer l'opération."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -474,18 +491,18 @@ msgstr "L'Opération n'est pas encore commencée !"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Information concernant l'ordre de fabrication."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "Désolé !"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Actuel"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -517,7 +534,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Codes des opérations"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -527,7 +544,7 @@ msgstr "Qté"
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Opération terminée"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -539,7 +556,7 @@ msgstr "Terminé"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "Code à barre de début/fin"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -560,17 +577,17 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "Opération de Départ"
+msgstr "Commencer l'opération"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Code-barre des postes de charge"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
@@ -580,12 +597,12 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "En retard"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Délai"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -598,23 +615,23 @@ msgstr "Production"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Recherche dans les postes de charges"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr "Centre de Travail"
+msgstr "Poste de charge"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Réel"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Date planifiée"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -627,7 +644,7 @@ msgstr "Produit"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total des heures"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -635,6 +652,8 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Cocher cette case pour pouvoir déplacer indépendamment chaque ordre de "
+"fabrication, sans déplacer les ordres dépendants."
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
@@ -644,7 +663,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Analyses des ordres de travail"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -662,12 +681,12 @@ msgstr "UdM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Heures par poste de charge"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Heures de travail"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -679,32 +698,32 @@ msgstr "Date de Fin"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Opération annulée"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Démarrer l'opération."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Opération terminée"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nb. de ligne d'ordre"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -712,32 +731,34 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Quand l'opération est terminée, l'opérateur met le système à jour en "
+"terminant l'ordre de travail."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Détails de l'ordre de travail"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "État de la production"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index c420b5b780e..e2426cf3684 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -391,6 +391,35 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+#. module: mrp_operations
+#: model:ir.module.module,description:mrp_operations.module_meta_information
+msgid "\n"
+"     This module adds state, date_start,date_stop in production order operation lines\n"
+"     (in the \"Work Centers\" tab)\n"
+"     State: draft, confirm, done, cancel\n"
+"     When finishing/confirming,cancelling production orders set all state lines to the according state\n"
+"     Create menus:\n"
+"         Production Management > All Operations\n"
+"         Production Management > All Operations > Operations To Do (state=\"confirm\")\n"
+"     Which is a view on \"Work Centers\" lines in production order,\n"
+"     editable tree\n"
+"\n"
+"    Add buttons in the form view of production order under workcenter tab:\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"    When the production order becomes \"ready to produce\", operations must\n"
+"    become 'confirmed'. When the production order is done, all operations\n"
+"    must become done.\n"
+"\n"
+"    The field delay is the delay(stop date - start date).\n"
+"    So that we can compare the theoretic delay and real delay.\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 813e0b62134..7f88ea071eb 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-04 08:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 15:35+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: 2010-12-17 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -35,16 +36,28 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * L'état \"Brouillon\" est utilisé quand un utilisateur saisit un nouvel "
+"ordre de réparation non confirmé.\n"
+"* L'état \"Confirmé\" est utilisé quand un utilisateur confirme l'ordre de "
+"réparation.\n"
+"* L'état \"Prêt à réparer\" est utilisé pour commencer à réparer; "
+"l'utilisateur ne peut commencer la réparation qu'à partir d'un ordre de "
+"réparation confirmé.\n"
+"* L'état \"À facturer\" est utiliser pour générer la facture, après ou avant "
+"que la réparation ne soit effectuée.\n"
+"* L'état \"Terminée\" est utilisé lorsque la réparation est terminée.\n"
+"* L'état \"Annulée\" est utilisé quand l'utilisateur annule l'ordre de "
+"réparation."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr "Mouvement d'Inventaire"
+msgstr "Mouvement d'inventaire"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -59,12 +72,16 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Cocher cette case si vous souhaitez gérer la livraison une fois que le "
+"produit est réparé. Si cette case est cochée, cela va créer une liste de "
+"prélèvement avec le produit sélectionné. Remarque : vous pouvez sélectionner "
+"les emplacements dans l'onglet Info, si vous avez la vue étendue."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Annuler l'ordre de réparation"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -86,7 +103,7 @@ msgstr "Grrouper par Adresse de Facturation Partenaire"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Aucun produit défini avec des frais !"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -129,7 +146,7 @@ msgstr "Limite de Garantie"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Remarques"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -147,7 +164,7 @@ msgstr "Total Net :"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -169,6 +186,8 @@ msgstr "Mouvement"
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
+"Vous devez sélectionner une adresse de facturation du partenaire dans le "
+"formulaire de réparation !"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -190,7 +209,7 @@ msgstr "Informations Supplémentaires"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Référence de l'ordre de réparation"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -201,7 +220,7 @@ msgstr "Brouillon"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "Pas de compte défini pour le partenaire \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -224,6 +243,12 @@ msgid ""
 "the warranty date on the production lot in order to know if you have to "
 "invoice the reparation to the customer or not."
 msgstr ""
+"Les ordres de réparation vous permettent d'organiser vos réparations de "
+"produits. Sur un ordre de réparation, vous pouvez détailler les composants "
+"que vous enlevez, que vous ajoutez ou que vous remplacez et enregistrer le "
+"temps que vous passez sur les différentes opérations. L'ordre de réparation "
+"utilise la date de garantie sur le lot de production pour savoir si vous "
+"devez facturer ou non la réparation à votre client."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -265,7 +290,7 @@ msgstr "Adresse de Livraison"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
@@ -283,6 +308,14 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * L'état passe automatiquement à \"Brouillon\" quand l'ordre de réparation "
+"est à l'état 'Brouillon'.\n"
+"* L'état passe automatiquement à \"Confirmé\" quand l'ordre de réparation "
+"est à l'état 'Confirmé'.\n"
+"* L'état passe automatiquement à \"Terminé\" quand l'ordre de réparation est "
+"terminé.\n"
+"* L'état passe automatiquement à \"Annulé\" quand l'utilisateur annule "
+"l'ordre de réparation."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -295,6 +328,8 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Cette opération va annuler le processus de réparation, mais n'annulera pas "
+"la facturation. Voulez-vous continuer ?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -311,17 +346,17 @@ msgstr "Notes du Devis"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Rechercher dans les ordres de réparation"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Ajouter)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -349,6 +384,7 @@ msgstr "Réparé"
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
 msgstr ""
+"Module de réparation des produits - Gérer toutes les réparations des produits"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -369,7 +405,7 @@ msgstr "Avant Réparation"
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr "Emplacement Courant"
+msgstr "Emplacement actuel"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -396,7 +432,7 @@ msgstr "Créer les factures"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Supprimer)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -406,17 +442,17 @@ msgstr "Ajouter"
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Voulez-vous réellement créer la(es) facture(s) ?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Référence de la réparation"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Ordre de réparation"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -426,7 +462,7 @@ msgstr "En Réparation"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Prêt à réparer"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -441,7 +477,7 @@ msgstr "Limite de Garantie"
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "inconnue"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
@@ -462,12 +498,12 @@ msgstr "La Liste de Prix vient, par défaut, du Partenaire sélectionné"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Ligne des frais de réparation"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -498,12 +534,12 @@ msgstr "Terminer la Réparation"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "Pas de compte défini pour le produit \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Devis"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -521,7 +557,7 @@ msgstr "Commencer la Réparation"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -549,6 +585,11 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"La limite de garantie est calculée comme suit : date du dernier mouvement + "
+"durée de garantie définie sur le produit sélectionné. Si la date actuelle "
+"est inférieure à la limite de garantie, chaque opération et frais que vous "
+"ajouterez sera mis par défaut à \"À ne pas facturer\". Remarque : vous "
+"pouvez modifier ceci plus tard."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -601,7 +642,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Créer la facture"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -618,7 +659,7 @@ msgstr "Lignes d'Opérations"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "facturé"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -656,7 +697,7 @@ msgstr "Taxes :"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Prélèvement"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -667,13 +708,13 @@ msgstr "Montant hors-taxe"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "Pas d'identifiant actif trouvé"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "L'ordre de réparation n'est pas facturé"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -753,7 +794,7 @@ msgstr "Prêt à Réparer"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No partner !"
-msgstr ""
+msgstr "Pas de partenaire !"
 
 #~ msgid "Repairs"
 #~ msgstr "Réparations"
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 63228f611b4..33809832e15 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -121,6 +121,19 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: mrp_repair
+#: model:ir.module.module,description:mrp_repair.module_meta_information
+msgid "\n"
+"           The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:\n"
+"           * Add/remove products in the reparation\n"
+"           * Impact for stocks\n"
+"           * Invoicing (products and/or services)\n"
+"           * Warranty concept\n"
+"           * Repair quotation report\n"
+"           * Notes for the technician and for the final customer\n"
+""
+msgstr ""
+
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
 #: field:mrp.repair.fee,tax_id:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f2ffd87c095..899a7460fdf 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -93,7 +93,7 @@ class mrp_repair(osv.osv):
             cur = repair.pricelist_id.currency_id
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
-    
+
     def _get_default_address(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         partner_obj = self.pool.get('res.partner')
@@ -222,7 +222,7 @@ class mrp_repair(osv.osv):
         if move_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=product.warranty)
+            limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
             data['value']['location_dest_id'] = move.location_dest_id.id
@@ -336,7 +336,7 @@ class mrp_repair(osv.osv):
         """
         mrp_line_obj = self.pool.get('mrp.repair.line')
         for repair in self.browse(cr, uid, ids, context=context):
-            mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'})
+            mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'}, context=context)
         self.write(cr,uid,ids,{'state':'cancel'})
         return True
 
@@ -425,14 +425,14 @@ class mrp_repair(osv.osv):
                             name = fee.name
                         if not fee.product_id:
                             raise osv.except_osv(_('Warning !'), _('No product defined on Fees!'))
-                        
+
                         if fee.product_id.property_account_income:
                             account_id = fee.product_id.property_account_income.id
                         elif fee.product_id.categ_id.property_account_income_categ:
                             account_id = fee.product_id.categ_id.property_account_income_categ.id
                         else:
                             raise osv.except_osv(_('Error !'), _('No account defined for product "%s".') % fee.product_id.name)
-                        
+
                         invoice_fee_id = inv_line_obj.create(cr, uid, {
                             'invoice_id': inv_id,
                             'name': name,
@@ -453,7 +453,10 @@ class mrp_repair(osv.osv):
         """ Writes repair order state to 'Ready'
         @return: True
         """
-        self.write(cr, uid, ids, {'state': 'ready'})
+        for repair in self.browse(cr, uid, ids, context=context):
+            self.pool.get('mrp.repair.line').write(cr, uid, [l.id for
+                    l in repair.operations], {'state': 'confirmed'}, context=context)
+            self.write(cr, uid, [repair.id], {'state': 'ready'})
         return True
 
     def action_invoice_cancel(self, cr, uid, ids, context=None):
@@ -467,20 +470,27 @@ class mrp_repair(osv.osv):
         """ Writes repair order state to 'Under Repair'
         @return: True
         """
-        self.write(cr, uid, ids, {'state': 'under_repair'})
+        repair_line = self.pool.get('mrp.repair.line')
+        for repair in self.browse(cr, uid, ids, context=context):
+            repair_line.write(cr, uid, [l.id for
+                    l in repair.operations], {'state': 'confirmed'}, context=context)
+            repair.write({'state': 'under_repair'})
         return True
 
     def action_invoice_end(self, cr, uid, ids, context=None):
         """ Writes repair order state to 'Ready' if invoice method is Before repair.
         @return: True
         """
+        repair_line = self.pool.get('mrp.repair.line')
         for order in self.browse(cr, uid, ids, context=context):
             val = {}
             if (order.invoice_method == 'b4repair'):
                 val['state'] = 'ready'
+                repair_line.write(cr, uid, [l.id for
+                        l in order.operations], {'state': 'confirmed'}, context=context)
             else:
                 pass
-            self.write(cr, uid, [order.id], val)
+            self.write(cr, uid, [order.id], val, context=context)
         return True
 
     def action_repair_end(self, cr, uid, ids, context=None):
@@ -527,7 +537,7 @@ class mrp_repair(osv.osv):
                     'tracking_id': False,
                     'state': 'done',
                 })
-                repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id})
+                repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
             if repair.deliver_bool:
                 pick_name = seq_obj.get(cr, uid, 'stock.picking.out')
                 picking = pick_obj.create(cr, uid, {
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index d60339e511e..45e7ffc4c87 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-12-01 14:12+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 15:36+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: 2010-12-17 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -28,6 +29,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Toutes les quantités de produit doivent être supérieures à 0.\n"
+"Vous devez installer le module mrp_subproduct si vous voulez gérer des "
+"produits supplémentaires sur les nomenclatures !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -80,7 +84,7 @@ msgstr "Nomenclature"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de nomenclatures récursives."
 
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
@@ -95,7 +99,7 @@ msgstr "Variable"
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantité à produire ne peut être ni négative ni nulle !"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index 4d3ea5e6f2d..e9b03c3ab69 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -42,8 +42,13 @@ msgid "MRP Sub Product - To produce several products from one production order"
 msgstr ""
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr ""
 
 #. module: mrp_subproduct
@@ -57,8 +62,15 @@ msgid "Bill of Material"
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_qty:0
-msgid "Product Qty"
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+msgid "\n"
+"This module allows you to produce several products from one production order.\n"
+"You can configure sub-products in the bill of material.\n"
+"Without this module:\n"
+"    A + B + C -> D\n"
+"With this module:\n"
+"    A + B + C -> D + E\n"
+"    "
 msgstr ""
 
 #. module: mrp_subproduct
@@ -77,8 +89,8 @@ msgid "Error ! You can not create recursive BoM."
 msgstr ""
 
 #. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr ""
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 3229cdce33c..2d7c761da90 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,7 +35,7 @@ class mrp_subproduct(osv.osv):
     _defaults={
         'subproduct_type': lambda *args: 'fixed'
     }
-    
+
     def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         """ Changes UoM if product_id changes.
         @param product_id: Changed product_id
@@ -53,7 +53,7 @@ class mrp_bom(osv.osv):
     _name = 'mrp.bom'
     _description = 'Bill of Material'
     _inherit='mrp.bom'
-    
+
     _columns={
         'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'),
     }
@@ -62,7 +62,7 @@ mrp_bom()
 class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Production'
-    _inherit= 'mrp.production'   
+    _inherit= 'mrp.production'
 
     def action_confirm(self, cr, uid, ids):
         """ Confirms production order and calculates quantity based on subproduct_type.
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index f1b503638ab..4cf8b28cfd1 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_in
-msgid "Cash Journal - (OpenERP IN)"
-msgstr ""
-
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_be
@@ -43,38 +38,8 @@ msgid "\n"
 msgstr ""
 
 #. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_in
-msgid "Checks Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
-msgid "Multi-Companies"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_us
-msgid "Sales Credit Note Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_us
-msgid "Expenses Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_be
-msgid "Expenses Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_us
-msgid "Sales Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_in
-msgid "Expenses Journal - (OpenERP IN)"
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
 msgstr ""
 
 #. module: multi_company
@@ -82,77 +47,17 @@ msgstr ""
 msgid "Returning"
 msgstr ""
 
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
 msgstr ""
 
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_in
-msgid "Sales Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_be
-msgid "Checks Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: view:multi_company.default:0
-msgid "Condition"
-msgstr ""
-
-#. module: multi_company
-#: model:product.category,name:multi_company.Odoo1
-msgid "Odoo Offers"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_us
-msgid "Expenses Credit Notes Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_us
-msgid "Cash Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_us
-msgid "Bank Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_in
-msgid "Sales Credit Note Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_be
-msgid "Cash Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_us
-msgid "Checks Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_be
-msgid "Sales Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_be
-msgid "Expenses Credit Notes Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_be
-msgid "Sales Credit Note Journal - (OpenERP BE)"
-msgstr ""
-
 #. module: multi_company
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
@@ -164,23 +69,21 @@ msgstr ""
 msgid "Odoo Offer"
 msgstr ""
 
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_in
-msgid "Expenses Credit Notes Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_in
-msgid "Bank Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_be
-msgid "Bank Journal - (OpenERP BE)"
-msgstr ""
-
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
 msgstr ""
 
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid "\n"
+"    Multicompany module is for managing a multicompany environment.\n"
+"    This module is the base module for other multicompany modules.\n"
+"    "
+msgstr ""
+
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index 31bb535cd3c..b333ec342ff 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/outlook/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-18 18:06+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
@@ -96,6 +95,8 @@ 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 adjuntar con cualquier elemento en OpenERP o crear uno de nuevo."
 
 #. module: outlook
 #: view:outlook.installer:0
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index ce7d8528bdc..1111fc6218e 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,8 +52,9 @@ msgid "Outlook Interface"
 msgstr ""
 
 #. module: outlook
-#: field:outlook.installer,config_logo:0
-msgid "Image"
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
 msgstr ""
 
 #. module: outlook
@@ -62,8 +63,16 @@ msgid "Outlook Plug-in "
 msgstr ""
 
 #. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid "\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
 msgstr ""
 
 #. module: outlook
@@ -83,6 +92,11 @@ msgstr ""
 msgid "Allows you to select an object that you’d like to add to your email and its attachments."
 msgstr ""
 
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
 #. module: outlook
 #: view:outlook.installer:0
 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."
@@ -104,9 +118,8 @@ msgid "Installation and Configuration Steps"
 msgstr ""
 
 #. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
+#: field:outlook.installer,config_logo:0
+msgid "Image"
 msgstr ""
 
 #. module: outlook
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index e4a8219317f..e00bb0d770c 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:58+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:58+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
 msgid "Companies"
@@ -38,8 +43,12 @@ msgid "Error! You can not create recursive companies."
 msgstr ""
 
 #. module: pad
-#: help:res.company,pad_index:0
-msgid "The root URL of the company's pad instance"
+#: model:ir.module.module,description:pad.module_meta_information
+msgid "\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
 msgstr ""
 
 #. module: pad
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index f588e67b4fd..38801fde47d 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-14 21:27+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-18 15:50+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-12-17 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -76,13 +75,13 @@ msgstr "Todas las cajas de efectivo del día:"
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Introducir dnero"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Análisis registro"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -551,14 +550,14 @@ msgstr "Registros de caja ya están cerrados."
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Código EAN no válido"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Abrir extractos"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -602,7 +601,7 @@ msgstr "Marzo"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr ""
+msgstr "Producto del usuario"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 46986564329..dd36b4c022f 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-15 04:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 21:57+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -35,7 +36,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr "Appliquer la Remise"
+msgstr "Appliquer la remise"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -45,7 +46,7 @@ msgstr "Mettre en brouillon"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Numéro du Produit"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -378,7 +379,7 @@ msgstr "Ventes par magasin"
 #: field:pos.order,date_payment:0
 #: field:report.pos.order,date_payment:0
 msgid "Payment Date"
-msgstr "Date de Paiement"
+msgstr "Date de paiement"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -722,7 +723,7 @@ msgstr "Total :"
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
 msgid "Create line failed !"
-msgstr ""
+msgstr "Échec de création de ligne !"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
@@ -734,7 +735,7 @@ msgstr "Nom du Produit"
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Action incorrecte !"
 
 #. module: point_of_sale
 #: field:pos.make.payment,pricelist_id:0
@@ -1218,7 +1219,7 @@ msgstr "Ventes par Utilisateur"
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
@@ -1305,7 +1306,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr "Commandes de Vente Point de Vente"
+msgstr "Commande de ventes PDV"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1421,7 +1422,7 @@ msgstr "Reçu"
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr "Créer une Facture"
+msgstr "Créer une facture"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -1704,7 +1705,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr "Nombre d'Articles"
+msgstr "Nb. d'articles"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
@@ -1725,7 +1726,7 @@ msgstr "Magasin"
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
 msgid "Last Output Picking"
-msgstr "Dernier Colisage Sortant"
+msgstr "Dernier colisage sortant"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
@@ -1831,7 +1832,7 @@ msgstr "Facture fournisseur"
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
 msgid "Modify line failed !"
-msgstr ""
+msgstr "Échec de modification de ligne !"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
@@ -2067,7 +2068,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index f490d80e071..c1f0dad4910 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:00+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:00+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:47+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -447,6 +447,11 @@ msgstr ""
 msgid "Codes"
 msgstr ""
 
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 #: view:pos.details:0
@@ -777,6 +782,11 @@ msgstr ""
 msgid "Draft Invoice"
 msgstr ""
 
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Product for expenses"
@@ -799,11 +809,6 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#. module: point_of_sale
-#: model:account.journal,name:point_of_sale.pos_bankcard_journal
-msgid "Bancontact Journal"
-msgstr ""
-
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
@@ -1165,6 +1170,20 @@ msgstr ""
 msgid "Connected Salesman"
 msgstr ""
 
+#. module: point_of_sale
+#: model:ir.module.module,description:point_of_sale.module_meta_information
+msgid "\n"
+"Main features :\n"
+" - Fast encoding of the sale.\n"
+" - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode.\n"
+" - Computation of the amount of money to return.\n"
+" - Create and confirm picking list automatically.\n"
+" - Allow the user to create invoice automatically.\n"
+" - Allow to refund former sales.\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
@@ -1256,11 +1275,6 @@ msgstr ""
 msgid "Point of Sale Payment"
 msgstr ""
 
-#. module: point_of_sale
-#: view:pos.box.out:0
-msgid "Output Operation"
-msgstr ""
-
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
@@ -1808,11 +1822,6 @@ msgstr ""
 msgid "Discount "
 msgstr ""
 
-#. module: point_of_sale
-#: model:account.journal,name:point_of_sale.pos_visa_journal
-msgid "Visa Journal"
-msgstr ""
-
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Invoice"
@@ -1946,6 +1955,11 @@ msgstr ""
 msgid "Invoiced"
 msgstr ""
 
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Must be after setLang()"
+msgstr ""
+
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index 0f17ce06f6f..b5e1a770b9f 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -1,20 +1,20 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 15:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-17 17:31+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -56,7 +56,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Hôm nay"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -146,12 +146,12 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "VAT"
-msgstr ""
+msgstr "Thuế GTGT"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tax"
-msgstr ""
+msgstr "Thuế"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
@@ -167,30 +167,30 @@ msgstr ""
 #: report:account.statement:0
 #: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total of the day"
-msgstr ""
+msgstr "Tổng trong ngày"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Giá TB"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Tổng chiết khấu"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -212,26 +212,26 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Bán hàng theo tháng"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "Bán hàng theo người sử dụng"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 #: report:pos.payment.report:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Tham chiếu"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -248,7 +248,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "Báo cáo Bán hàng"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:0
@@ -259,7 +259,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Thông tin khác"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -275,7 +275,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "Chiết khấu tối đa (%)"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -302,7 +302,7 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
@@ -313,17 +313,17 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr ""
+msgstr "Tổng số lượng"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Bán hàng hàng tháng theo người dùng"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:0
@@ -352,7 +352,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Vận hành hàng ngày"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -368,13 +368,13 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -385,7 +385,7 @@ msgstr ""
 #: field:pos.order,date_payment:0
 #: field:report.pos.order,date_payment:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Ngày thanh toán"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -397,7 +397,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -408,12 +408,12 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Tóm tắt"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Các báo giá"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
@@ -428,7 +428,7 @@ msgstr ""
 #: field:report.sales.by.user.pos,qty:0
 #: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Số lượng"
 
 #. module: point_of_sale
 #: help:account.journal,auto_cash:0
@@ -466,7 +466,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "In Báo cáo"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -476,7 +476,7 @@ msgstr ""
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Đơn giá"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:0
@@ -491,7 +491,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Thêm sản phẩm"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -515,14 +515,14 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "ĐT :"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Thanh toán"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -557,7 +557,7 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Lỗi: mã EAN không hợp lệ"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -602,7 +602,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
@@ -810,7 +810,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: point_of_sale
 #: model:account.journal,name:point_of_sale.pos_bankcard_journal
@@ -858,7 +858,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: point_of_sale
 #: field:pos.order,num_sale:0
@@ -868,7 +868,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Các công ty"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -1060,7 +1060,7 @@ msgstr ""
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1146,7 +1146,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 msgid "Products"
-msgstr ""
+msgstr "Các sản phẩm"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
@@ -1246,7 +1246,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
@@ -1512,7 +1512,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
@@ -1706,7 +1706,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -1901,7 +1901,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2051,7 +2051,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -2062,7 +2062,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -2238,7 +2238,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2267,7 +2267,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index 22aff29001e..0290a1bdec3 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2008-10-22 15:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-18 14:47+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -21,19 +21,19 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr ""
+msgstr "Noeud de processus"
 
 #. module: process
 #: help:process.process,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr ""
+msgstr "Décocher le champ \"actif\" masque le processus sans le supprimer."
 
 #. module: process
 #: field:process.node,menu_id:0
 msgid "Related Menu"
-msgstr "Menu Relatif"
+msgstr "Menu associé"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -44,7 +44,7 @@ msgstr "Boutons"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -54,12 +54,12 @@ msgstr "État"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr ""
+msgstr "Genre de noeud"
 
 #. module: process
 #: field:process.node,help_url:0
 msgid "Help URL"
-msgstr ""
+msgstr "URL de l'aide"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -67,7 +67,7 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr ""
+msgstr "Noeuds de processus"
 
 #. module: process
 #: view:process.process:0
@@ -80,17 +80,17 @@ msgstr "Nœuds"
 #: field:process.node,condition_ids:0
 #: view:process.process:0
 msgid "Conditions"
-msgstr ""
+msgstr "Conditions"
 
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "Rechercher dans les transitions de processus"
 
 #. module: process
 #: field:process.condition,node_id:0
 msgid "Node"
-msgstr ""
+msgstr "Nœud"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -105,7 +105,7 @@ msgstr "Description"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Actions des transitions de processus"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -119,7 +119,7 @@ msgstr "Objet"
 #. module: process
 #: field:process.transition,source_node_id:0
 msgid "Source Node"
-msgstr ""
+msgstr "Noeud source"
 
 #. module: process
 #: view:process.transition:0
@@ -136,12 +136,12 @@ msgstr "ID de l'Action"
 #: model:ir.model,name:process.model_process_transition
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Transition du processus"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
 msgid "Condition"
-msgstr ""
+msgstr "Condition"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -152,7 +152,7 @@ msgstr "Factice"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "Processus"
 
 #. module: process
 #: field:process.condition,name:0
@@ -161,7 +161,7 @@ msgstr ""
 #: field:process.transition,name:0
 #: field:process.transition.action,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: process
 #: field:process.node,transition_in:0
@@ -185,7 +185,7 @@ msgstr "Transition"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "Rechercher dans les processus"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -201,12 +201,12 @@ msgstr "Actif"
 #. module: process
 #: view:process.transition:0
 msgid "Associated Groups"
-msgstr ""
+msgstr "Groupes associés"
 
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
-msgstr ""
+msgstr "Expression d'états"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -221,18 +221,18 @@ msgstr "Flux de Départ"
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
-msgstr ""
+msgstr "Expression"
 
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr ""
+msgstr "Groupes nécessaires"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transitions entrantes"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -249,24 +249,24 @@ msgstr "Transitions finales"
 #: field:process.node,process_id:0
 #: view:process.process:0
 msgid "Process"
-msgstr ""
+msgstr "Processus"
 
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "Rechercher dans les noeuds de processus"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Autres conditions"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
 #: model:ir.ui.menu,name:process.menu_process
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Processus de la société"
 
 #. module: process
 #: view:process.transition:0
@@ -277,18 +277,18 @@ msgstr "Actions"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Properties"
-msgstr ""
+msgstr "Propriétés"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr ""
+msgstr "Transitions de processus"
 
 #. module: process
 #: field:process.transition,target_node_id:0
 msgid "Target Node"
-msgstr ""
+msgstr "Noeud cible"
 
 #. module: process
 #: field:process.node,kind:0
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 8a310dcbe0d..61e77ec57ab 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:01+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:01+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -215,6 +215,19 @@ msgstr ""
 msgid "Starting Flow"
 msgstr ""
 
+#. module: process
+#: model:ir.module.module,description:process.module_meta_information
+msgid "\n"
+"     This module shows the basic processes involved\n"
+"     in the selected modules and in the sequence they\n"
+"     occur\n"
+"\n"
+"     Note: This applies to the modules containing modulename_process_xml\n"
+"     for e.g product/process/product_process_xml\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
new file mode 100644
index 00000000000..d2b8f75dd2d
--- /dev/null
+++ b/addons/process/i18n/sk.po
@@ -0,0 +1,316 @@
+# Slovak 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-17 22:33+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
+"Language-Team: Slovak <sk@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: 2010-12-18 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: process
+#: model:ir.model,name:process.model_process_node
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr "Uzol procesu"
+
+#. module: process
+#: help:process.process,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the process "
+"without removing it."
+msgstr ""
+"Ak je aktívne pole nastavené na False, umožní Vám schovať proces bez jeho "
+"odtránenia."
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Súvisiace menu"
+
+#. module: process
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr "Tlačidlá"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Group By..."
+msgstr "Zoskupiť podľa..."
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "State"
+msgstr "Stav"
+
+#. module: process
+#: view:process.node:0
+msgid "Kind Of Node"
+msgstr "Druh uzla"
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "URL pomocníka"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr "Uzly procesu"
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr "Uzly"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr "Podmienky"
+
+#. module: process
+#: view:process.transition:0
+msgid "Search Process Transition"
+msgstr "Hľadať prechod procesu"
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr "Uzol"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr "Spúšťač pracovného toku"
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr "Akcie prechodov procesu"
+
+#. module: process
+#: field:process.condition,model_id:0
+#: view:process.node:0
+#: field:process.node,model_id:0
+#: view:process.process:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr "Zdrojový uzol"
+
+#. module: process
+#: view:process.transition:0
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr "Prechody pracovného toku"
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr "ID akcie"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr "Prechod procesu"
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+msgid "Condition"
+msgstr "Podmienka"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr "Prázdny"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr "Procesy"
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr "Meno"
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr "Začínajúce prechody"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,note:0
+#: view:process.process:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr "Poznámky"
+
+#. module: process
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr "Prechod"
+
+#. module: process
+#: view:process.process:0
+msgid "Search Process"
+msgstr "Hľadať proces"
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr "Vnorený tok"
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr "Aktívny"
+
+#. module: process
+#: view:process.transition:0
+msgid "Associated Groups"
+msgstr "Priradené skupiny"
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr "Vyjadruje výraz"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr "Akcia"
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr "Začínajúci tok"
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr "Výraz"
+
+#. module: process
+#: field:process.transition,group_ids:0
+msgid "Required Groups"
+msgstr "Vyžadované skupiny"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Incoming Transitions"
+msgstr "Prichádzajúce prechody"
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Ukončujúce prechody"
+
+#. module: process
+#: model:ir.model,name:process.model_process_process
+#: field:process.node,process_id:0
+#: view:process.process:0
+msgid "Process"
+msgstr "Proces"
+
+#. module: process
+#: view:process.node:0
+msgid "Search ProcessNode"
+msgstr "Hľadať uzol procesu"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Other Conditions"
+msgstr "Iné podmienky"
+
+#. module: process
+#: model:ir.module.module,shortdesc:process.module_meta_information
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Process"
+msgstr "Podnikový proces"
+
+#. module: process
+#: view:process.transition:0
+msgid "Actions"
+msgstr "Akcie"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr "Prechody procesu"
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr "Cieľový uzol"
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr "Druh uzla"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr "Odchádzajúce prechody"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr "Prechody"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr "Metóda objektu"
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index ed3cc575c97..0e3977eb323 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:19+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 22:02+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -440,6 +440,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Si el campo activo es falso, le permitirá ocultar el punto de pedido sin "
+"eliminarlo."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -881,7 +883,7 @@ msgstr "Muy urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Punto de pedido automático"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index eba6cbe6f78..83466395e66 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -7,24 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-04 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 15:43+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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr ""
+msgstr "Planificateurs"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr ""
+msgstr "Réaliser les approvisionnements"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -81,6 +82,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"Un ordre d'approvisionnement est utilisé pour enregistrer un besoin sur un "
+"produit donné dans un emplacement donné. Ils sont en général créés "
+"automatiquement par les commandes de vente, les règles de flux tirés ou les "
+"règles de stock minimum. Quand l'ordre d'approvisionnement est confirmé, il "
+"génère automatiquement les opérations nécessaires pour remplir le besoin : "
+"proposition de bon de commande, ordre de fabrication, etc..."
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -117,7 +124,7 @@ msgstr "Non utilisé dans les calculs, pour information seulement."
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr ""
+msgstr "Dernier approvisionnement"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -128,6 +135,8 @@ msgstr "Remarques"
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
 msgstr ""
+"Une exception s'est produite pendant le calcul des ordres "
+"d'approvisionnement."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -141,11 +150,18 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Quand un approvisionnement est créé, l'état est à \"Brouillon\".\n"
+" Si l'approvisionnement est confirmé, l'état passe à \"Confirmé\".\n"
+"Après validation, l'état est \"En cours\".\n"
+" Si une exception se produit pour l'ordre, l'état passe à \"Exception\".\n"
+" Une fois que l'exception est levée, l'état devient \"Prêt\".\n"
+" L'état est à \"En attente\" quand l'ordre attend un autre approvisionnement "
+"pour se terminer."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules Search"
-msgstr ""
+msgstr "Rechercher dans les règles de stock minimum"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -153,6 +169,8 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Lorsque le stock virtuel passe sous la quantité min, OpenERP génère un "
+"approvisionnement de telle sorte à faire remonter le stock à la quantité max."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
@@ -206,6 +224,9 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Référence du document qui est à l'origine de la création de cet "
+"approvisionnement.\n"
+"Ce champ est alimenté automatiquement par OpenERP."
 
 #. module: procurement
 #: constraint:res.company:0
@@ -233,7 +254,7 @@ msgstr "Emplacement"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Liste de prélèvement"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
@@ -252,6 +273,12 @@ msgid ""
 "OpenERP will generate a procurement request in order to fullfil the stock up "
 "to the maximum quantity."
 msgstr ""
+"Vous pouvez définir vos règles de stock minimum, de telle façon qu'OpenERP "
+"déclenche les propositions de bon de commande ou les ordre de fabrication en "
+"fonction du niveau de stock. Lorsque le stock virtuel (=le stock disponible "
+"moins tous les ordres confirmés et les réservations) passe sous la quantité "
+"minimale, OpenERP va générer une demande d'approvisionnement pour remonter "
+"le stock jusqu'à la quantité maximale."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
@@ -266,7 +293,7 @@ msgstr "Produit & Emplacement"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
-msgstr ""
+msgstr "Calculer les approvisionnements"
 
 #. module: procurement
 #: model:ir.module.module,shortdesc:procurement.module_meta_information
@@ -277,7 +304,7 @@ msgstr "Approvisionnements"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Plage de planification (en jours)"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -304,7 +331,7 @@ msgstr "Quantité"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
+msgstr "Pas assez de stock, et aucun point de commande minimum défini."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -333,11 +360,13 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Si vous saisissez manuellement un approvisionnement, vous voulez "
+"probablement utiliser une méthode de fabrication à la commande."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Approvisionnements automatiques"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -359,7 +388,7 @@ msgstr "Ordre d'Approvisionnement"
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "À réparer"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -370,6 +399,7 @@ msgstr "Exceptions"
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
 msgstr ""
+"Affectation à partir d'un ordre de fabrication ou d'un bon de commande."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -380,12 +410,12 @@ msgstr "Propriété"
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
 #: view:make.procurement:0
 msgid "Procurement Request"
-msgstr ""
+msgstr "Demande d'approvisionnement"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Calculer le stock"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -419,6 +449,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Veuillez vérifier la quantité de l'ordre d'approvisionnement : elle ne "
+"devrait pas être inférieure à 1 !"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -433,6 +465,8 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Lorsque le stock virtuel dépasse la quantité max, OpenERP génère un "
+"approvisionnement de façon à ramener le stock virtuel à la quantité max."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -456,6 +490,12 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"Cet assistant vous permet de lancer tous les approvisionnements, ainsi que "
+"les ordres d'achat et/ou de fabrication qui doivent être gérés en fonction "
+"de leur configuration. Par défaut, le calcul des besoins est lancé toutes "
+"les nuits par OpenERP. Vous pouvez utiliser ce menu pour forcer le lancement "
+"immédiatement. Veuillez noter qu'il tourne en tâche de fond, il faudra peut-"
+"être attendre quelques minutes pour que le calcul soit terminé."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -511,6 +551,10 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for futur computation."
 msgstr ""
+"Ceci est l'intervalle de temps analysé par le calcul des besoins lors du "
+"calcul des approvisionnements. Tous les approvisionnements qui ne se situent "
+"pas entre \"aujourd'hui\" et \"aujourd'hui + intervalle\" sont ignorés lors "
+"des calculs."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -535,7 +579,7 @@ msgstr "Approvisionner les produits"
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Date planifiée"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -551,7 +595,7 @@ msgstr "OP automatique : %s"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Point de commande automatique"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -571,7 +615,7 @@ msgstr "Informations supplémentaires"
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "Nom de l'approvisionnement."
 
 #. module: procurement
 #: constraint:stock.move:0
@@ -588,7 +632,7 @@ msgstr "Motif de l'approvisionnement"
 #: sql_constraint:stock.warehouse.orderpoint:0
 #, python-format
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Le multiple de la quantité doit être plus grand que zéro."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
@@ -605,6 +649,7 @@ msgstr ""
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
 msgstr ""
+"L'approvisionnement \"%s\" a provoqué une exception : pas assez de stock."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -650,7 +695,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Lancer l'approvisionnement"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -661,6 +706,8 @@ msgstr "Terminé"
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
 msgstr ""
+"La quantité de l'approvisionnement sera arrondie vers le haut jusqu'à ce "
+"multiple."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -675,7 +722,7 @@ msgstr "Annuler"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Mode de réapprovisionnement"
 
 #. module: procurement
 #: field:procurement.order,origin:0
@@ -690,7 +737,7 @@ msgstr ""
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Lancer tous les planificateurs"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -700,7 +747,7 @@ msgstr "Actuel"
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Besoins en exception"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -723,7 +770,7 @@ msgstr "Approvisionnements en exception"
 #: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Règles du stock minimum"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
@@ -762,7 +809,7 @@ msgstr "min"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Règles de quantité"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -810,11 +857,14 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Cet assistant va planifier l'approvisionnement pour ce produit. Cet "
+"approvisionnement pourra générer une tâche, des ordres de fabrication ou "
+"d'achat."
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "Planificateur du MRP et de la logistique"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -836,20 +886,22 @@ msgstr ""
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "à partir du stock : produits affectés."
 
 #. 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 ""
+msgstr "Lancer les planificateurs"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"L'assistant vérifie toutes les règles de stock minimum et génère les ordres "
+"d'approvisionnement."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -859,7 +911,7 @@ msgstr "UdM du produit"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr ""
+msgstr "Rechercher dans les approvisionnements"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -869,7 +921,7 @@ msgstr "Très urgent"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Point de commande automatique"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -880,7 +932,7 @@ msgstr "Détails de l'approvisionnement"
 #: code:addons/procurement/schedulers.py:0
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "PLANIFICATEUR"
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "La taille du champ ne doit jamais être inférieure à 1 !"
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 4c302d5bb74..92b93e249e0 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "Group By..."
 msgstr ""
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Planification"
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
 #. module: procurement
@@ -149,6 +149,11 @@ msgstr ""
 msgid "Stock Move"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Ready"
@@ -191,6 +196,11 @@ 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."
@@ -373,6 +383,18 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid "\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
@@ -522,9 +544,7 @@ msgid "Procurement Reason"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
 #: sql_constraint:stock.warehouse.orderpoint:0
-#, python-format
 msgid "Qty Multiple must be greater than zero."
 msgstr ""
 
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 7ad77facb0d..29eb9fc8ebe 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 13:28+0000\n"
+"PO-Revision-Date: 2010-12-17 22:30+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2010-12-17 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index ca590d8fa4e..1b2d7c93466 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -119,11 +119,11 @@ class procurement_order(osv.osv):
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
-        'state': lambda *a: 'draft',
-        'priority': lambda *a: '1',
+        'state': 'draft',
+        'priority': '1',
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'close_move': lambda *a: 0,
-        'procure_method': lambda *a: 'make_to_order',
+        'close_move': 0,
+        'procure_method': 'make_to_order',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c)
     }
 
@@ -488,6 +488,16 @@ class stock_warehouse_orderpoint(osv.osv):
     _name = "stock.warehouse.orderpoint"
     _description = "Minimum Inventory Rule"
 
+    def _get_draft_procurements(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
+        result = {}
+        procurement_obj = self.pool.get('procurement.order')
+        for orderpoint in self.browse(cr, uid, ids, context=context):
+            procurement_ids = procurement_obj.search(cr, uid , [('state', '=', 'draft'), ('product_id', '=', orderpoint.product_id.id), ('location_id', '=', orderpoint.location_id.id)])
+            result[orderpoint.id] = procurement_ids
+        return result
+
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the orderpoint without removing it."),
@@ -506,6 +516,8 @@ class stock_warehouse_orderpoint(osv.osv):
             help="The procurement quantity will by rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
+        'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \
+                                string="Related Procurement Orders",help="Draft procurement of the product and location of that orderpoint"),
     }
     _defaults = {
         'active': lambda *a: 1,
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 2cc3b4c199f..4fd723e118e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -4,7 +4,7 @@
 		<!--
         Procurement
         -->
-		
+
 
         <record id="procurement_tree_view" model="ir.ui.view">
             <field name="name">procurement.order.tree</field>
@@ -63,10 +63,10 @@
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
-                        <field name="product_uom" widget="selection"/>
+                        <field name="product_uom"/>
 
                         <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/>
-                        <field name="product_uos" widget="selection" groups="product.group_uos,base.group_extended"/>
+                        <field name="product_uos"  groups="product.group_uos,base.group_extended"/>
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
@@ -145,7 +145,7 @@
             <field name="search_view_id" ref="view_procurement_filter"/>
             <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or 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)</field>
         </record>
-        
+
         <record id="procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
@@ -224,6 +224,10 @@
                         <field name="procurement_id" readonly="1"/>
                         <field name="active" />
                     </group>
+                    <group col="4" colspan="4" groups="base.group_extended">
+                        <separator string="Procurement Orders to Process" colspan="4" />
+                        <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -238,11 +242,11 @@
             <field name="help">You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity.</field>
         </record>
 
-        <act_window 
+        <act_window
         context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules" 
-        res_model="stock.warehouse.orderpoint" 
+        name="Minimum Stock Rules"
+        res_model="stock.warehouse.orderpoint"
         src_model="stock.warehouse"/>
 
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 9c83499f0a5..3a6e3336472 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -34,14 +34,14 @@ class procurement_order(osv.osv):
     def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
         '''
         Call the scheduler to check the procurement order
-        
+
         @param self: The object pointer
         @param cr: The current row, from the database cursor,
         @param uid: The current user ID for security checks
         @param ids: List of selected IDs
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
-        @return:  Dictionary of values        
+        @return:  Dictionary of values
         '''
         if context is None:
             context = {}
@@ -50,7 +50,7 @@ class procurement_order(osv.osv):
             if use_new_cursor:
                 cr = pooler.get_db(use_new_cursor).cursor()
             wf_service = netsvc.LocalService("workflow")
-    
+
             procurement_obj = self.pool.get('procurement.order')
             if not ids:
                 ids = procurement_obj.search(cr, uid, [], order="date_planned")
@@ -112,13 +112,13 @@ class procurement_order(osv.osv):
             if uid:
                 request = self.pool.get('res.request')
                 summary = '''Here is the procurement scheduling report.
-    
+
         Start Time: %s
         End Time: %s
         Total Procurements processed: %d
         Procurements with exceptions: %d
         Skipped Procurements (scheduled date outside of scheduler range) %d
-    
+
         Exceptions:\n'''% (start_date, end_date, report_total, report_except, report_later)
                 summary += '\n'.join(report)
                 request.create(cr, uid,
@@ -141,7 +141,7 @@ class procurement_order(osv.osv):
     def create_automatic_op(self, cr, uid, context=None):
         """
         Create procurement of  virtual stock < 0
-        
+
         @param self: The object pointer
         @param cr: The current row, from the database cursor,
         @param uid: The current user ID for security checks
@@ -157,7 +157,9 @@ class procurement_order(osv.osv):
 
         warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
 
-        cr.execute('select id from product_product')
+        cr.execute('select p.id from product_product p \
+                        join product_template t on (p.product_tmpl_id=t.id) \
+                        where p.active=True and t.purchase_ok=True')
         products_id = [x for x, in cr.fetchall()]
 
         for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
@@ -191,14 +193,14 @@ class procurement_order(osv.osv):
         '''
         Create procurement based on Orderpoint
         use_new_cursor: False or the dbname
-        
+
         @param self: The object pointer
         @param cr: The current row, from the database cursor,
         @param user_id: The current user ID for security checks
         @param context: A standard dictionary for contextual values
         @param param: False or the dbname
         @return:  Dictionary of values
-        """        
+        """
         '''
         if context is None:
             context = {}
@@ -216,23 +218,42 @@ class procurement_order(osv.osv):
             self.create_automatic_op(cr, uid, context=context)
         while ids:
             ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
-            for op in orderpoint_obj.browse(cr, uid, ids):
+            for op in orderpoint_obj.browse(cr, uid, ids, context=context):
                 if op.procurement_id.state != 'exception':
                     if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
                         continue
                 prods = location_obj._product_virtual_get(cr, uid,
                         op.location_id.id, [op.product_id.id],
                         {'uom': op.product_uom.id})[op.product_id.id]
+
                 if prods < op.product_min_qty:
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
+
                     reste = qty % op.qty_multiple
                     if reste > 0:
                         qty += op.qty_multiple - reste
+
                     newdate = datetime.today() + relativedelta(
                             days = int(op.product_id.seller_delay))
                     if qty <= 0:
                         continue
                     if op.product_id.type not in ('consu'):
+                        if op.procurement_draft_ids:
+                        # Check draft procurement related to this order point
+                            pro_ids = [x.id for x in op.procurement_draft_ids]
+                            cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
+                            procure_datas = cr.dictfetchall()
+                            to_generate = qty
+                            for proc_data in procure_datas:
+                                if to_generate >= proc_data['product_qty']:
+                                    wf_service.trg_validate(uid, 'procurement.order', proc_data['id'], 'button_confirm', cr)
+                                    procurement_obj.write(cr, uid, [proc_data['id']],  {'origin': op.name}, context=context)
+                                    to_generate -= proc_data['product_qty']
+                                if not to_generate:
+                                    break
+                            qty = to_generate
+
+                    if qty:
                         proc_id = procurement_obj.create(cr, uid, {
                             'name': op.name,
                             'date_planned': newdate.strftime('%Y-%m-%d'),
@@ -248,7 +269,7 @@ class procurement_order(osv.osv):
                         wf_service.trg_validate(uid, 'procurement.order', proc_id,
                                 'button_check', cr)
                         orderpoint_obj.write(cr, uid, [op.id],
-                                {'procurement_id': proc_id})
+                                {'procurement_id': proc_id}, context=context)
             offset += len(ids)
             if use_new_cursor:
                 cr.commit()
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index e2e2fb1a272..35baa4bf646 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-05 10:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 19:58+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: 2010-12-17 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -61,6 +62,9 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Erreur !  Dans cette ligne de liste de prix, si vous souhaitez baser le "
+"calcul sur une liste de prix, ce doit être une autre liste de prix que la "
+"liste de prix principale !"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -117,6 +121,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Cette liste de prix sera utilisée, à la place de la liste par défaut, pour "
+"les ventes faites au partenaire actuel."
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -124,11 +130,13 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Erreur : l'UdM par défaut et l'UdM du fournisseur doivent appartenir à la "
+"même catégorie."
 
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Quantité fournisseur"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -250,6 +258,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Détermine si le produit est visible dans la liste des produits lors des "
+"sélections pour les lignes de commandes de vente."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -276,7 +286,7 @@ msgstr "Type de produit"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  par exemple : 1 x (cette unité) = ratio x (unité de référence)"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -313,7 +323,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Nom du fournisseur, prix, code du produit, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -384,7 +394,7 @@ msgstr "État"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Sélectionnez la catégorie du produit actuel"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -430,7 +440,7 @@ msgstr "PC Moyen"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Chercher des prix de produits"
 
 #. module: product
 #: view:product.product:0
@@ -535,6 +545,8 @@ msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Aucune version active pour la liste de prix sélectionnée !\n"
+"Veuillez créer ou activer une liste."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -576,6 +588,8 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Les conversions de quantité peuvent s'effectuer automatiquement entre des "
+"unités de mesure de la même catégorie, selon leurs rapports respectifs."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -600,7 +614,7 @@ msgstr "Modèles des produits"
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Frais de restaurant"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -652,7 +666,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "Étagère de 100 cm en kit"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -697,7 +711,7 @@ msgstr "Fournisseurs"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "À acheter"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -738,6 +752,11 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Utilisé par les sociétés qui gèrent deux unités de mesure : une pour la "
+"facturation, une pour la gestion de stock. Par exemple, dans l'industrie "
+"agroalimentaire : on peut gérer en stock des jambons en nombre de pièces "
+"mais les facturer au poids. Laissez ce champ vide pour utiliser l'UdM par "
+"défaut."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -819,12 +838,12 @@ msgstr "En développement"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Étagère de 200 cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Ratio & précision"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -868,7 +887,7 @@ msgstr "Catégories de produits"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  par exemple : 1 x (unité de référence) = ratio x (cette unité)"
 
 #. module: product
 #: view:product.product:0
@@ -892,6 +911,8 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Coût du produit pour la valorisation comptable du stock. Sert de base pour "
+"le prix fournisseur."
 
 #. module: product
 #: view:product.price.type:0
@@ -938,6 +959,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Délai (en jours) entre la confirmation du bon de commande et la réception "
+"des produits dans votre entrepôt. Sert au planificateur à calculer le "
+"planning des achats automatiquement."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -948,6 +972,12 @@ msgid ""
 "version has several rules. Example: the customer price of this category of "
 "product will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"Une liste de prix regroupe les règles à suivre pour calculer le prix "
+"(d'achat ou de vente) pour tous les partenaires associés à la liste. Les "
+"liste de prix ont plusieurs versions (ex. : \"2010\", \"2011\", \"Promotions "
+"de février 2010\", etc...) et chaque version contient plusieurs règles. "
+"Exemple : \"le prix de vente pour cette catégorie de produit est basé sur le "
+"prix du fournisseur multiplié par 1,80\"."
 
 #. module: product
 #: selection:product.template,type:0
@@ -968,6 +998,7 @@ msgstr "Seq"
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
 msgstr ""
+"Calculer le prix du produit par unité selon cette version de liste de prix"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1038,7 +1069,7 @@ msgstr "Produits & Liste de prix"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "À vendre"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1057,6 +1088,9 @@ msgid ""
 "You can define a conversion rate to be used between the several Unit of "
 "Measure within the same category."
 msgstr ""
+"Créez et gérez les unités de mesure à utiliser dans le système. Vous pouvez "
+"définir un taux de conversion à utiliser entre plusieurs unités de mesure de "
+"la même catégorie."
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1121,7 +1155,7 @@ msgstr ""
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Donne l'ordre d'affichage d'une liste de catégories de produit."
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1189,6 +1223,8 @@ msgstr ""
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
 msgstr ""
+"Fournisseur principal qui a la plus haute priorité dans la liste des "
+"fournisseurs."
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1213,7 +1249,7 @@ msgstr "Produits"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Le nombre de niveaux dans une palette ou dans une caisse."
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1249,6 +1285,9 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Ceci est le délai moyen (en jours) entre la confirmation de la commande "
+"client et la livraison des produits finis. C'est le délai promis à vos "
+"clients."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1258,6 +1297,10 @@ msgid ""
 "be converted within each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"Créez et gérez les catégories d'unités de mesure à utiliser dans votre "
+"système. Si plusieurs unités de mesure appartiennent à la même catégorie, "
+"elles peuvent être converties entre elles. Par exemple : dans la catégorie "
+"d'unité de mesure \"Temps\", vous aurez les UdM suivantes : heures, jours."
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -1340,6 +1383,9 @@ msgid ""
 "a category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Voici la liste de tous vos produits classés par catégorie. Vous pouvez "
+"cliquer sur une catégorie pour obtenir la liste de tous les produits de "
+"cette catégorie, ou de ses sous-catégories."
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1377,6 +1423,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Délai moyen (en jours) pour fabriquer ce produit. Sert uniquement aux ordres "
+"de fabrication. Pour les nomenclatures multi-niveaux, sert uniquement pour "
+"le niveau de ce produit. Les différents délais de fabrication seront "
+"additionnés pour tous les niveaux et tous les ordres d'achat."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1452,7 +1502,7 @@ msgstr "Le poids de l'UL vide"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Plus petit que l'UdM de référence"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1471,7 +1521,7 @@ msgstr "Marge de la variante"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Le rapport de conversion d'une unité de mesure ne peut pas être 0 !"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1499,6 +1549,9 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"De combien cette UdM est plus petite que l'UdM de référence dans cette "
+"catégorie :\n"
+"1 x (unité de référence) = ratio x (cette unité)"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1549,7 +1602,7 @@ msgstr "Liste de prix publique"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Produits vendables"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
@@ -1619,7 +1672,7 @@ msgstr "Catégories de produits"
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Affecte la priorité du fournisseur du produit dans la liste."
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -1723,7 +1776,7 @@ msgstr ""
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Ce produit est paramétré avec un exemple de flux tiré / flux poussé"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1733,7 +1786,7 @@ msgstr "Longueur"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Longueur/distance"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1789,6 +1842,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Stock prévisionnel de ce produit dans les emplacement sélectionnés, ou dans "
+"tous les emplacements internes si aucun n'a été sélectionné. Formule de "
+"calcul : stock réel - sorties + entrées."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1816,6 +1872,7 @@ msgstr "* ( 1 + "
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
 msgstr ""
+"Le poids d'un colis, d'une palette ou d'une caisse lorsqu'il est plein"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1854,6 +1911,8 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"En décochant le champ actif, vous pouvez désactiver l'unité de mesure sans "
+"la supprimer."
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -1871,6 +1930,8 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Créez et gérez les dimensions et les types des emballages à utiliser dans le "
+"système."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -1934,7 +1995,7 @@ msgstr "Type d'UdM"
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Ceci définit le responsable de la tâche"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1942,6 +2003,8 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"La quantité calculée sera un multiple de cette valeur. Utilisez 1,0 pour une "
+"UdM qui ne peut pas être divisée, par exemple : \"une pièce\"."
 
 #. module: product
 #: view:product.product:0
@@ -1986,6 +2049,9 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"De combien cette unité est plus grande que l'UdM de référence de cette "
+"catégorie :\n"
+"1 x (cette unité) = ratio x (unité de référence)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -1995,7 +2061,7 @@ msgstr "Casier de 100 cm"
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "Donne l'ordre d'affichage d'une liste d'emballages."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -2013,6 +2079,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Le nom du produit chez le fournisseur sera utilisé lors de l'impression d'un "
+"appel d'offre. Laissez le champ vide si vous voulez utiliser le nom interne."
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -2020,6 +2088,8 @@ msgid ""
 "The minimal quantity to purchase to this supplier, expressed in the default "
 "unit of measure."
 msgstr ""
+"La quantité minimum d'achat chez ce fournisseur, exprimée dans l'unité de "
+"mesure par défaut."
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -2138,6 +2208,8 @@ msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Impossible de parcourir la catégorie de produit : il y a une boucle dans la "
+"définition des catégories de produits !"
 
 #. module: product
 #: view:product.template:0
@@ -2214,6 +2286,9 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Indique les différentes façons d'emballer un même produit. Ceci n'a pas "
+"d'impact sur les ordres de préparation, et sert principalement si vous "
+"activez le module d'EDI."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2251,6 +2326,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Coefficient de conversion pour passer de l'UdM à l'UdV\n"
+" UdV = UdM x coeff"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
@@ -2269,6 +2346,10 @@ msgid ""
 "versions of a pricelist, you can do it and manage them from here. Some "
 "examples of versions: 2010, 2011, Promotion of February 2010, etc."
 msgstr ""
+"Il peut y avoir plusieurs versions d'une même liste de prix. Si vous avez "
+"besoin de créer de nouvelles versions d'une liste de prix, vous pouvez le "
+"faire et le gérer d'ici. Exemples de versions : \"2010\", \"2011\", "
+"\"promotions de février 2010\", etc..."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 0583959553b..36644321589 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -132,6 +132,11 @@ msgstr ""
 msgid "Error ! You can not create recursive categories."
 msgstr ""
 
+#. module: product
+#: help:pricelist.partnerinfo,min_quantity:0
+msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise."
+msgstr ""
+
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
@@ -179,7 +184,6 @@ msgid "PriceList"
 msgstr ""
 
 #. module: product
-#: field:product.supplierinfo,product_uom:0
 #: view:product.template:0
 msgid "UOM"
 msgstr ""
@@ -237,11 +241,6 @@ msgstr ""
 msgid "Products: "
 msgstr ""
 
-#. module: product
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
@@ -445,6 +444,11 @@ msgstr ""
 msgid "Codes"
 msgstr ""
 
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid "Choose here the Unit of Measure in which the prices and quantities are expressed below."
+msgstr ""
+
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
@@ -633,14 +637,19 @@ msgstr ""
 msgid "Mainboard ASUStek A7N8X"
 msgstr ""
 
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."
+msgstr ""
+
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
 msgstr ""
 
 #. module: product
-#: help:product.pricelist.item,sequence:0
-msgid "Gives the sequence order when displaying a list of pricelist items."
+#: help:pricelist.partnerinfo,price:0
+msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise"
 msgstr ""
 
 #. module: product
@@ -1059,6 +1068,28 @@ msgstr ""
 msgid "Unit of Sale"
 msgstr ""
 
+#. module: product
+#: model:ir.module.module,description:product.module_meta_information
+msgid "\n"
+"    This is the base module for managing products and pricelists in OpenERP.\n"
+"\n"
+"    Products support variants, different pricing methods, suppliers\n"
+"    information, make to stock/order, different unit of measures,\n"
+"    packaging and properties.\n"
+"\n"
+"    Pricelists support:\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist,\n"
+"        * Cost price,\n"
+"        * List price,\n"
+"        * Supplier price, ...\n"
+"    Pricelists preferences by product and/or partners.\n"
+"\n"
+"    Print product labels with barcode.\n"
+"    "
+msgstr ""
+
 #. module: product
 #: help:product.template,seller_delay:0
 msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."
@@ -1176,6 +1207,11 @@ msgstr ""
 msgid "Price List Version"
 msgstr ""
 
+#. module: product
+#: help:product.pricelist.item,sequence:0
+msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."
+msgstr ""
+
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
@@ -1457,6 +1493,11 @@ msgstr ""
 msgid "Make to Order"
 msgstr ""
 
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr ""
+
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
@@ -1560,8 +1601,8 @@ msgid "Name of this kind of price."
 msgstr ""
 
 #. module: product
-#: help:product.packaging,qty:0
-msgid "The total number of products you can put by pallet or box."
+#: field:product.supplierinfo,product_uom:0
+msgid "Supplier UoM"
 msgstr ""
 
 #. module: product
@@ -1646,11 +1687,6 @@ msgstr ""
 msgid "Pricelist Name"
 msgstr ""
 
-#. module: product
-#: help:product.supplierinfo,product_uom:0
-msgid "Supplier Product UoM."
-msgstr ""
-
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
@@ -1852,11 +1888,6 @@ msgstr ""
 msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."
 msgstr ""
 
-#. module: product
-#: help:product.supplierinfo,min_qty:0
-msgid "The minimal quantity to purchase to this supplier, expressed in the default unit of measure."
-msgstr ""
-
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index beabfe21729..0aec0731871 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-03 07:40+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"PO-Revision-Date: 2010-12-17 23:41+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2010-12-17 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -33,6 +33,7 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"Chyba! Nemôžte priradiť hlavný cenník ako iný cenník v položke cenníka!"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -40,11 +41,13 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Nastaviť šablónu ak je toto pravidlo určené iba pre šablónu produktu. "
+"Nechajte prázdne pre všetky produkty"
 
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr ""
+msgstr "Predateľný"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
@@ -64,12 +67,12 @@ msgstr "Deň"
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr "UoM"
+msgstr "Jednotka"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr "Základ + PC (montáž na objednávku)"
+msgstr "Základné+ PC (montáž na objednávku)"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -79,7 +82,7 @@ msgstr "Prichádzajúci"
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr "Opatrenia typu"
+msgstr "Typ merania"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -87,6 +90,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Pri predaji aktuálnemu partnerovi bude namiesto predvoleného cenníka použitý "
+"tento."
 
 #. module: product
 #: constraint:product.supplierinfo:0
@@ -94,22 +99,24 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Chyba: Predvolená jednotka a jednotka produktu dodávateľa musia byť v "
+"rovnakej kategórii."
 
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Množsto dodávateľa"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Pevný"
 
 #. module: product
 #: code:addons/product/pricelist.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Pozor !"
+msgstr "Varovanie!"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -129,13 +136,13 @@ msgstr "Základné ceny"
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr "Názov pravidla"
+msgstr "Meno pravidla"
 
 #. module: product
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr "Referencie"
+msgstr "Odkaz"
 
 #. module: product
 #: constraint:product.category:0
@@ -167,7 +174,7 @@ msgstr "Priemerná cena"
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Jednodznačné meno pravidla pre tento riadok cenníka"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -183,7 +190,7 @@ msgstr "Processor AMD Athlon XP 1800+"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr "HDD on demand"
+msgstr "HDD na vyžiadanie"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -204,7 +211,7 @@ msgstr "PCE"
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Všeobecný"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
@@ -217,6 +224,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Určí či bude produkt viditeľný v zozname produktov vo výbere riadka "
+"formulára objednávky."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -243,7 +252,7 @@ msgstr "Typ produktu"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  napr.: 1 * (táto jednotka) = pomer * (referenčná jednotka)"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -254,7 +263,7 @@ msgstr "Produkty: "
 #. module: product
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Chyba: UOS musia byť v inej kategórii, ako UOM"
+msgstr "Chyba: UOS musia byť v inej kategórii, ako merné jednotky"
 
 #. module: product
 #: field:product.category,parent_id:0
@@ -267,6 +276,8 @@ msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
 msgstr ""
+"Naplánované množstvá produktov na odchod vo vybraných miestach alebo všetky "
+"interné ak nie je žiadna vybraná."
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -279,7 +290,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr "Názov dodávateľa, cena, kód produktu, ..."
+msgstr "Meno dodávateľa, cena, kód produktu, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -317,13 +328,13 @@ msgstr "Kategória"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
-"Toto pravidlo platí iba v prípade, že partner kúpi/predá viac ako toto "
-"množstvo"
+"Toto pravidlo sa použije iba ak partner predáva alebo nakupuje nad toto "
+"množstvo."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr "Wood 2mm"
+msgstr "Drevo 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
@@ -333,12 +344,12 @@ msgstr "Množstvo-1"
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Počet balákov ročne"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr "Monožstvo balenia"
+msgstr "Množstvo podľa balenia"
 
 #. module: product
 #: view:product.product:0
@@ -360,7 +371,7 @@ msgstr "Odchádzajúce"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Referenčná merná jednotka pre túto kategóriu"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
@@ -376,7 +387,7 @@ msgstr "Množstvo-5"
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr "IT components"
+msgstr "IT komponenty"
 
 #. module: product
 #: field:product.template,product_manager:0
@@ -386,30 +397,30 @@ msgstr "Produktový manažér"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr "Názov produktu dodávateľa"
+msgstr "Meno produktu dodávateľa"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr "Medium PC"
+msgstr "Stredné PC"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr "Vyhľadávanie cien produktov"
+msgstr "Hľadanie cien produktov"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr "Vlastnosť predaja"
+msgstr "Popis predaja"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "Lokálne úložisko"
+msgstr "Umiestnenie v sklade"
 
 #. module: product
 #: help:product.packaging,length:0
@@ -419,12 +430,12 @@ msgstr "Dĺžka balíka"
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr "Čistá hmotnosť v Kg."
+msgstr "Netto hmotnosť v kg."
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "Hovorí používateľvo či môže aleb nemôže použiť produkt."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -475,7 +486,7 @@ msgstr "Množstvo-4"
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Predaj a nákup"
+msgstr "Predaje a nákupy"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -488,6 +499,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"ak je aktívne pole nastavené na False, umožní schovať produkt bez jeho "
+"vymazania."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -502,17 +515,17 @@ msgid ""
 "Please create or activate one."
 msgstr ""
 "Nie je aktívna verzia pre vybraný cenník!\n"
-"Prosím, vytvorte alebo aktivujte jeden cenník."
+"Prosím jednu vytvorte alebo aktivujte."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "Kat. mj produktu"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr "Krabica 20x20x40"
+msgstr "Škatuľa 20x20x40"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -522,12 +535,12 @@ msgstr "Výpočet ceny"
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr "Možnosť zakúpiť"
+msgstr "Je možné kúpiť"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "Konfigurácia s rýchlym procesorom"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -535,6 +548,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 alebo viacerí dodávateľa môžu byť pripojení k produktu. Všetky informácie "
+"sa nachádzajú vo formulári produktu."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -542,6 +557,8 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Konverzia množstva môže nastať automaticky medzi mernými jednotkami v "
+"rovnakej kategórii, vzhľadom na ich pomery."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -551,12 +568,12 @@ msgstr "Šírka balíka"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr "Virtuálne na sklade"
+msgstr "Virtunálny sklad"
 
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr "Zobrazenie"
+msgstr "Pohľad"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
@@ -566,7 +583,7 @@ msgstr "Šablóny produktu"
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Náklady reštaurácie"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -577,7 +594,7 @@ msgstr "Chyba: Neplatný ean kód"
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr "Min. množstvo"
+msgstr ""
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -611,11 +628,13 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Keď je verzia duplikovaná je nastavená ako neaktívna, takže dátumy sa "
+"neprelínajú s pôvodnou verziu. Mali by ste zmeniť dátum a reaktivovať cenník"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr "KIT Shelf of 100cm"
+msgstr "Sada Polica 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -635,12 +654,12 @@ msgstr "Sada klávesnica + myš"
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr "Názov ceny"
+msgstr "Meno ceny"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr "Processor AMD Athlon XP 2200+"
+msgstr "Procesor AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -660,12 +679,12 @@ msgstr "Dodávatelia"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Na nákup"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr "Mainboard ASUStek A7N8X"
+msgstr "Základná doska ASUStek A7N8X"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -675,7 +694,7 @@ msgstr "Nová cena ="
 #. module: product
 #: help:product.pricelist.item,sequence:0
 msgid "Gives the sequence order when displaying a list of pricelist items."
-msgstr "Dáva sekvenciu poradia pri zobrazovaní zoznamu položiek cenníka."
+msgstr "Udáva poradie pri zobrazovaní zoznamu riadkov cenníka."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -699,6 +718,9 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Použité spoločnosťami, ktoré  spravujú dve merné jednotky: správa faktúr a "
+"skladu. Napríklad v potravinovom priemysle, spravuje sklad šunky alebo "
+"faktúrujete v kg. Nechajte prázdne pre použitie predvolenej mernej jednotky."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -713,7 +735,7 @@ msgstr "Podkategórie"
 #. module: product
 #: field:product.pricelist.version,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Dátum ukončenia"
 
 #. module: product
 #: view:product.price_list:0
@@ -736,12 +758,12 @@ msgstr "Cenníky"
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "Odkaz na zákazníka"
 
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Všeobecný"
 
 #. module: product
 #: field:product.pricelist.type,key:0
@@ -759,53 +781,55 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
+"Nastaví produkt ak sa pravidlo týka jedného produktu. Nechajte prázdne pre "
+"všetky produkty."
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projekt návrhu kuchyne"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Hodina"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "Vo vývoji"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Polica 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Pomer a presnosť"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "Sady IT komponentov"
 
 #. module: product
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normálny"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "Dodávateľské informácie"
 
 #. module: product
 #: field:product.price.type,currency_id:0
@@ -817,7 +841,7 @@ msgstr "Mena"
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDR 256MB PC400"
 
 #. module: product
 #: view:product.category:0
@@ -827,13 +851,13 @@ msgstr "Kategórie produktu"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  napr.: 1 * (referenčná jednotka) = pomer * (táto jednotka)"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Obstaranie a lokality"
+msgstr "Obstaranie a umiestnenie"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -843,7 +867,7 @@ msgstr "Celková hmotnosť balenia"
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "Kód prepravnej jednotky."
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -855,7 +879,7 @@ msgstr ""
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "Typ cien produktov"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -865,29 +889,29 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "Štandardtný chladič krabice 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Informácie o dodávateľovi produktu"
 
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozšírené filtre..."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr "Vlastnosti nákupu"
+msgstr "Popis nákupu"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Nemožte mať dve verzie cenníku, ktoré sa prelínajú."
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -896,6 +920,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Čas dodania v dňoch od potvrdenia objednávky a časom príchodu produktov do "
+"Vášho skladu. Použite plánovačom na automatický výpočet pri plánovaní "
+"objednávok"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -906,36 +933,41 @@ msgid ""
 "version has several rules. Example: the customer price of this category of "
 "product will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"Cenník obsahuje pravidlá, ktoré sa sa vyhodnotia na výpočet nákupnej alebo "
+"predajnej ceny pre všetkých priradených partnerov. Cenníky môžu mať niekoľko "
+"verzií (2010, 2011, reklamný na február 2010, atď...) každá verzia ma "
+"niekoľko pravidiel. Napríklad: cena pre zákazníka v tejto kategórií bude "
+"založená na cene od dodávateľa vynásobenej 1,80."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Skladovateľný produkt"
 
 #. module: product
 #: field:product.packaging,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kód"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Por."
 
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
-msgstr ""
+msgstr "Vypočítať cenu produktu za jednotku na základe verzia cenníka."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "Prepravná jednotka"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "Partnerské informácie"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -949,13 +981,13 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: product
 #: selection:product.ul,type:0
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
-msgstr ""
+msgstr "Jednotka"
 
 #. module: product
 #: view:product.product:0
@@ -1223,7 +1255,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr "Jednotky merania"
+msgstr "Merné jednotky"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 6e1d4e26379..c1b541c7ef5 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-14 23:56+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 05:46+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <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: 2010-12-17 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -1224,7 +1224,7 @@ msgstr "Alternativa företag"
 #. module: product
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Du kan inte ja två användare med samma användarid!"
+msgstr "Du kan inte ha två användare med samma användarid!"
 
 #. module: product
 #: help:product.template,sale_delay:0
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index e2c4f6735b2..1468cd45200 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -225,7 +225,7 @@ class product_pricelist(osv.osv):
                     'ORDER BY sequence',
                     (tmpl_id, product_id, pricelist_id, qty))
                 res1 = cr.dictfetchall()
-
+                uom_price_already_computed = False
                 for res in res1:
                     if res:
                         if res['base'] == -1:
@@ -246,11 +246,17 @@ class product_pricelist(osv.osv):
                                     [('product_id', '=', tmpl_id)] + where)
                             price = 0.0
                             if sinfo:
+                                qty_in_product_uom = qty
+                                product_default_uom = product_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+                                seller_uom = supplierinfo_obj.read(cr, uid, sinfo, ['product_uom'])[0]['product_uom'][0]
+                                if seller_uom and product_default_uom and product_default_uom != seller_uom:
+                                    uom_price_already_computed = True
+                                    qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
                                 cr.execute('SELECT * ' \
                                         'FROM pricelist_partnerinfo ' \
                                         'WHERE suppinfo_id IN %s' \
                                             'AND min_quantity <= %s ' \
-                                        'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo),qty,))
+                                        'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo),qty_in_product_uom,))
                                 res2 = cr.dictfetchone()
                                 if res2:
                                     price = res2['price']
@@ -279,7 +285,7 @@ class product_pricelist(osv.osv):
                         price = False
 
                 if price:
-                    if 'uom' in context:
+                    if 'uom' in context and not uom_price_already_computed:
                         product = products_dict[product_id]
                         uom = product.uos_id or product.uom_id
                         price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, price, context['uom'])
@@ -538,7 +544,7 @@ class product_pricelist_item(osv.osv):
         'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
 
         'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
-        'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of pricelist items."),
+        'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
         'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 62ce31be9d6..372919f6212 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -357,7 +357,6 @@ class product_template(osv.osv):
         return True
 
     _constraints = [
-        (_check_uos, 'Error: UOS must be in a different category than the UOM', ['uos_id']),
         (_check_uom, 'Error: The default UOM and the purchase UOM must be in the same category.', ['uom_id']),
     ]
 
@@ -462,6 +461,7 @@ class product_product(osv.osv):
     _description = "Product"
     _table = "product_product"
     _inherits = {'product.template': 'product_tmpl_id'}
+    _order = 'default_code,name_template'
     _columns = {
         'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
         'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
@@ -480,6 +480,7 @@ class product_product(osv.osv):
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
+        'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True),
     }
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
@@ -530,7 +531,13 @@ class product_product(osv.osv):
                               }
                     result.append(_name_get(mydict))
             else:
-                result.append(_name_get(self.read(cr, user, product.id, ['variants','name','default_code'], context=context)))
+                mydict = {
+                          'id': product.id,
+                          'name': product.name,
+                          'default_code': product.default_code,
+                          'variants': product.variants
+                          }
+                result.append(_name_get(mydict))
         return result
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
@@ -705,8 +712,8 @@ class product_supplierinfo(osv.osv):
         'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
-        'product_uom': fields.many2one('product.uom', string="UOM", help="Supplier Product UoM."),
-        'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
+        'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
+        'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."),
         'qty': fields.function(_calc_qty, method=True, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
@@ -775,8 +782,8 @@ class pricelist_partnerinfo(osv.osv):
     _columns = {
         'name': fields.char('Description', size=64),
         'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
-        'min_quantity': fields.float('Quantity', required=True),
-        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price')),
+        'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise."),
+        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise"),
     }
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d0e2a780451..0ff14a6ca10 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -116,8 +116,8 @@
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
-                                <field name="uom_po_id" widget="selection" groups="base.group_extended"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
@@ -458,7 +458,7 @@
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="min_qty"/>
-                    <field name="product_uom" widget="selection"/>
+                    <field name="product_uom"/>
                     <field name="delay"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 58e3de7a81b..aa629f6deba 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -132,6 +132,11 @@ msgstr ""
 msgid "The number of days before a production lot should be removed."
 msgstr ""
 
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr ""
+
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid "The number of days before a production lot starts deteriorating without becoming dangerous."
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 17d7f5bb1f0..5e4a7ae67d1 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index cee80197e85..c2a8ffae19c 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index ff4ffcc5acf..c7c374ac02c 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-04 08:39+0000\n"
+"PO-Revision-Date: 2010-12-18 15:42+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: 2010-12-17 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
@@ -44,7 +44,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Standard price"
-msgstr ""
+msgstr "Prix standard"
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -76,12 +76,12 @@ msgstr "Prix Unitaire Moyen"
 #. module: product_margin
 #: model:ir.module.module,shortdesc:product_margin.module_meta_information
 msgid "Margins in Product"
-msgstr ""
+msgstr "Marges sur le produit"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: product_margin
 #: view:product.product:0
@@ -97,7 +97,7 @@ msgstr "Payée"
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
-msgstr ""
+msgstr "Vente attendue - Chiffre d'affaire"
 
 #. module: product_margin
 #: field:product.product,sale_expected:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Expected Sale - Normal Cost"
-msgstr ""
+msgstr "Vente attendue - Coût normal"
 
 #. module: product_margin
 #: field:product.product,purchase_num_invoiced:0
@@ -214,7 +214,7 @@ msgstr "Prix Moy. dans les Factures Fournisseurs "
 #. module: product_margin
 #: view:product.margin:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Catégories des propriétés"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
@@ -249,12 +249,12 @@ msgstr "Marges par produits"
 #. module: product_margin
 #: view:product.margin:0
 msgid "General Information"
-msgstr ""
+msgstr "Informations générales"
 
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur : Code ean incorrect"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -289,7 +289,7 @@ msgstr "Somme de la Quantité dans les Factures Clients"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr ""
+msgstr "Marge du produit"
 
 #~ msgid "Reporting"
 #~ msgstr "Reporting"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index d15cd9aac98..237b0d0b0e4 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -95,8 +95,12 @@ msgid "Expected Sale - Turn Over"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,sale_expected:0
-msgid "Expected Sale"
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid "\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+""
 msgstr ""
 
 #. module: product_margin
@@ -105,8 +109,8 @@ msgid "Standard Price"
 msgstr ""
 
 #. module: product_margin
-#: help:product.product,purchase_num_invoiced:0
-msgid "Sum of Quantity in Supplier Invoices"
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
 msgstr ""
 
 #. module: product_margin
@@ -120,9 +124,8 @@ msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
@@ -198,6 +201,11 @@ msgstr ""
 msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr ""
+
 #. module: product_margin
 #: view:product.margin:0
 msgid "Properties categories"
@@ -209,8 +217,9 @@ msgid "Total margin * 100 / Turnover"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
 msgstr ""
 
 #. module: product_margin
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index 57a3d90d58c..e6581f5570a 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,18 @@ msgstr ""
 msgid "No Sale Pricelist Found "
 msgstr ""
 
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid "\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
 #: field:product.pricelist,visible_discount:0
@@ -57,6 +69,6 @@ msgstr ""
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
-msgid "Sale Order Line"
+msgid "Sales Order Line"
 msgstr ""
 
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index ed370858924..e778c081db2 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-11-29 07:42+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 10:06+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
@@ -52,7 +51,7 @@ msgstr "Configuración de herramientas"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure Extra Tools"
-msgstr ""
+msgstr "Configuración de herramientas extras"
 
 #. module: profile_tools
 #: model:ir.module.module,description:profile_tools.module_meta_information
@@ -68,7 +67,7 @@ msgstr ""
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: profile_tools
 #: view:misc_tools.installer:0
@@ -99,7 +98,7 @@ msgstr "Comida"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Extra Tools Configuration"
-msgstr ""
+msgstr "Configuración de herramientas extras"
 
 #. module: profile_tools
 #: field:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 75a935160c6..474b5c2cff3 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
 msgid "Here are applications that can help you improve your organization without being key in its management."
 msgstr ""
 
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
 msgid "Tools Configuration"
@@ -53,8 +58,8 @@ msgid "Configure"
 msgstr ""
 
 #. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
 msgstr ""
 
 #. module: profile_tools
@@ -108,13 +113,13 @@ msgid "Configuration Progress"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
+#: field:misc_tools.installer,pad:0
+msgid "Native pad integration"
 msgstr ""
 
 #. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
+#: view:misc_tools.installer:0
+msgid "title"
 msgstr ""
 
 #. module: profile_tools
@@ -123,7 +128,7 @@ msgid "Web Share"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
 msgstr ""
 
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index d9ee2757610..0875973feff 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2009-10-08 08:06+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-18 17:16+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2010-12-17 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -31,12 +31,12 @@ msgstr ""
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Uzdevums '%s' tika deliģēts %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Izvēlēta kompānija nav atļauto kompāniju sarakstā šim lietotājam"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Termiņi"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -63,12 +63,12 @@ msgstr "PĀRBAUDĪT: "
 #. module: project
 #: field:project.installer,project_issue:0
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Incidentu reģistrs"
 
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Darba uzkaites Tabeles"
 
 #. module: project
 #: view:project.task:0
@@ -100,17 +100,17 @@ msgstr ""
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Uzdevums '%s' slēgts"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Pārvērtēšanas uzdevums"
 
 #. module: project
 #: field:project.project,members:0
@@ -125,7 +125,7 @@ msgstr "Uzdevumi šķiroti pēc saņēmēja"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
 #. module: project
 #: view:project.task:0
@@ -154,7 +154,7 @@ msgstr "Mani Uzdevumi"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -162,22 +162,22 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Kompānija"
 
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Projekti: Plānotas pret kopējām stundām"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Brīdinājuma ziņojums"
 
 #. module: project
 #: help:project.project,members:0
@@ -189,7 +189,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Posma nosaukums"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -200,12 +200,12 @@ msgstr "Mainīt uz Atlikts"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dienas līdz Atvēršanai"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Mainīt posmu"
 
 #. module: project
 #: view:project.project:0
@@ -215,7 +215,7 @@ msgstr "Jauns Projekts no parauga"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -226,25 +226,25 @@ msgstr "Ļoti steidzams"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Lietotājs, kuram gribat deliģēt šo uzdevumu"
 
 #. 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
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Uzdevums '%s' izpildīts"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Projekta noslēguma uzdevums"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -261,7 +261,7 @@ msgstr "Uzdevums"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Dalībnieki"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -275,7 +275,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projekta uzdevumu darbs"
 
 #. module: project
 #: view:project.project:0
@@ -287,22 +287,22 @@ msgstr "Piezīmes"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projekta stundas pret atlikušajām"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Rēķina Adrese"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Uzdevuma kopsavilkums"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Nav sagataves uzdevums"
 
 #. module: project
 #: view:project.task:0
@@ -320,7 +320,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Virsuzdevumi"
 
 #. module: project
 #: view:project.project:0
@@ -342,7 +342,7 @@ msgstr "Atcelts"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mani nepabeigtie uzdevumi"
 
 #. module: project
 #: view:project.project:0
@@ -369,7 +369,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Avg. Plan.-Eff."
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
@@ -421,7 +421,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testēšana"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -470,7 +470,7 @@ msgstr "Termiņš"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Atcelt"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -490,12 +490,12 @@ msgstr ""
 #: code:addons/project/project.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Atbildīgais"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
@@ -507,17 +507,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "Uzd. skaits"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Iepriekšējais"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Pārvērtēt uzdevumu"
 
 #. module: project
 #: view:project.project:0
@@ -542,7 +542,7 @@ msgstr "Sagatave"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Specifikācija"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -552,12 +552,12 @@ msgstr "Mani Projekti"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Nākamais"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -568,7 +568,7 @@ msgstr "No melnraksta uz atvērtu."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "Dienu skaits"
 
 #. module: project
 #: help:project.task,active:0
@@ -604,7 +604,7 @@ msgstr "Projekta uzdevums"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodoloģijas"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -614,13 +614,13 @@ msgstr "Aprēķināts kā: Pavadītais laiks + Atlikušais laiks"
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "Klienta e-pasta adrese"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Efektīvas stundas"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -636,7 +636,7 @@ msgstr ""
 #: code:addons/project/project.py:0
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Nosūtīt e-pastu pēc uzdevumu pabeigšanas"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -668,7 +668,7 @@ msgstr "Darba uzdevuma Darbi"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr ""
+msgstr "Publiskas piezīmes"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -678,12 +678,12 @@ msgstr "Plānotais Laiks"
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Brīdināt vadītāju uz e-pastu"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Lietotājiem nepiesaistītie uzdevumi"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -710,7 +710,7 @@ msgstr "Papildus Info"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Jūlijs"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -739,18 +739,18 @@ msgstr "Projekti"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Posms"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Piesaistīts"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Uzdevums '%s' nav pabeigts"
 
 #. module: project
 #: view:project.task:0
@@ -760,7 +760,7 @@ msgstr "Datumi"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Jauns lietotājam deliģēta uzdevuma virsraksts"
 
 #. module: project
 #: view:project.installer:0
@@ -772,7 +772,7 @@ msgstr ""
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projekta stundas pret plānotajām un kopējām"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -794,12 +794,12 @@ msgstr "Kavētās Stundas"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Uzdevumu analīze"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Uzdevumi pēc lietotāja un projekta"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -810,7 +810,7 @@ msgstr "Deleģēt"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Projektu sagataves"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -830,18 +830,18 @@ msgstr "Projekts"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Novērtēt"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mana tāfele"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Lūdzu, norādiet projekta vadītāja e-pasta adresi"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -852,13 +852,13 @@ msgstr "Projektu Vadība"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusts"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projekta uzdevumu deliģēšana"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -875,27 +875,27 @@ msgstr "Uzdevumi"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Vecāks"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Uzdevumu deliģēšana"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembris"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembris"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Attēls"
 
 #. module: project
 #: field:project.task,progress:0
@@ -932,7 +932,7 @@ msgstr "Projekta uzdevumi"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Uzdevuma posms"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -956,13 +956,13 @@ msgstr "Statuss: %(state)s"
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Ilgtermiņa plānošana"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Sākuma Datums"
 
 #. module: project
 #: help:project.project,priority:0
@@ -985,12 +985,12 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Gads  "
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: project
 #: view:project.task:0
@@ -1006,7 +1006,7 @@ msgstr ""
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritāte"
 
 #. module: project
 #: view:project.project:0
@@ -1016,17 +1016,17 @@ msgstr "Administrēšana"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mans uzdevums"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Dalībnieks"
 
 #. module: project
 #: view:project.task:0
@@ -1036,7 +1036,7 @@ msgstr "Projekta uzdevumi"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Kļūda! Nevar izveidot rekursīvus asociētos dalībniekus."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1058,12 +1058,12 @@ msgstr "Zems"
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Veiktspēja"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Manu uzdevumu termiņi"
 
 #. module: project
 #: view:project.project:0
@@ -1086,18 +1086,18 @@ msgstr "Gaida"
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "Uzdevum labošana"
 
 #. 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 "Posmi"
 
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurēt"
 
 #. module: project
 #: view:project.project:0
@@ -1120,7 +1120,7 @@ msgstr "Brīdināt Partneri"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Jūnijs"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1133,13 +1133,13 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dienas līdz pabeigšanai"
 
 #. 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 "Projekta tāfele"
 
 #. module: project
 #: view:project.project:0
@@ -1159,23 +1159,23 @@ msgstr "Nodefinēt Prasības un Plānotās darba Stundas"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembris"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie filtri..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "Klienta e-pasts"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projekts '%s' ir pabeigts."
 
 #. module: project
 #: view:project.task:0
@@ -1185,7 +1185,7 @@ msgstr "Uzdevuma versija"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobris"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1195,7 +1195,7 @@ msgstr "Atvērt Darba Uzdevumu"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "Vadītāja e-pasts"
 
 #. module: project
 #: help:project.project,active:0
@@ -1207,7 +1207,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Uzņēmumi"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1218,7 +1218,7 @@ msgstr "Kad uzdevums ir paveikts, tas tiek atzīmēts kā paveikts."
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Projets '%s' ir sākts"
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1228,7 +1228,7 @@ msgstr "Datums"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Instrumentu panelis"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1255,12 +1255,12 @@ msgstr "Lietotāja Projekti"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurācijas Progress"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Deliģēt"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1271,7 +1271,7 @@ msgstr "Nevar nosūtīt e-pastu, jo Jums nav izveidota e-pasta adrese!"
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Dienu skaits līdz uzdevuma sākumam"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1281,7 +1281,7 @@ msgstr "Kam uzticēts"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Vēsture"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1296,12 +1296,12 @@ msgstr "Deleģētais Darba Uzdevums"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Getting Things Done"
 
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "Brīdināt klientu uz e-pastu"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1389,7 +1389,7 @@ msgstr "Atcelt"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Aizvērt"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1422,7 +1422,7 @@ msgstr "Progresā"
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Please specify the email address of Customer."
-msgstr ""
+msgstr "Lūdzu, norādiet klienta e-pasta adresi."
 
 #. module: project
 #: view:project.task:0
@@ -1433,12 +1433,12 @@ msgstr "Aktivizēt atkal"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Nosūtīt e-pastu"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Darbība pašlaik"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1449,7 +1449,7 @@ msgstr "Jauns Darba Uzdevuma Apraksts"
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Meklēt projektu"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1461,14 +1461,14 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projekts pret stundām"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "Pašreizējs"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1490,7 +1490,7 @@ msgstr "Brīdināt Atbildīgo"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Noilgušie termiņi"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1509,7 +1509,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Pārvērtēt uzdevumu"
 
 #. module: project
 #: help:project.installer,project_long_term:0
@@ -1521,17 +1521,17 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Attīstība"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Izrakstīt rēķinus par uzdevumu laiku"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Atlikušās stundas pēc projekta"
 
 #. module: project
 #: field:project.task,description:0
@@ -1556,7 +1556,7 @@ msgstr "Steidzams"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maijs"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1566,14 +1566,14 @@ msgstr "Apstiprinājuma Uzdevums"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Pavisam uzdevumu"
 
 #. 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 "Mani deliģētie uzdevumi"
 
 #. module: project
 #: view:project.project:0
@@ -1605,7 +1605,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvāris"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1631,30 +1631,30 @@ msgstr ""
 #. module: project
 #: help:project.task.close,manager_email:0
 msgid "Email Address of Project's Manager"
-msgstr ""
+msgstr "Projekta vadītāja e-pasta adrese"
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klients"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "Beigu Datums"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Februāris"
 
 #. 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 "Uzdevumi pa dienām"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1666,12 +1666,12 @@ msgstr ""
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Brīdināt klienta"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Labot"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1682,27 +1682,27 @@ msgstr "Ievadiet savas darba stundas."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Gads"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Dienu skaits līdz uzdevuma pabeigšanai"
 
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "Mani projekti: Plānotās pret kopējām stundām"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "project.installer"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprīlis"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1713,7 +1713,7 @@ msgstr "Pavadītas Stundas"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Dažādi"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1728,13 +1728,13 @@ msgstr "Projekta Laika Vienība"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Iztērētās stundas"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Uzdevums '%s' neizlemts."
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1752,28 +1752,28 @@ msgstr ""
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Lietotāji"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Nokavētie uzdevumi"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "Sapludināt"
 
 #. 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 "Atlikušās stundas pēc projekta"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1815,7 +1815,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "Vadītājs"
 
 #. module: project
 #: field:project.task,create_date:0
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index d999a94a51e..ad2be7f43eb 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:55+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:55+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -720,6 +720,11 @@ msgstr ""
 msgid "New title of the task delegated to the user"
 msgstr ""
 
+#. module: project
+#: view:report.project.task.user:0
+msgid "    Month-1    "
+msgstr ""
+
 #. module: project
 #: view:project.installer:0
 msgid "Various OpenERP applications are available to manage your projects with different level of control and flexibility."
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index e6510ea1719..393f7a4b482 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.po
@@ -1,20 +1,20 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 15:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-17 17:39+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -113,7 +113,7 @@ msgstr ""
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Các thành viên dự án"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -123,7 +123,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: project
 #: view:project.task:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Các nhiệm vụ của tôi"
 
 #. module: project
 #: constraint:project.task:0
@@ -158,12 +158,12 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Công ty"
 
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
@@ -173,7 +173,7 @@ msgstr ""
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Thông điệp cảnh báo"
 
 #. module: project
 #: help:project.project,members:0
@@ -216,7 +216,7 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Rất khẩn cấp"
 
 #. module: project
 #: help:project.task.delegate,user_id:0
@@ -228,7 +228,7 @@ msgstr ""
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ngày"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -388,7 +388,7 @@ msgstr ""
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -405,12 +405,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Kiểm tra"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -437,7 +437,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Hoàn thành bởi"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -452,7 +452,7 @@ msgstr ""
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Hạn chót"
 
 #. module: project
 #: view:project.task.close:0
@@ -468,7 +468,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -479,7 +479,7 @@ msgstr ""
 #: code:addons/project/project.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (sao chép)"
 
 #. module: project
 #: field:project.task,user_id:0
@@ -501,7 +501,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Trước"
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -511,7 +511,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Ngày chấm dứt: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -536,7 +536,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Các dự án của tôi"
 
 #. module: project
 #: constraint:res.company:0
@@ -546,7 +546,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Tiếp"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -603,7 +603,7 @@ msgstr ""
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "Địa chỉ thư điện tử của Khách hàng"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -636,7 +636,7 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Trung bình"
 
 #. module: project
 #: view:project.task:0
@@ -646,7 +646,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Số giờ còn lại"
 
 #. module: project
 #: view:project.task:0
@@ -689,29 +689,29 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr ""
+msgstr "Các dự án của tôi"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Thông tin bổ sung"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: project
 #: field:project.task,date_start:0
 #: field:report.project.task.user,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -720,7 +720,7 @@ msgstr ""
 #: view:project.project:0
 #, python-format
 msgid "Projects"
-msgstr ""
+msgstr "Các dự án"
 
 #. module: project
 #: view:project.task:0
@@ -733,7 +733,7 @@ msgstr ""
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Phân công cho"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -771,7 +771,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Người sử dụng: %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -814,7 +814,7 @@ msgstr ""
 #: field:res.users,context_project_id:0
 #: field:task.by.days,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Dự án"
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -836,12 +836,12 @@ msgstr ""
 #: model:ir.module.module,shortdesc:project.module_meta_information
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Quản lý Dự án"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -859,7 +859,7 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,task_ids:0
 msgid "Tasks"
-msgstr ""
+msgstr "Các nhiệm vụ"
 
 #. module: project
 #: view:project.project:0
@@ -874,22 +874,22 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Hình ảnh"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Tiến độ (%)"
 
 #. module: project
 #: help:project.task,state:0
@@ -910,7 +910,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Tháng"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -940,18 +940,18 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Tình trạng: %(state)s"
 
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Kế hoạch dài hạn"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: project
 #: help:project.project,priority:0
@@ -974,7 +974,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Năm  "
 
 #. module: project
 #: view:project.project:0
@@ -984,7 +984,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Thông tin"
 
 #. module: project
 #: help:project.installer,account_budget:0
@@ -1005,22 +1005,22 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Nhiệm vụ của tôi"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Thành viên"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Các nhiệm vụ của dự án"
 
 #. module: project
 #: constraint:res.partner:0
@@ -1042,7 +1042,7 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Thấp"
 
 #. module: project
 #: view:project.project:0
@@ -1086,13 +1086,13 @@ msgstr ""
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Cấu hình"
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,complete_name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Tên dự án"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1104,12 +1104,12 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Cảnh báo Đối tác"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1148,17 +1148,17 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "Địa chỉ thư điện tử của Khách hàng"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -1174,7 +1174,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1196,7 +1196,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Các công ty"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1212,7 +1212,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
@@ -1231,7 +1231,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -1267,7 +1267,7 @@ msgstr ""
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Lịch sử"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1340,7 +1340,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Ngày bắt đầu: %(date_start)s"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -1359,7 +1359,7 @@ msgstr ""
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1367,18 +1367,18 @@ msgstr ""
 #: view:project.project:0
 #: view:project.task:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy"
 
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Đóng"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: selection:project.vs.hours,state:0
 msgid "Open"
-msgstr ""
+msgstr "Mở"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -1390,7 +1390,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: view:project.task:0
@@ -1398,7 +1398,7 @@ msgstr ""
 #: selection:report.project.task.user,state:0
 #: selection:task.by.days,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Đang thực hiện"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1409,13 +1409,13 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Tái kích hoạt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Gửi thư điện tử"
 
 #. module: project
 #: view:res.users:0
@@ -1431,7 +1431,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Tìm kiếm Dự án"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1450,24 +1450,24 @@ msgstr ""
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "Hiện tại"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Rất thấp"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Kế hoạch"
 
 #. module: project
 #: field:project.project,warn_manager:0
 #: field:project.task.close,manager_warn:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Cảnh báo người quản lý"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
@@ -1503,7 +1503,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Phát triển"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
@@ -1522,7 +1522,7 @@ msgstr ""
 #: view:project.task.type:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Mô tả"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -1533,12 +1533,12 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Khẩn cấp"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1587,7 +1587,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1616,18 +1616,18 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Khách hàng"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
@@ -1646,12 +1646,12 @@ msgstr ""
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Cảnh báo Khách hàng"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Sửa chữa"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1662,7 +1662,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Năm"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1677,12 +1677,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "project.installer"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1732,7 +1732,7 @@ msgstr ""
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
@@ -1765,7 +1765,7 @@ msgstr ""
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Tổng thời gian"
 
 #. module: project
 #: field:project.task.delegate,state:0
@@ -1824,7 +1824,7 @@ msgstr ""
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "cách xưng hô"
 
 #. module: project
 #: help:project.installer,project_issue:0
@@ -1851,4 +1851,4 @@ msgstr ""
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Các ngân sách"
diff --git a/addons/project_caldav/i18n/fr.po b/addons/project_caldav/i18n/fr.po
new file mode 100644
index 00000000000..d6f027da5be
--- /dev/null
+++ b/addons/project_caldav/i18n/fr.po
@@ -0,0 +1,553 @@
+# French 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-19 10:22+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"Language-Team: French <fr@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: 2010-12-20 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Cette propriété définit la liste des exceptions (date/heure) pour un élément "
+"récurrent du calendrier."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Mer"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "dimanche"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Quatrième"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Montrer comme"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Date dans le mois"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Publique"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL caldav"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "mars"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "vendredi"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Toute la journée"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Disponible"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "lun."
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Tâche"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Dernier"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Jours"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "Aucune répetition"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Exclude range"
+msgstr "Exclure la plage"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Minutes"
+msgstr "Minutes"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Annuellement"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "mar."
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Répéter jusqu'au"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every x"
+msgstr "Répéter tous les x"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Agenda"
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "sam."
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Participants"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "dim."
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Jour du mois"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Emplacement"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Semaines"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Option"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Confidentiel"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Seconds"
+msgstr "Secondes"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Heures"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID récurrent"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "juillet"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "jeu."
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Quotidien"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Marquer comme"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Premier"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Tâches"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "septembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "décembre"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "mardi"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Custom Recurrency Rule"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat max that times"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Hebdomadaire"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Edit All"
+msgstr "Tout éditer"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "ven."
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Emplacement de l'événement"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Règle de récurrence"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "À partir de"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Rappel"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "août"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "lundi"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Troisième"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "juin"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Date d'écriture"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "novembre"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Count"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "octobre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "janvier"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Mois"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "mercredi"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "Date de l'identifiant récurrent"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Fréquence"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "de"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Occupé(e)"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Récurrence"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "jeudi"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Custom"
+msgstr "Personnalisé"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Règle en exception"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Détails"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Définit une règle ou un intervalle de temps récurrent qu'il faut exclure de "
+"la règle récurrente."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Années"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Définit une règle pour des évènements récurrents.\n"
+"Par exemple : à faire 10 fois, tous les deux mois, le dernier dimanche du "
+"mois : FREQ=Mensuel;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "mai"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "février"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Interval"
+msgstr "Intervalle"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Exception de date/heure"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarme"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "avril"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Jour de la semaine"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "Par jour"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr "Le"
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Définit une alarme à cette heure, avant que l'événement n'ait lieu."
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Seconde"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index e05dbb9ed9d..50784e517f7 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -323,6 +323,11 @@ msgstr ""
 msgid "Reminder"
 msgstr ""
 
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr ""
+
 #. module: project_caldav
 #: view:project.task:0
 msgid "Assignees Detail"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index fb5d4eb0202..926df07cbde 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -163,6 +163,23 @@ msgstr ""
 msgid "Car"
 msgstr ""
 
+#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid "\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on actually\n"
+"performing those tasks.\n"
+"    "
+msgstr ""
+
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
 #: view:project.timebox.fill.plan:0
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index de76be35b86..8d9e240ee8b 100644
--- a/addons/project_gtd/i18n/vi.po
+++ b/addons/project_gtd/i18n/vi.po
@@ -1,20 +1,20 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 15:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-19 20:12+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -25,12 +25,12 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
 msgid "project.gtd.timebox"
-msgstr ""
+msgstr "project.gtd.timebox"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Tái kích hoạt"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
 msgid "Travel"
-msgstr ""
+msgstr "Đi lại"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
@@ -65,12 +65,12 @@ msgstr ""
 #: code:addons/project_gtd/project_gtd.py:0
 #, python-format
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
 msgid "Long Term"
-msgstr ""
+msgstr "Dài hạn"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
@@ -80,7 +80,7 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
 msgid "Today"
-msgstr ""
+msgstr "Hôm nay"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -104,7 +104,7 @@ msgstr ""
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Lỗi !"
 
 #. module: project_gtd
 #: constraint:project.task:0
@@ -125,12 +125,12 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
 msgid "This Week"
-msgstr ""
+msgstr "Tuần này"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_monthly
 msgid "This Month"
-msgstr ""
+msgstr "Tháng này"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,icon:0
@@ -155,7 +155,7 @@ msgstr ""
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
 msgid "Name"
-msgstr ""
+msgstr "Tên"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -166,7 +166,7 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_car
 msgid "Car"
-msgstr ""
+msgstr "Xe"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
@@ -208,7 +208,7 @@ msgstr ""
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
 msgid "Office"
-msgstr ""
+msgstr "Văn phòng"
 
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
@@ -263,4 +263,4 @@ msgstr ""
 #. module: project_gtd
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Trước"
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index ff2242b8b12..ee42cd3a35b 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-09 10:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-17 22:58+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-17 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -38,6 +37,8 @@ msgstr "Horas de trabajo para abrir la cuestión"
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -69,7 +70,7 @@ msgstr "Compañía"
 #. module: project_issue
 #: field:project.issue,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email de los observadores"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -84,7 +85,7 @@ msgstr ""
 #. module: project_issue
 #: field:project.issue,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Días para abrir"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
@@ -97,30 +98,30 @@ msgstr ""
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Fecha de cierre"
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Añadir nota interna"
 
 #. module: project_issue
 #: field:project.issue,task_id:0
 #: view:project.issue.report:0
 #: field:project.issue.report,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Tarea"
 
 #. module: project_issue
 #: view:board.board:0
@@ -130,12 +131,12 @@ msgstr ""
 #. module: project_issue
 #: field:project.issue,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Móvil"
 
 #. module: project_issue
 #: field:project.issue,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_project
@@ -144,7 +145,7 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Proyecto"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
@@ -161,12 +162,12 @@ msgstr ""
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: project_issue
 #: field:project.issue.report,date_closed:0
 msgid "Date of Closing"
-msgstr ""
+msgstr "Fecha de cierre"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -181,7 +182,7 @@ msgstr ""
 #. module: project_issue
 #: field:project.issue,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Próxima acción"
 
 #. module: project_issue
 #: help:project.project,project_escalation_id:0
@@ -193,7 +194,7 @@ msgstr ""
 #. module: project_issue
 #: view:project.issue:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Información extra"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.action_project_issue_report
@@ -210,13 +211,13 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (copia)"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -236,7 +237,7 @@ msgstr ""
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estadísticas"
 
 #. module: project_issue
 #: view:project.issue:0
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
new file mode 100644
index 00000000000..c7b21d708ca
--- /dev/null
+++ b/addons/project_issue/i18n/lv.po
@@ -0,0 +1,940 @@
+# Latvian 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-18 18:16+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2010-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Sāka"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Sākuma datums"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Progress (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Sekotāju e-pasti"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Dienas līdz Atvēršanai"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Beigu datums"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "Diena"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Pievienot iekšējo piezīmi"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Incidenti pēc posma"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Mobilais"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Mani nepabeigtie projekta incidenti"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Uzmanību!"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Beigu datums"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Incidentu reģistra meklēšana"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Nākamā darbība"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Papildus Info"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (kopija)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Iepriekšējais"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, client complains, material breakdowns are "
+"collected here. You can define the stages assigned to the resolution of the "
+"issue on the project. (analysis, development, done) Using the mailgateway "
+"module, the issues can be integrated to an email address (example: "
+"support@mycompany.com)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Statistika"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Pārveidot par uzdevumu"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Uzturēšana"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Incidentu analīze"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Versijas numurs"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Nākamais"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Prioritāte"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Nosūtīt jaunu e-pastu"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Versija"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "Incidentu pārvaldība projekta pārvadībā"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "Neizlemtie incidenti"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Incidentu kategorijas"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "E-pasts"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Kanāls"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Zemākā"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Izveidošanas datums"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Tālrunis"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Atstatīt uz melnrakstu"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Šodien"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Projektu incidentu instrumentu panelis"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Jūlijs"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Kategorijas"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Posms"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "Vēstures informācija"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Projekta incidenti"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Mani nepabeigtie projektu incidenti"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Mani projektu incidenti"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Kontakts"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mana tāfele"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Mani incidenti"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Incidentu skaits"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Septembris"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Decembris"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Incidentu reģistra koks"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Eskalēt"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Jaunu iespēju pieprasījumi"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Labošanas datums"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Kategorija"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Projekta incidentu skaits"
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Zema"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Slēgts"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Vid. kavējums līdz slēgš."
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "Neizlemts"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Statuss"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Projekta incidentu skaits"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Pašreizēji incidenti"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Normāla"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "Globālais CC"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "Darāmais"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Dienas līdz pabeigšanai"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "Aktīva"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "Novembris"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Paplašinātie filtri..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Meklēt"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Janvāris"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Jaunu iespēju reģistra koks"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Šie cilvēki saņems e-pastu"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Incidenti pēc stāvokļa"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Partnera Kontakts"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "Atrisinājums"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "Vēsture"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "Piešķirts"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Atbildēt uz e-pasta adrese"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "Augstākā"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Piesaistnes"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Incidentu reģistra veidlapa"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "Vispārīgie"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "Incidenta versija"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr "Saziņa"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Aizvērt"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Atvērt"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "Incidenti"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "Projekta incidents"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr "Atbildīgais"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Aprēķināts kā: Patērētais Laiks / Kopējo Laiku."
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr "Pašreizējs"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr "Sīkāka informācija"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "Atbildēt"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "Incidents"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "Jauno iespēju reģistra meklēšana"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr "Apraksts"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Pārdošanas komanda"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "Maijs"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "E-pastu skaits"
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr "Darbinieka vārds"
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "Februāris"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "Incidents '%s' ir uzsākts"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "Jaunas iespējas apraksts"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "Projekta eskalācija"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "Mēnesis-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "Incidents '%s' ir pabeigts"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "Aprīlis"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "Atsauces"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "No Title"
+msgstr "Nav virsraksta"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "Pārdošanas komanda"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "Augsta"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Termiņš"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "Pēdēja darbība"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr "Gads"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr ""
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 7ea41d7a0c8..93a06e9e31c 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:09+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:09+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -229,13 +229,6 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
-#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
@@ -470,6 +463,13 @@ msgstr ""
 msgid "Update Date"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid "\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 #: field:project.issue,categ_id:0
@@ -605,8 +605,8 @@ msgid "Feature Tracker Tree"
 msgstr ""
 
 #. module: project_issue
-#: help:project.issue,email_from:0
-msgid "These people will receive email."
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
 msgstr ""
 
 #. module: project_issue
@@ -743,6 +743,11 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reply"
@@ -774,6 +779,12 @@ msgstr ""
 msgid "May"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Sale Team    "
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 1a8e392bf98..9b903251abe 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid "\n"
+"                    This module adds the Timesheet support for the Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
 msgid "Analytic Line"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index c3a219ab6a8..1824bd1df22 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,6 @@ msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
 msgstr ""
@@ -63,12 +62,28 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid "\n"
+"\n"
+"        Long Term Project management module that tracks planning, scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr ""
diff --git a/addons/project_mailgate/i18n/mn.po b/addons/project_mailgate/i18n/mn.po
index 859ffd9c176..d6ae0296de1 100644
--- a/addons/project_mailgate/i18n/mn.po
+++ b/addons/project_mailgate/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 15:51+0000\n"
+"PO-Revision-Date: 2010-12-18 16:18+0000\n"
 "Last-Translator: badralb <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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
@@ -58,7 +58,7 @@ msgstr "Мессежүүд"
 #: code:addons/project_mailgate/project_mailgate.py:0
 #, python-format
 msgid "Draft"
-msgstr ""
+msgstr "Ноорог"
 
 #. module: project_mailgate
 #: view:project.task:0
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 3e530921bfe..69d0149689a 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,11 @@ msgid "This module is an interface that synchronises mails with OpenERP Project
 "    "
 msgstr ""
 
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr ""
+
 #. module: project_mailgate
 #: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
 msgid "Project MailGateWay"
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index c5c34221779..ffdf87d8d0a 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,12 @@ msgstr ""
 msgid "From"
 msgstr ""
 
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr ""
+
 #. module: project_messages
 #: help:project.messages,to_id:0
 msgid "Keep this empty to broadcast the message."
@@ -40,6 +46,11 @@ msgstr ""
 msgid "Creation Date"
 msgstr ""
 
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr ""
+
 #. module: project_messages
 #: model:ir.actions.act_window,help:project_messages.messages_form
 msgid "An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis."
@@ -67,8 +78,12 @@ msgid "Group By..."
 msgstr ""
 
 #. module: project_messages
-#: view:project.messages:0
-msgid "Today"
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid "\n"
+"    This module provides the functionality to send messages within a project.\n"
+"    A user can send messages individually to other user. He can even broadcast\n"
+"    it to all the users.\n"
+"    "
 msgstr ""
 
 #. module: project_messages
@@ -94,8 +109,6 @@ msgid "Message From"
 msgstr ""
 
 #. module: project_messages
-#: model:ir.actions.act_window,name:project_messages.messages_form
-#: model:ir.ui.menu,name:project_messages.menu_messages_form
 #: view:project.messages:0
 msgid "Project Messages"
 msgstr ""
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index ae34ebb4811..bad17ead34f 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,11 +26,8 @@ msgid "Procurement Task"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.model,name:project_mrp.model_project_task
-#: model:process.node,name:project_mrp.process_node_mrptask0
-#: model:process.node,name:project_mrp.process_node_procuretasktask0
-#: field:procurement.order,task_id:0
-msgid "Task"
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
 msgstr ""
 
 #. module: project_mrp
@@ -70,8 +67,11 @@ msgid "Procurement"
 msgstr ""
 
 #. module: project_mrp
-#: model:process.transition,note:project_mrp.process_transition_ordertask0
-msgid "If procurement method is Make to order and supply method is produce"
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
 msgstr ""
 
 #. module: project_mrp
@@ -95,8 +95,33 @@ msgid "Create Task"
 msgstr ""
 
 #. module: project_mrp
-#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
-msgid "Procurement and Project Management integration"
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid "\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+""
+msgstr ""
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
 msgstr ""
 
 #. module: project_mrp
diff --git a/addons/project_planning/i18n/fr.po b/addons/project_planning/i18n/fr.po
index 7d6abfacd9f..e5103de48a5 100644
--- a/addons/project_planning/i18n/fr.po
+++ b/addons/project_planning/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-03 09:56+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 22:23+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
@@ -24,6 +25,8 @@ msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
 msgstr ""
+"Cette valeur indique le nombre de jours restant pour la tâche dans ce "
+"planning."
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
@@ -133,12 +136,12 @@ msgstr "Planning par compte"
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without"
-msgstr ""
+msgstr "Marge libre"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "Plannings actuels"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
@@ -167,6 +170,8 @@ msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
 msgstr ""
+"Cette valeur est la somme de tous les travaux saisis dans les feuilles de "
+"temps du planning entre les dates données."
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -201,6 +206,8 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
 msgstr ""
+"Cette valeur, exprimée en jours, est la somme des temps alloués dont la case "
+"\"Affecté à des tâches\" est décochée."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
@@ -259,6 +266,8 @@ msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
 msgstr ""
+"Cette valeur, exprimée en jours, est la somme des temps alloués et non liés "
+"à une tâche."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
@@ -268,7 +277,7 @@ msgstr "Déléguer"
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "Analyse des plannings"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -276,6 +285,7 @@ msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
 msgstr ""
+"Planifiez ici le nombre de jours de travail d'une personne à plein temps"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
@@ -307,7 +317,7 @@ msgstr "Total des tâches planifiées"
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Total libre"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -315,6 +325,8 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
 msgstr ""
+"Cette valeur, exprimée en jours, est la somme des temps alloués dont la "
+"coche 'Affecté à une tâche' est à VRAI."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -327,6 +339,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Calculé en tant que : [jours ouvrés - (temps alloués à des tâches + temps "
+"alloués sans tâches + congés déposés)]"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
@@ -371,6 +385,8 @@ msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
 msgstr ""
+"Cette valeur est le total des jours de congés validés pour ce planning entre "
+"les dates 'du' à 'au'."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -393,7 +409,7 @@ msgstr "Sociétés"
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Quantité en udm de base"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
@@ -414,7 +430,7 @@ msgstr "Code"
 #: view:account.analytic.account:0
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "Lignes de planning"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
@@ -549,3 +565,5 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
+"Cette valeur, exprimée en jour, est le résultat de la somme des temps "
+"alloués qui sont liés à des tâches."
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 0a49743bd7e..22bd2ef0e20 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -364,6 +364,22 @@ msgstr ""
 msgid "Total Remaining Tasks"
 msgstr ""
 
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid "\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.\n"
+""
+msgstr ""
+
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index a9164ea6e53..2cfcb9529b6 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,6 +25,13 @@ msgstr ""
 msgid "Project Retro planning"
 msgstr ""
 
+#. module: project_retro_planning
+#: model:ir.module.module,description:project_retro_planning.module_meta_information
+msgid "\n"
+"        - If end date of project is changed\n"
+"          then the deadline date and start date for all the tasks will change accordingly  "
+msgstr ""
+
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index b42dd83ff20..4f08cbb9bbd 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,6 +41,32 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.module.module,description:project_scrum.module_meta_information
+msgid "\n"
+"    This module implements all concepts defined by the scrum project\n"
+"    management methodology for IT companies:\n"
+"    * Project with sprints, product owner, scrum master\n"
+"    * Sprints with reviews, daily meetings, feedbacks\n"
+"    * Product backlog\n"
+"    * Sprint backlog\n"
+"\n"
+"    It adds some concepts to the project management module:\n"
+"    * Mid-term, long-term road-map\n"
+"    * Customers/functional requests VS technical ones\n"
+"\n"
+"    It also creates a new reporting:\n"
+"    * Burn-down chart\n"
+"\n"
+"    The scrum projects and tasks inherit from the real projects and\n"
+"    tasks, so you can continue working on normal tasks that will also\n"
+"    include tasks from scrum projects.\n"
+"\n"
+"    More information on the methodology:\n"
+"    * http://controlchaos.com\n"
+"    "
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index b262aacebfa..996835777ed 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.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: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-04 08:37+0000\n"
+"PO-Revision-Date: 2010-12-17 22:19+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: 2010-12-17 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -22,6 +22,7 @@ msgstr ""
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
+"Pas d'employé défini pour l'utilisateur \"%s\".  Vous devez en créer un."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -83,7 +84,7 @@ msgstr ""
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Heures de travail"
 
 #. module: project_timesheet
 #: constraint:project.project:0
@@ -153,7 +154,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Facturer le travail des tâches"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -185,12 +186,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Compléter votre feuille de temps."
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Facturable"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -221,6 +222,7 @@ msgstr ""
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
 msgstr ""
+"Le sommaire de la tâche est inscrit dans les lignes de la feuille de temps"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -338,12 +340,12 @@ msgstr "Feuille de temps par projet"
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Inscrire combien de temps vous avez travaillé sur votre tâche"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Facturer le travail de la tâche"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -353,13 +355,16 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Pas de propriétés comptables définis pour le produit et la catégorie du "
+"produit associé à l'employé.\n"
+"Compléter l'onglet feuille de temps du formulaire de l'employé."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Heures de travail par mois"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 2274ea7ded8..8bcf42dd13a 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -192,6 +192,15 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.module.module,description:project_timesheet.module_meta_information
+msgid "\n"
+"        This module lets you transfer the entries under tasks defined for Project Management to\n"
+"        the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways.\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Account"
@@ -251,8 +260,8 @@ msgid "Project"
 msgstr ""
 
 #. module: project_timesheet
-#: view:report.timesheet.task.user:0
-msgid " Month-1 "
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
 msgstr ""
 
 #. module: project_timesheet
@@ -292,8 +301,8 @@ msgid "Work on task"
 msgstr ""
 
 #. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "April"
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
 msgstr ""
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index 9392fada357..193bd7e2c5f 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/i18n/vi.po
@@ -1,20 +1,20 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 15:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-19 22:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -54,13 +54,13 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
@@ -70,13 +70,13 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Năm"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
@@ -91,22 +91,22 @@ msgstr ""
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Năm "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: project_timesheet
 #: constraint:project.task:0
@@ -136,7 +136,7 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -146,7 +146,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Nhiệm vụ"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
@@ -158,7 +158,7 @@ msgstr ""
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: project_timesheet
 #: constraint:project.project:0
@@ -168,17 +168,17 @@ msgstr ""
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
@@ -223,7 +223,7 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
@@ -233,12 +233,12 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Công việc theo người sử dụng"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -252,7 +252,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Dự án"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -272,7 +272,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Tháng "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -283,12 +283,12 @@ msgstr ""
 #: code:addons/project_timesheet/project_timesheet.py:0
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Cấu hình không hợp lệ !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Hóa đơn"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -298,17 +298,17 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
@@ -318,13 +318,13 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Tháng"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 3d75da76a62..d4d0e930168 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-11 11:17+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-17 22:50+0000\n"
+"Last-Translator: Carlos @ smile.fr <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: 2010-12-17 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -301,7 +300,7 @@ msgstr "Total neto :"
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr ""
+msgstr "Configure su aplicación de gestión de compras"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
@@ -1022,7 +1021,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
@@ -1253,6 +1252,7 @@ msgstr "Versión tarifa de compra por defecto"
 msgid ""
 "Extend your Purchases Management Application with additional functionalities."
 msgstr ""
+"Extienda su aplicación de gestión de compras con funcionalidades adicionales."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 2e234b357e9..f2618d4263b 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:14+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:14+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -79,6 +79,12 @@ msgstr ""
 msgid "Do you want to generate the supplier invoices ?"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:0
 #, python-format
@@ -127,12 +133,6 @@ msgstr ""
 msgid "This is the leads/security time for each purchase order."
 msgstr ""
 
-#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "You must first cancel all picking attached to this purchase order."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -236,6 +236,11 @@ msgid "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
 
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order,amount_tax:0
@@ -389,6 +394,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
+#: code:addons/purchase/purchase.py:0
 #: code:addons/purchase/wizard/purchase_order_group.py:0
 #, python-format
 msgid "Warning"
@@ -536,6 +542,11 @@ msgstr ""
 msgid "To be Invoiced"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+msgid "Pricelists"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -548,6 +559,11 @@ msgid "From Order: a draft invoice will be pre-generated based on the purchase o
 "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #: code:addons/purchase/wizard/purchase_line_invoice.py:0
@@ -619,6 +635,7 @@ msgid "July"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
 msgstr ""
@@ -678,8 +695,9 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,invoice_id:0
-msgid "An invoice generated for a purchase order"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
 
 #. module: purchase
@@ -749,8 +767,9 @@ msgid "Procurement"
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.report,month:0
-msgid "September"
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: purchase
@@ -1028,6 +1047,25 @@ msgstr ""
 msgid "Compute"
 msgstr ""
 
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid "\n"
+"    Purchase module is for generating a purchase order for purchase of goods from a supplier.\n"
+"    A supplier invoice is created for the particular order placed\n"
+"    Dashboard for purchase management that includes:\n"
+"    * Current Purchase Orders\n"
+"    * Draft Purchase Orders\n"
+"    * Graph for quantity and amount per month    \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
@@ -1158,7 +1196,6 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-#: field:purchase.order,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1528,6 +1565,11 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 108d17bfd4b..0de19189fc3 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -88,12 +88,14 @@ class purchase_order(osv.osv):
                 res[purchase.id]=min_date
         return res
 
+
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for purchase in self.browse(cursor, user, ids, context=context):
             tot = 0.0
-            if purchase.invoice_id and purchase.invoice_id.state not in ('draft','cancel'):
-                tot += purchase.invoice_id.amount_untaxed
+            for invoice in purchase.invoice_ids:
+                if invoice.state not in ('draft','cancel'):
+                    tot += invoice.amount_untaxed
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:
@@ -137,10 +139,10 @@ class purchase_order(osv.osv):
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for purchase in self.browse(cursor, user, ids, context=context):
-            if purchase.invoice_id.reconciled:
-                res[purchase.id] = purchase.invoice_id.reconciled
-            else:
-                res[purchase.id] = False
+            invoiced = False
+            if purchase.invoiced_rate == 100.00:
+                invoiced = True
+            res[purchase.id] = invoiced
         return res
 
     STATE_SELECTION = [
@@ -177,7 +179,7 @@ class purchase_order(osv.osv):
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, help="An invoice generated for a purchase order"),
+        'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
         'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
@@ -378,7 +380,7 @@ class purchase_order(osv.osv):
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
             self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
             self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
-            self.write(cr, uid, [o.id], {'invoice_id': inv_id})
+            self.write(cr, uid, [o.id], {'invoice_ids': [(4, inv_id)]})
             res = inv_id
         return res
 
@@ -399,14 +401,14 @@ class purchase_order(osv.osv):
             for pick in purchase.picking_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
-            inv = purchase.invoice_id
-            if inv and inv.state not in ('cancel','draft'):
-                raise osv.except_osv(
-                    _('Could not cancel this purchase order !'),
-                    _('You must first cancel all invoices attached to this purchase order.'))
-            if inv:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+            for inv in purchase.invoice_ids:
+                if inv and inv.state not in ('cancel','draft'):
+                    raise osv.except_osv(
+                        _('Could not cancel this purchase order !'),
+                        _('You must first cancel all invoices attached to this purchase order.'))
+                if inv:
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
         for (id,name) in self.name_get(cr, uid, ids):
             message = _("Purchase order '%s' is cancelled.") % name
@@ -470,8 +472,8 @@ class purchase_order(osv.osv):
             'state':'draft',
             'shipped':False,
             'invoiced':False,
-            'invoice_id':False,
-            'picking_ids':[],
+            'invoice_ids': [],
+            'picking_ids': [],
             'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
         })
         return super(purchase_order, self).copy(cr, uid, id, default, context)
@@ -562,6 +564,7 @@ class purchase_order(osv.osv):
 
 
         allorders = []
+        orders_info = {}
         for order_key, (order_data, old_ids) in new_orders.iteritems():
             # skip merges with only one order
             if len(old_ids) < 2:
@@ -576,13 +579,14 @@ class purchase_order(osv.osv):
 
             # create the new order
             neworder_id = self.create(cr, uid, order_data)
+            orders_info.update({neworder_id: old_ids})
             allorders.append(neworder_id)
 
             # make triggers pointing to the old orders point to the new order
             for old_id in old_ids:
                 wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
                 wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
-        return allorders
+        return orders_info
 
 purchase_order()
 
@@ -648,9 +652,10 @@ class purchase_order_line(osv.osv):
         if not product:
             return {'value': {'price_unit': price_unit or 0.0, 'name': name or '',
                 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
+        res = {}
         prod= self.pool.get('product.product').browse(cr, uid, product)
 
-
+        product_uom_pool = self.pool.get('product.uom')
         lang=False
         if partner_id:
             lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
@@ -667,29 +672,31 @@ class purchase_order_line(osv.osv):
         seller_delay = 0
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
- 
+        res = {} 
         for s in prod.seller_ids:
             if s.name.id == partner_id:
                 seller_delay = s.delay
-                temp_qty = s.qty # supplier _qty assigned to temp
+                if s.product_uom:
+                    temp_qty = product_uom_pool._compute_qty(cr, uid, s.product_uom.id, s.min_qty, to_uom_id=prod.uom_id.id)
+                    uom = s.product_uom.id #prod_uom_po
+                temp_qty = s.min_qty # supplier _qty assigned to temp
                 if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
                     qty = temp_qty
-        if price_unit:
-            price = price_unit
-        else:
-            price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
-                    product, qty or 1.0, partner_id, {
+                    res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you cannot purchase less.') % qty}})
+        qty_in_product_uom = product_uom_pool._compute_qty(cr, uid, uom, qty, to_uom_id=prod.uom_id.id)
+        price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
+                    product, qty_in_product_uom or 1.0, partner_id, {
                         'uom': uom,
                         'date': date_order,
                         })[pricelist]
         dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
 
 
-        res = {'value': {'price_unit': price, 'name': name or prod_name,
+        res.update({'value': {'price_unit': price, 'name': name or prod_name,
             'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
             'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
             'product_qty': qty,
-            'product_uom': uom}}
+            'product_uom': uom}})
         domain = {}
 
         taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
@@ -710,6 +717,9 @@ class purchase_order_line(osv.osv):
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
                 partner_id, date_order=date_order,fiscal_position=fiscal_position)
         if 'product_uom' in res['value']:
+            if uom and uom != res['value']['product_uom']:
+                seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name']
+                res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % seller_uom_name }})
             del res['value']['product_uom']
         if not uom:
             res['value']['price_unit'] = 0.0
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index f95009aae9d..053c6f17b14 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -56,6 +56,10 @@
 
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
 
+        <record id="stock.res_company_tinyshop0" model="res.company">
+            <field eval="1.0" name="po_lead"/>
+            <field eval="80.0" name="schedule_range"/>
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 93c0e42fae2..b35e0626085 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -41,19 +41,19 @@
 
         <!-- Treat generated invoice -->
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding invoice" severity="fatal">
-            <test expr="bool(invoice_id)" />
+            <test expr="bool(invoice_ids)" />
         </assert>
 
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft">
-            <test expr="invoice_id.state">draft</test>
+            <test expr="invoice_ids[0].state">draft</test>
         </assert>
 
         <workflow model="account.invoice" action="invoice_open">
-            <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_id.id" />
+            <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_ids[0].id" />
         </workflow>
 
         <function model="account.invoice" name="pay_and_reconcile">
-            <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" />
+            <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_ids[0].id]" />
             <value eval="1164" />
             <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
@@ -64,7 +64,7 @@
         </function>
 
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice is now paid" severity="error">
-            <test expr="invoice_id.state">paid</test>
+            <test expr="invoice_ids[0].state">paid</test>
         </assert>
 
         <!-- Treat generated picking -->
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 227d317bd30..8950b66f528 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -8,6 +8,18 @@
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1" />
 
+        <menuitem id="menu_purchase_config_purchase" name="Configuration"
+            parent="base.menu_purchase_root" sequence="100"/>
+
+        <menuitem
+            action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
+            parent="menu_purchase_config_purchase" sequence="2"/>
+
+        <menuitem
+            action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
+            parent="menu_purchase_config_purchase" sequence="1"/>
+
+
         <!--supplier addresses action-->
         <record id="action_supplier_address_form" model="ir.actions.act_window">
             <field name="name">Addresses</field>
@@ -162,13 +174,15 @@
                             <group colspan="2" col="2">
                                 <separator string="Invoice Control" colspan="2"/>
                                 <field name="invoice_method"/>
-                                <field name="invoice_id" groups="base.group_extended" context="{'journal_type':'purchase', 'type':'in_invoice'}"/>
                                 <field name="fiscal_position" widget="selection"/>
                             </group>
                             <newline/>
                             <separator string="Purchase Control" colspan="4"/>
                             <field name="validator"/>
                             <field name="date_approve"/>
+                        	<separator string="Invoices" colspan="4"/>
+                        	<newline/>
+                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
@@ -268,8 +282,8 @@
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
-                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
-                            <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
+                            <field name="product_id" colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
+                            <field name="product_qty" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 966c5795b52..7857fa4586d 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -37,9 +37,9 @@
 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
 "access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
-"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,1,1,1
-"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,1,1,1
-"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,1,1,1
+"access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0
+"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0
+"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0
 "access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,1,1,1
 "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index 8c14611661c..454580baaf4 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -133,8 +133,8 @@
 -
   I check that Traceability moves are created.
 -
-  I check that an invoice_id field of Delivery&Invoices gets bind with the value.  
+  I check that an invoice_ids field of Delivery&Invoices gets bind with the value.  
 -
   !python {model: purchase.order}: |
     pur_id2=self.browse(cr, uid, ref("purchase_order_po0"))
-    assert(pur_id2.invoice_id)
+    assert(pur_id2.invoice_ids)
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index e68668f408d..357d865b9c9 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -139,8 +139,8 @@
       {'active_ids': pick_ids})
     self.create_invoice(cr, uid, [id], {"active_ids": pick_ids, "active_id": pick_ids[0]})
 -
-  I check that an invoice_id field of Delivery&Invoices gets bind with the value.
+  I check that an invoice_ids field of Delivery&Invoices gets bind with the value.
 -
   !python {model: purchase.order}: |
     pur_id2=self.browse(cr, uid, ref("purchase_order_po2"))
-    assert(pur_id2.invoice_id)
+    assert(pur_id2.invoice_ids)
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f57ae82e51f..f22df7aef41 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,57 +26,58 @@ from tools.translate import _
 
 
 class purchase_line_invoice(osv.osv_memory):
-    
+
     """ To create invoice for purchase order line"""
-    
+
     _name = 'purchase.order.line_invoice'
     _description = 'Purchase Order Line Make Invoice'
-    
+
     def makeInvoices(self, cr, uid, ids, context=None):
-        
-        """ 
+
+        """
              To get Purchase Order line and create Invoice
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
+             @param context: A standard dictionary
              @return : retrun view of Invoice
         """
-        
+
         if context is None:
             context={}
-                            
+
         record_ids =  context.get('active_ids',[])
         if record_ids:
             res = False
             invoices = {}
             invoice_obj=self.pool.get('account.invoice')
             purchase_line_obj=self.pool.get('purchase.order.line')
+            purchase_obj = self.pool.get('purchase.order')
             property_obj=self.pool.get('ir.property')
             account_fiscal_obj=self.pool.get('account.fiscal.position')
             invoice_line_obj=self.pool.get('account.invoice.line')
-            
-            
+            account_jrnl_obj=self.pool.get('account.journal')
+
             def multiple_order_invoice_name(orders):
                 name = "PO";
                 for order in orders:
                     name += "-%d" % order.id
                 return name
-                
+
             def multiple_order_invoice_reference(partner, orders):
                 reference = "P%dPO" % partner.id
-                for order in orders: 
+                for order in orders:
                     reference += "-%d" % order.id
                 return reference
-                
+
             def multiple_order_invoice_notes(orders):
                 notes = ""
                 for order in orders:
                     notes += "%s \n" % order.notes
                 return notes
-                
-                
-                
+
+
+
             def make_invoice_by_partner(partner, orders, lines_ids):
                 """
                     create a new invoice for one supplier
@@ -84,28 +85,32 @@ class purchase_line_invoice(osv.osv_memory):
                     @param orders : The set of orders to add in the invoice
                     @param lines : The list of line's id
                 """
-             
+                journal_id = account_jrnl_obj.search(cr, uid, [('type', '=', 'purchase')], context=None)
+                journal_id = journal_id and journal_id[0] or False
                 a = partner.property_account_payable.id
                 if partner and partner.property_payment_term.id:
                     pay_term = partner.property_payment_term.id
                 else:
                     pay_term = False
                 inv = {
-                    'name': multiple_order_invoice_name(orders),  
-                    'origin': multiple_order_invoice_name(orders),  
+                    'name': multiple_order_invoice_name(orders),
+                    'origin': multiple_order_invoice_name(orders),
                     'type': 'in_invoice',
+                    'journal_id':journal_id,
                     'reference': multiple_order_invoice_reference(partner, orders),
                     'account_id': a,
                     'partner_id': partner.id,
                     'address_invoice_id': orders[0].partner_address_id.id,
                     'address_contact_id': orders[0].partner_address_id.id,
                     'invoice_line': [(6,0,lines_ids)],
-                    'currency_id' : orders[0].pricelist_id.currency_id.id, 
+                    'currency_id' : orders[0].pricelist_id.currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
                     'payment_term': pay_term,
                     'fiscal_position': partner.property_account_position.id
                 }
                 inv_id = invoice_obj.create(cr, uid, inv)
+                for order in orders:
+                    order.write({'invoice_ids': [(4, inv_id)]})
                 return inv_id
 
             for line in purchase_line_obj.browse(cr,uid,record_ids):
@@ -136,18 +141,17 @@ class purchase_line_invoice(osv.osv_memory):
                         'uos_id': line.product_uom.id,
                         'product_id': line.product_id.id or False,
                         'invoice_line_tax_id': [(6, 0, [x.id for x in line.taxes_id])],
-                        'note': line.notes, 
+                        'note': line.notes,
                         'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
                     })
-                    cr.execute('insert into purchase_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
-                    purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True})
+                    purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True, 'invoice_lines': [(4, inv_id)]})
                     invoices[line.partner_id.id].append((line,inv_id))
 
             res = []
             for result in invoices.values():
                 il = map(lambda x: x[1], result)
                 orders = list(set(map(lambda x : x[0].order_id, result)))
-               
+
                 res.append(make_invoice_by_partner(orders[0].partner_id, orders, il))
 
         return {
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 2496044a45e..e6383f0dd5d 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -29,15 +29,15 @@ from tools.translate import _
 class purchase_order_group(osv.osv_memory):
     _name = "purchase.order.group"
     _description = "Purchase Order Merge"
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
                         context=None, toolbar=False, submenu=False):
-        """ 
+        """
          Changes the view dynamically
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return: New arch of view.
         """
         if context is None:
@@ -61,6 +61,7 @@ class purchase_order_group(osv.osv_memory):
 
         """
         order_obj = self.pool.get('purchase.order')
+        proc_obj = self.pool.get('procurement.order')
         mod_obj =self.pool.get('ir.model.data')
         if context is None:
             context = {}
@@ -68,9 +69,14 @@ class purchase_order_group(osv.osv_memory):
         id = mod_obj.read(cr, uid, result, ['res_id'])
 
         allorders = order_obj.do_merge(cr, uid, context.get('active_ids',[]), context)
+        for new_order in allorders:
+            proc_ids = proc_obj.search(cr, uid, [('purchase_id', 'in', allorders[new_order])], context=context)
+            for proc in proc_obj.browse(cr, uid, proc_ids, context=context):
+                if proc.purchase_id:
+                    proc_obj.write(cr, uid, [proc.id], {'purchase_id': new_order}, context)
 
         return {
-            'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
+            'domain': "[('id','in', [" + ','.join(map(str, allorders.keys())) + "])]",
             'name': 'Purchase Orders',
             'view_type': 'form',
             'view_mode': 'tree,form',
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 17cc9acb671..347e85ce5d5 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_analytic_plans/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2009-11-09 19:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-20 01:28+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: 2010-12-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
@@ -29,12 +30,12 @@ msgstr "Gestion de la Distribution Analytiqes des Achats"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Ligne de bon de commande"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Bon de commande"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 2b1f203ca37..1f66b471ddf 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:15+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:15+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,13 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr ""
 
+#. module: purchase_analytic_plans
+#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
+msgid "\n"
+"    The base module to manage analytic distribution and purchase orders.\n"
+"    "
+msgstr ""
+
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 0cfc48feccd..ff99be06ae3 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -31,7 +31,8 @@
     "depends" : ["purchase","mrp"],
     "init_xml" : [],
     "demo_xml" : ['purchase_requisition_demo.xml'],
-    "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
+    "update_xml" : ["security/purchase_tender.xml",
+                    "wizard/purchase_requisition_partner_view.xml",
                     "purchase_requisition_data.xml",
                     "purchase_requisition_view.xml",
                     "purchase_requisition_report.xml",
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 0606898063d..5af7c176be8 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:15+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:15+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -137,8 +137,8 @@ msgid "Request a Quotation"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
 msgstr ""
 
 #. module: purchase_requisition
@@ -151,6 +151,15 @@ msgstr ""
 msgid "Reset to Draft"
 msgstr ""
 
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid "\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr ""
+
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
 msgid "Address"
@@ -325,8 +334,8 @@ msgid "Purchase Requisition (exclusive)"
 msgstr ""
 
 #. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Multiple Requisitions"
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
 msgstr ""
 
 #. module: purchase_requisition
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 225137416bf..a0b4d7f217b 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -9,7 +9,6 @@
     <!--Resource: purchase.requisition-->
 
 		<record id="order_purchase_requisition1" model="purchase.requisition">
-            <field name="name">TE0001</field>
             <field name="user_id" model="res.users"/>
             <field name="exclusive">multiple</field>
             <field name="date_start">2010/09/16 15:56:14</field>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index d88ae8df725..b0a8b453730 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -89,28 +89,28 @@ class purchase_requisition_partner(osv.osv_memory):
                     partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
                     partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
-                    newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
-                    newdate = newdate - relativedelta(days=company.po_lead)
+
+                    if tender.date_start:
+                        newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
+                    else:
+                        newdate = datetime.today() - relativedelta(days=company.po_lead)
                     delay = partner_rec and partner_rec.delay or 0.0
-                    newdate = newdate -(delay and relativedelta(days=delay) or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    if delay:
+                        newdate -= relativedelta(days=delay)
+
                     partner = partner_rec and partner_rec.name or supplier_data
                     pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
                     location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
 
-                    if not newdate:
-                        date_planned = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
-                    else:
-                        date_planned = newdate.strftime('%Y-%m-%d %H:%M:%S')
-
                     purchase_order_line= {
                             'name': product.partner_ref,
                             'product_qty': line.product_qty,
                             'product_id': line.product_id.id,
                             'product_uom': uom_id,
                             'price_unit': price,
-                            'date_planned': date_planned,
+                            'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
                             'notes': product.description_purchase,
                     }
                     taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
diff --git a/addons/report_designer/i18n/report_designer.pot b/addons/report_designer/i18n/report_designer.pot
index 9b993d44581..ff9c07bbf99 100644
--- a/addons/report_designer/i18n/report_designer.pot
+++ b/addons/report_designer/i18n/report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,11 @@ msgstr ""
 msgid "Allows you to create any statistic reports  on several objects. It's a SQL query builder and browser for end users."
 msgstr ""
 
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid "Adds wizards to Import/Export .SXW report which you can modify in OpenOffice.Once you have modified it you can upload the report using the same wizard."
+msgstr ""
+
 #. module: report_designer
 #: model:ir.module.module,description:report_designer.module_meta_information
 msgid "Installer for reporting tools selection\n"
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index c2dcfd78499..a246cf3d8cb 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:05+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -81,8 +81,9 @@ msgid "March"
 msgstr ""
 
 #. module: report_intrastat
-#: selection:report.intrastat,month:0
-msgid "August"
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
 msgstr ""
 
 #. module: report_intrastat
@@ -184,8 +185,10 @@ msgid "Invoice"
 msgstr ""
 
 #. module: report_intrastat
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: model:ir.module.module,description:report_intrastat.module_meta_information
+msgid "\n"
+"    A module that adds intrastat reports.\n"
+"    This module gives the details of the goods traded between the countries of European Union "
 msgstr ""
 
 #. module: report_intrastat
@@ -251,9 +254,8 @@ msgid "November"
 msgstr ""
 
 #. module: report_intrastat
-#: report:account.invoice.intrastat:0
-#: field:report.intrastat.code,description:0
-msgid "Description"
+#: selection:report.intrastat,month:0
+msgid "August"
 msgstr ""
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/vi.po b/addons/report_intrastat/i18n/vi.po
index 045c5347d4a..7fa989d05e9 100644
--- a/addons/report_intrastat/i18n/vi.po
+++ b/addons/report_intrastat/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 14:24+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-20 00:12+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-12-17 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 62c20dc88bb..f66bcc9b3c6 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-09 10:36+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 10:20+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
@@ -85,7 +84,7 @@ msgstr "B7 21 88 x 125 mm"
 #: code:addons/report_webkit/webkit_report.py:0
 #, python-format
 msgid "Webkit render"
-msgstr ""
+msgstr "Renderizador del webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index 1f1e52ed9a5..350aa630ffa 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -341,8 +341,8 @@ msgid "Portrait"
 msgstr ""
 
 #. module: report_webkit
-#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
 msgstr ""
 
 #. module: report_webkit
@@ -435,6 +435,17 @@ msgstr ""
 msgid "A3  8   297 x 420 mm"
 msgstr ""
 
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+
 #. module: report_webkit
 #: help:res.company,lib_path:0
 msgid "Complete (Absolute) path to the wkhtmltopdf executable."
@@ -524,7 +535,7 @@ msgid "B9  23  33 x 62 mm"
 msgstr ""
 
 #. module: report_webkit
-#: selection:ir.header_webkit,orientation:0
-msgid "Landscape"
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
 msgstr ""
 
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
index 89dd7a2ef93..c3d772e81ee 100644
--- a/addons/report_webkit_sample/i18n/fr.po
+++ b/addons/report_webkit_sample/i18n/fr.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: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:52+0000\n"
+"PO-Revision-Date: 2010-12-18 15:37+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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit_sample
@@ -140,7 +140,7 @@ msgstr "Facture"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Remboursement fournisseur"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index 1e1573e7125..63e85ef71d4 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -97,6 +97,11 @@ msgstr ""
 msgid "Taxes"
 msgstr ""
 
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Amount"
+msgstr ""
+
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "VAT"
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index b7a7a475211..43985994c8b 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -185,6 +185,18 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid "\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index ae825e3dace..fa6b3bb4aa7 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-15 19:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 05:34+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: 2010-12-17 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -801,12 +801,15 @@ msgstr "Ο αριθμός πρωτοκόλλου σας"
 msgid ""
 "The name and address of the contact who requested the order or quotation."
 msgstr ""
+"Το όνομα και οι διευθύνσεις της επαφής που ζήτησε παραγγελία ή προσφορά."
 
 #. module: sale
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
+"Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
+"για λόγους ασφαλείας."
 
 #. module: sale
 #: view:sale.order:0
@@ -817,7 +820,7 @@ msgstr "Ποσότητα"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Παραπομπές"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -833,12 +836,12 @@ msgstr "Άκυρο"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist version for current sale order"
-msgstr ""
+msgstr "Έκδοση Τιμοκαταλόγου για την τρέχουσα παραγγελία πώλησης"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -855,12 +858,12 @@ msgstr "Τιμή Μονάδας"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Περιθώρια στις Παραγγελίες Πωλήσεων"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Συνολικός Φόρος που δεν εμπεριέχεται"
 
 #. module: sale
 #: view:sale.order:0
@@ -889,7 +892,7 @@ msgstr "Επαφή Τιμολογίου"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Άνοιχτο Τιμολογίου"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -931,7 +934,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Σχετική Παραλαβή"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -951,7 +954,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence Number"
-msgstr ""
+msgstr "Αριθμός Αλληλουχίας"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
@@ -966,23 +969,23 @@ msgstr "Κόστος Μεταφορικών"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Συνολικός Φόρος που εμπεριέχεται"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been cancelled."
-msgstr ""
+msgstr "Η παραγγελία πώλησης '%s' έχει ακυρωθεί"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Δημιουργία Λίστας Παραλαβής"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Πωλήσεις κατά Κατηγορία Προϊόντος"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -1010,7 +1013,7 @@ msgstr "Επαναδημιουργία Τιμολογίου"
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Παραλαβές προς Τιμολόγιση"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1989,7 +1992,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Προεπιλεγμένη Πολιτική Παραλαβής"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2006,7 +2009,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Αναζήτηση  Παραγγελίες Πωλήσεων"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 661fd5e33d9..27a50ad49fc 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 21:58+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-17 19:18+0000\n"
+"Last-Translator: Carlos-smile <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: 2010-12-17 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 6c72ba07863..0200bed049d 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 10:28+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 05:38+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: 2010-12-17 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index a4463271b39..705f991b0e8 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 23:57+0000\n"
-"Last-Translator: Paulino Ascenção <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 11:38+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: 2010-12-17 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1710,7 +1710,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "Entrega Completa"
+msgstr "Entrega total"
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index e2c016966d8..b1e1ba2aedc 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,6 +25,20 @@ msgstr ""
 msgid "If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
@@ -43,13 +57,14 @@ msgid "Configure Sales Order Logistics"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sale order request."
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
 msgstr ""
 
 #. module: sale
@@ -64,9 +79,8 @@ msgid "VAT"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You must first cancel stock moves attached to this sale order line."
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
 msgstr ""
 
 #. module: sale
@@ -98,12 +112,6 @@ msgstr ""
 msgid "Order Line"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Cannot delete a sale order line which is %s !"
-msgstr ""
-
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
@@ -139,9 +147,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
 msgstr ""
 
 #. module: sale
@@ -177,11 +184,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sale order is created"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
@@ -198,8 +200,8 @@ msgid "The invoice is created automatically if the shipping policy is 'Invoice f
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sale order"
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
 msgstr ""
 
 #. module: sale
@@ -212,6 +214,11 @@ msgstr ""
 msgid "Discount (%)"
 msgstr ""
 
+#. module: sale
+#: help:res.company,security_lead:0
+msgid "This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
@@ -220,14 +227,13 @@ msgid "Sales Manager Dashboard"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Could not cancel sale order !"
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -256,6 +262,15 @@ msgstr ""
 msgid "Conditions"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -263,8 +278,8 @@ msgid "There is no income category account defined in default Properties for Pro
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: view:sale.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: sale
@@ -273,8 +288,9 @@ msgid "You try to assign a lot which is not from the same product"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "invalid mode for test_state"
 msgstr ""
 
 #. module: sale
@@ -282,36 +298,35 @@ msgstr ""
 msgid "June"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
-#, python-format
-msgid "Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n"
-"1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sale Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-msgid "Quantity"
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
@@ -334,11 +349,6 @@ msgstr ""
 msgid "Quotation Date"
 msgstr ""
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sale Open Invoice"
-msgstr ""
-
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
@@ -355,12 +365,6 @@ msgstr ""
 msgid "Number Packages"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced !"
-msgstr ""
-
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
@@ -368,8 +372,14 @@ msgid "In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale
@@ -389,9 +399,9 @@ msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
 #, python-format
-msgid "Could not cancel this sale order !"
+msgid "You cannot make an advance on a sales order                              that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
@@ -403,9 +413,8 @@ msgid "Notes"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "The quotation '%s' has been converted to a sale order."
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -414,33 +423,9 @@ msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount"
-msgstr ""
-
-#. module: sale
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sale order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sale Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sale order"
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
 msgstr ""
 
 #. module: sale
@@ -463,6 +448,11 @@ msgstr ""
 msgid "March"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
@@ -474,9 +464,8 @@ msgid "Invoice address :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid "For every sales order line, a procurement order is created to supply the sold product."
 msgstr ""
 
 #. module: sale
@@ -484,6 +473,11 @@ msgstr ""
 msgid "Sales by Customer"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
@@ -494,11 +488,6 @@ msgstr ""
 msgid "Search Uninvoiced Lines"
 msgstr ""
 
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One Procurement order for each sale order line and for each of the components."
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
@@ -511,13 +500,19 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sale Make Invoice"
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
 msgstr ""
 
 #. module: sale
@@ -552,8 +547,8 @@ msgid "Quantity (UoM)"
 msgstr ""
 
 #. module: sale
-#: help:sale.installer,sale_layout:0
-msgid "Provides some features to improve the layout of the Sales Order reports."
+#: field:sale.order,create_date:0
+msgid "Creation Date"
 msgstr ""
 
 #. module: sale
@@ -577,15 +572,6 @@ msgstr ""
 msgid "Invalid action !"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.\n"
-"  - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.\n"
-"  - The 'Invoice from the picking' choice is used to create an invoice during the picking process."
-msgstr ""
-
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.report,pricelist_id:0
@@ -599,11 +585,6 @@ msgstr ""
 msgid "# of Qty"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
@@ -616,14 +597,13 @@ msgid "Shipped"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "invalid mode for test_state"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount"
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
 msgstr ""
 
 #. module: sale
@@ -669,6 +649,12 @@ msgstr ""
 msgid "Sales By Month"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
@@ -689,24 +675,46 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,shipped:0
+msgid "It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: model:ir.module.module,description:sale.module_meta_information
+msgid "\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
 msgstr ""
 
 #. module: sale
@@ -725,8 +733,8 @@ msgid "History"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid "The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
 msgstr ""
 
 #. module: sale
@@ -745,8 +753,9 @@ msgid "The name and address of the contact who requested the order or quotation.
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid "This is the days added to what you promise to customers for security purpose"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
 
 #. module: sale
@@ -771,20 +780,14 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist version for current sale order"
-msgstr ""
-
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sale Order Line"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
@@ -808,11 +811,6 @@ msgstr ""
 msgid "Compute"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction"
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
@@ -830,11 +828,6 @@ msgstr ""
 msgid "Open Invoice"
 msgstr ""
 
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Depending on the Invoicing control of the sale order, the invoice can be based on delivered or on ordered quantities. Thus, a sale order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
-msgstr ""
-
 #. module: sale
 #: report:sale.order:0
 #: view:sale.order.line:0
@@ -849,8 +842,9 @@ msgid "Sales Application Configuration"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: sale
@@ -879,13 +873,8 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence Number"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
 msgstr ""
 
 #. module: sale
@@ -903,12 +892,6 @@ msgstr ""
 msgid "Total Tax Included"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "The sale order '%s' has been cancelled."
-msgstr ""
-
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
@@ -929,6 +912,11 @@ msgstr ""
 msgid "Confirm Quotation"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
@@ -969,21 +957,11 @@ msgstr ""
 msgid "Pick List"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from Delivery"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sale order"
-msgstr ""
-
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
@@ -1004,15 +982,6 @@ msgstr ""
 msgid "Create Procurement Order"
 msgstr ""
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: field:stock.picking,sale_id:0
-msgid "Sale Order"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order,amount_tax:0
@@ -1020,11 +989,21 @@ msgstr ""
 msgid "Taxes"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
@@ -1036,22 +1015,6 @@ msgstr ""
 msgid "Create Invoices"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,state:0
-msgid "Gives the state of the quotation or sale order. \n"
-"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'."
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid "* The 'Draft' state is set when the related sale order in draft state.                     \n"
-"* The 'Confirmed' state is set when the related sale order is confirmed.                     \n"
-"* The 'Exception' state is set when the related sale order is set as exception.                     \n"
-"* The 'Done' state is set when the sale order line has been picked.                     \n"
-"* The 'Cancelled' state is set when a user cancel the sale order related."
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
@@ -1089,14 +1052,15 @@ msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid "The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'."
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
-msgid "Error !"
+msgid "Could not cancel sales order !"
 msgstr ""
 
 #. module: sale
@@ -1143,13 +1107,13 @@ msgid "Sales Management"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sale order line."
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
@@ -1185,11 +1149,6 @@ msgstr ""
 msgid "Sales Analysis"
 msgstr ""
 
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sale order"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
@@ -1212,16 +1171,6 @@ msgstr ""
 msgid "You can generate invoices based on sales orders or based on shippings."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Related Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sale order to invoice."
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1261,7 +1210,8 @@ msgstr ""
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
-msgid "Could not cancel sale order line!"
+msgid "You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
 msgstr ""
 
 #. module: sale
@@ -1269,6 +1219,11 @@ msgstr ""
 msgid "Picking List & Delivery Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
@@ -1285,8 +1240,19 @@ msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
 msgstr ""
 
 #. module: sale
@@ -1295,7 +1261,6 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_product_product
 #: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
 #: view:sale.report:0
@@ -1308,11 +1273,6 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sale order is confirmed"
-msgstr ""
-
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
@@ -1323,6 +1283,13 @@ msgstr ""
 msgid "sale.config.picking_policy"
 msgstr ""
 
+#. module: sale
+#: help:sale.order,state:0
+msgid "Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
@@ -1371,8 +1338,8 @@ msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sale order"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
 msgstr ""
 
 #. module: sale
@@ -1403,14 +1370,21 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
 msgid "Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
-msgid "It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
 msgstr ""
 
 #. module: sale
@@ -1427,8 +1401,8 @@ msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sale Order"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
 msgstr ""
 
 #. module: sale
@@ -1457,14 +1431,13 @@ msgid "Invoice Exception"
 msgstr ""
 
 #. module: sale
-#: help:sale.installer,sale_margin:0
-msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
+#: help:sale.order,picking_ids:0
+msgid "This is a list of picking that has been generated for this sales order."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You must first cancel all invoices attached to this sale order."
+#: help:sale.installer,sale_margin:0
+msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
 msgstr ""
 
 #. module: sale
@@ -1527,7 +1500,12 @@ msgid "You selected a quantity of %d Units.\n"
 msgstr ""
 
 #. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr ""
 
@@ -1536,6 +1514,11 @@ msgstr ""
 msgid "Quantity (UoS)"
 msgstr ""
 
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid "The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
@@ -1551,12 +1534,6 @@ msgstr ""
 msgid "Error! You can not create recursive companies."
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You must first cancel all picking attached to this sale order."
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
@@ -1579,22 +1556,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on Order After Delivery"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid "For every sale order line, a procurement order is created to supply the sold product."
-msgstr ""
-
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
@@ -1611,13 +1572,16 @@ msgid "The Shipping Policy is used to configure per order if you want to deliver
 msgstr ""
 
 #. module: sale
-#: view:sale.installer:0
-msgid "Configure"
+#: selection:sale.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,origin:0
-msgid "Source document"
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
 msgstr ""
 
 #. module: sale
@@ -1627,6 +1591,7 @@ msgstr ""
 
 #. module: sale
 #: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr ""
@@ -1643,15 +1608,8 @@ msgid "Image"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You have to select a customer in the sale form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax"
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid "A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. "
 msgstr ""
 
 #. module: sale
@@ -1671,14 +1629,13 @@ msgid "Salesman"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
 msgstr ""
 
 #. module: sale
@@ -1691,8 +1648,9 @@ msgid "Advance Invoice"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sale Order Requisition"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sales order '%s' has been cancelled."
 msgstr ""
 
 #. module: sale
@@ -1700,6 +1658,25 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: help:sale.order.line,state:0
+msgid "* The 'Draft' state is set when the related sales order in draft state.                     \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.                     \n"
+"* The 'Exception' state is set when the related sales order is set as exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.                     \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
@@ -1724,9 +1701,8 @@ msgid "Sales Orders"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
-#, python-format
-msgid "You cannot make an advance on a sale order                              that is defined as 'Automatic Invoice after delivery'."
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
@@ -1751,6 +1727,12 @@ msgstr ""
 msgid "You invoice has been successfully created!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
@@ -1783,6 +1765,11 @@ msgstr ""
 msgid "Commitment Delay"
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid "One Procurement order for each sales order line and for each of the components."
+msgstr ""
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
@@ -1793,15 +1780,31 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sale Shop"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
 msgstr ""
 
 #. module: sale
@@ -1826,8 +1829,13 @@ msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sale Order Lines"
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
@@ -1868,20 +1876,19 @@ msgstr ""
 msgid "Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."
 msgstr ""
 
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr ""
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "The sale order '%s' has been set in draft state."
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
 msgstr ""
 
 #. module: sale
@@ -1890,6 +1897,11 @@ msgstr ""
 msgid "Search Sales Order"
 msgstr ""
 
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order,payment_term:0
@@ -1897,8 +1909,8 @@ msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. "
+#: help:sale.installer,sale_layout:0
+msgid "Provides some features to improve the layout of the Sales Order reports."
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index c2c57f6c9a6..91b7a41eed6 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-15 20:58+0000\n"
+"PO-Revision-Date: 2010-12-18 11:09+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: 2010-12-17 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -33,7 +33,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr "Dag"
+msgstr "Day"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 2d6fc87a240..add21f48cb3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -727,7 +727,6 @@ class sale_order(osv.osv):
                     })
                     proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
-
                     if order.state == 'shipping_except':
                         for pick in order.picking_ids:
                             for move in pick.move_lines:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a98cf80c4d2..26adb765c00 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -138,7 +138,7 @@
                                                 <field groups="product.group_uos" name="product_uos_qty"/>
                                                 <field groups="product.group_uos" name="product_uos"/>
                                             <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)" domain="[('category_id','=', product_id.uom_id.category_id.id)]"/>
+                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 69e30517e76..923c91fb3aa 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -51,5 +51,5 @@
 "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
-"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,1,1,0
+"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
 "access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index 355a849a351..4212b772b9f 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,14 @@ msgid "Sales Analytic Distribution Management"
 msgstr ""
 
 #. module: sale_analytic_plans
-#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
-msgid "Sale Order Line"
+#: model:ir.module.module,description:sale_analytic_plans.module_meta_information
+msgid "\n"
+"    The base module to manage analytic distribution and sales orders.\n"
+"    "
+msgstr ""
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 397e0846480..fda5abb5765 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-09 11:28+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 10:09+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -115,7 +114,7 @@ msgstr "Tienda"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Oportunidades por etapa"
 
 #. module: sale_crm
 #: view:board.board:0
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index b45fd1831a7..b62b6c2a5b7 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-04 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 12:05+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -24,13 +24,13 @@ msgstr "Client"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Convertir en devis"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "is converted to Quotation."
-msgstr ""
+msgstr "a été converti en devis."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -47,18 +47,20 @@ msgstr "Le client n'a pas d'adresse définie !"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Créer"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Cocher cette case pour fermer l'opportunité après avoir créé la commande "
+"client"
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr "Convertir en chiffrage"
+msgstr "Convertir en devis"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
@@ -70,29 +72,29 @@ msgstr "Chiffre d'affaires mensuel"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Converti en devis (id. :%s)."
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr "Faire un chiffrage"
+msgstr "Faire un devis"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity "
-msgstr ""
+msgstr "Opportunité "
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Opportunité : %s"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Commande de vente"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
@@ -102,7 +104,7 @@ msgstr "Créer une commande de vente à partir de l'opportunité"
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Devis"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -117,12 +119,12 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Mes devis"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Fermer l'opportunité"
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -133,7 +135,7 @@ msgstr ""
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sale"
-msgstr ""
+msgstr "Créer une vente"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 64a74124318..5eeb10ae179 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-11-30 17:04+0000\n"
+"PO-Revision-Date: 2010-12-19 13:07+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -112,7 +112,7 @@ msgstr "Магазин"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Сделки по этапам"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -122,7 +122,7 @@ msgstr "Мои предложения"
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr "Закрыть предложение"
+msgstr "Закрыть сделку"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 84bac8e3530..2078a202072 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:20+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:20+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -43,6 +43,25 @@ msgstr ""
 msgid "Customer has no addresses defined!"
 msgstr ""
 
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid "\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and the\n"
+"crm modules.\n"
+"    "
+msgstr ""
+
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
@@ -70,11 +89,6 @@ msgstr ""
 msgid "Converted to Sales Quotation(id: %s)."
 msgstr ""
 
-#. module: sale_crm
-#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
-msgid "Make Quotation"
-msgstr ""
-
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
@@ -87,11 +101,6 @@ msgstr ""
 msgid "Opportunity: %s"
 msgstr ""
 
-#. module: sale_crm
-#: model:ir.model,name:sale_crm.model_sale_order
-msgid "Sale Order"
-msgstr ""
-
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
@@ -129,8 +138,8 @@ msgid "Sales Team"
 msgstr ""
 
 #. module: sale_crm
-#: model:ir.model,name:sale_crm.model_crm_make_sale
-msgid "Make sale"
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
 msgstr ""
 
 #. module: sale_crm
@@ -138,3 +147,8 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
diff --git a/addons/sale_crm/i18n/vi.po b/addons/sale_crm/i18n/vi.po
index 980343b79a7..f1f4244b1be 100644
--- a/addons/sale_crm/i18n/vi.po
+++ b/addons/sale_crm/i18n/vi.po
@@ -8,42 +8,42 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-19 19:30+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Khách hàng"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Chuyển thành báo giá"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "is converted to Quotation."
-msgstr ""
+msgstr "đã được chuyển thành báo giá"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Dữ liệu không đầy đủ!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Khách hàng không có địa chỉ"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -65,7 +65,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Doanh số hàng tháng"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -76,39 +76,39 @@ msgstr ""
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr ""
+msgstr "Tạo báo giá"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity "
-msgstr ""
+msgstr "Cơ hội "
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Cơ hội: %s"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Đơn hàng"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Tạo đơn hàng từ Cơ hội"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Các báo giá"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Cửa hàng"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -123,13 +123,13 @@ msgstr ""
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Đóng Cơ hội"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Nhóm bán hàng"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
@@ -139,4 +139,4 @@ msgstr ""
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
diff --git a/addons/sale_journal/i18n/el.po b/addons/sale_journal/i18n/el.po
new file mode 100644
index 00000000000..74940d36dc5
--- /dev/null
+++ b/addons/sale_journal/i18n/el.po
@@ -0,0 +1,123 @@
+# Greek 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-17 10:03+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: 2010-12-18 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "Ο τύπος ημερολογίου που χρησιμοποιήθηκε για πωλήσεις και παραλαβή."
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sale Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Τιμολόγηση"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used on partners, sales order and delivery orders. You can "
+"create journal to group your invoicing according to customer's needs: daily, "
+"each wednesday, monthly, etc."
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Πωλήσεις & Αγορές"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Σημειώσεις"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Μέθοδος Τιμολόγησης"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "Τύποι Τιμολογίων"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr ""
diff --git a/addons/sale_journal/i18n/mn.po b/addons/sale_journal/i18n/mn.po
index 7acce1767aa..be87927effc 100644
--- a/addons/sale_journal/i18n/mn.po
+++ b/addons/sale_journal/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:17+0000\n"
+"PO-Revision-Date: 2010-12-18 16:17+0000\n"
 "Last-Translator: badralb <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: 2010-12-17 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -61,6 +61,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Идэвхитэй талбарын утга False болсон бол нэхэмжлэлийн төрлийг далдлах боломж "
+"олгоно."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -92,7 +94,7 @@ msgstr "Бүлэглэгдсэн"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Алдаа! Рекурсив холбоотой гишүүдийг үүсгэх боломжгүй."
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index e3525f63047..9b245d8d645 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:20+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:20+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
-msgid "Sale Order"
+msgid "Sales Order"
 msgstr ""
 
 #. module: sale_journal
@@ -61,10 +61,30 @@ msgid "Invoicing Method"
 msgstr ""
 
 #. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
-#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
-msgid "Invoice Types"
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid "\n"
+"    The sales journal modules allows you to categorise your\n"
+"    sales and deliveries (picking lists) between different journals.\n"
+"    This module is very helpful for bigger companies that\n"
+"    works by departments.\n"
+"\n"
+"    You can use journal for different purposes, some examples:\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"    Journals have a responsible and evolves between different status:\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"    Batch operations can be processed on the different journals to\n"
+"    confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+"    It also supports batch invoicing methods that can be configured by\n"
+"    partners and sales orders, examples:\n"
+"    * daily invoicing,\n"
+"    * monthly invoicing, ...\n"
+"\n"
+"    Some statistics by journals are provided.\n"
+"    "
 msgstr ""
 
 #. module: sale_journal
@@ -105,6 +125,13 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr ""
+
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
 msgid "Picking List"
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index d2872efdd8a..9efb5604679 100644
--- a/addons/sale_journal/i18n/vi.po
+++ b/addons/sale_journal/i18n/vi.po
@@ -1,26 +1,26 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-17 17:50+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 msgid "Note"
-msgstr ""
+msgstr "Ghi chú"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
@@ -30,12 +30,12 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Đơn hàng"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Hóa đơn"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -48,7 +48,7 @@ msgstr ""
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Bán hàng & Mua hàng"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -60,29 +60,29 @@ msgstr ""
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
 msgid "Notes"
-msgstr ""
+msgstr "Ghi chú"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Phương thức hóa đơn"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoice Types"
-msgstr ""
+msgstr "Các loại hóa đơn"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr ""
+msgstr "Không nhóm"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Đã nhóm"
 
 #. module: sale_journal
 #: constraint:res.partner:0
@@ -100,7 +100,7 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr ""
+msgstr "Loại hóa đơn"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 1f771ff3044..f8db8d5d868 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -27,7 +27,7 @@
     This module provides features to improve the layout of the Sales Order.
 
     It gives you the possibility to
-        * order all the lines of an sales order
+        * order all the lines of a sales order
         * add titles, comment lines, sub total lines
         * draw horizontal lines and put page breaks
 
diff --git a/addons/sale_layout/i18n/el.po b/addons/sale_layout/i18n/el.po
new file mode 100644
index 00000000000..ff77daa1761
--- /dev/null
+++ b/addons/sale_layout/i18n/el.po
@@ -0,0 +1,273 @@
+# Greek 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-17 09:57+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: 2010-12-18 05:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Υποσύνολο"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Τίτλος"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Εκπτ. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Τιμή Μονάδος"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Αρ. Παραγγελίας"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Γραμμές Παραγγελίας"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Εκπτ.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Γραμμή Παραγγελίας Πώλησης"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Ιεράρχ."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Προϊόν"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Περιγραφή"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Ο Πωλητής Μας"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Γραμμές Τιμολογίου"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Ποσότητα"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Αρ. Προσφοράς"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "ΦΠΑ"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Κάντε Τιμολόγιο"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Διεύθυνση τιμολογίου:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sale Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Φαξ:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Σημειώσεις"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Ημερομηνία Παραγγελίας"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Διεύθυνση Αποστολής"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Φόροι"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Καθαρό Σύνολο:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Τηλ. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Σύνολο :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Όροι Πληρωμής"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Ιστορικό"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Γραμμές Εντολών Πώλησης"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Γραμμή Διαχωρισμού"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Η Αναφορά Σας"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Ημερομηνία Προσφοράς"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Ποσ."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Καταστάσεις"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Γραμμές παραγγελίας Πώλησης"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Επιπλέον πληροφορίες"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Μ.Μ."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Αλλαγή σελίδας"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Γραμμή Παραγγελίας"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Τιμή"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Φόροι:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Κινήσεις Αποθέματος"
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 4c14fb9ce75..0a53d908bbf 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:42+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:09+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
@@ -190,7 +190,7 @@ msgstr "Plazos de pago"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Historial"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -235,7 +235,7 @@ msgstr "Líneas del pedido de ventas"
 #. module: sale_layout
 #: model:ir.actions.report.xml,name:sale_layout.sale_order_1
 msgid "Order with Layout"
-msgstr ""
+msgstr "Pedido con plantilla"
 
 #. module: sale_layout
 #: view:sale.order:0
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
index 040aeb9780b..476b762947a 100644
--- a/addons/sale_layout/i18n/sale_layout.pot
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,19 @@ msgstr ""
 msgid "Sub Total"
 msgstr ""
 
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid "\n"
+"    This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+"    It gives you the possibility to\n"
+"        * order all the lines of a sales order\n"
+"        * add titles, comment lines, sub total lines\n"
+"        * draw horizontal lines and put page breaks\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Title"
@@ -61,13 +74,13 @@ msgid "Layout Type"
 msgstr ""
 
 #. module: sale_layout
-#: model:ir.model,name:sale_layout.model_sale_order_line
-msgid "Sale Order Line"
+#: view:sale.order:0
+msgid "Seq."
 msgstr ""
 
 #. module: sale_layout
 #: view:sale.order:0
-msgid "Seq."
+msgid "UoM"
 msgstr ""
 
 #. module: sale_layout
@@ -136,13 +149,8 @@ msgid "Sale Order Layout"
 msgstr ""
 
 #. module: sale_layout
-#: model:ir.model,name:sale_layout.model_sale_order
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale_layout
-#: report:sale.order.layout:0
-msgid "Fax :"
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
 msgstr ""
 
 #. module: sale_layout
@@ -241,13 +249,18 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: sale_layout
-#: view:sale.order:0
-msgid "UoM"
+#: report:sale.order.layout:0
+msgid "Taxes :"
 msgstr ""
 
 #. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Page Break"
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: sale_layout
@@ -261,8 +274,8 @@ msgid "Price"
 msgstr ""
 
 #. module: sale_layout
-#: report:sale.order.layout:0
-msgid "Taxes :"
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: sale_layout
diff --git a/addons/sale_margin/i18n/el.po b/addons/sale_margin/i18n/el.po
new file mode 100644
index 00000000000..269223088de
--- /dev/null
+++ b/addons/sale_margin/i18n/el.po
@@ -0,0 +1,330 @@
+# Greek 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-17 16:11+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: 2010-12-18 05:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Category"
+msgstr "Κατηγορία"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Επιστροφή Χρημάτων Πελάτη"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Τιμολόγιο Πελάτη"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "February"
+msgstr "Φεβρουάριος"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Current"
+msgstr "Τρέχων"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Group By..."
+msgstr "Ομαδοποίηση ανά..."
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Δημιουργία Τιμολογίου"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Προσχέδιο"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Εξοφλημένο"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_stock_picking
+msgid "Picking List"
+msgstr "Λίστα Παραλαβής"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,type:0
+msgid "Type"
+msgstr "Τύπος"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Γραμμή Παραγγελίας Πώλησης"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "Invoice Statistics"
+msgstr "Στατιστικά Τιμολογίου"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Προϊόν"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoice by Partner"
+msgstr "Τιμολόγιο κατά Συνεργάτη"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "August"
+msgstr "Αύγουστος"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Προ-φόρμα"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "May"
+msgstr "Μάιος"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "June"
+msgstr "Ιούνιος"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Date Invoiced"
+msgstr "Ημερομηνία Τιμολόγησης"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sales Order"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Search Margin"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Αυτό το έτος"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,date:0
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "July"
+msgstr "Ιούλιος"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Extended Filters..."
+msgstr "Εκτεταμένα Φίλτρα..."
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "This Month"
+msgstr "Αυτό το μήνα"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,day:0
+msgid "Day"
+msgstr "Ημέρα"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,categ_id:0
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#. 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:account.invoice.line,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Τιμή Κόστους"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "October"
+msgstr "Οκτώβριος"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
+msgstr "Έτος"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "January"
+msgstr "Ιανουάριος"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sale Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "September"
+msgstr "Σεπτέμβριος"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "April"
+msgstr "Απρίλιος"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Ποσό"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Επιστροφή Χρημάτων Προμηθευτή"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "March"
+msgstr "Μάρτιος"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Περιθώριο"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "November"
+msgstr "Νοέμβριος"
+
+#. module: sale_margin
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Ποσότητα"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: sale_margin
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Τιμολόγια"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,month:0
+msgid "December"
+msgstr "Δεκέμβριος"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Γραμμή Τιμολογίου"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,month:0
+msgid "Month"
+msgstr "Μήνας"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Ακυρώθηκε"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice Report"
+msgstr ""
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Done"
+msgstr "Ολοκληρώθηκε"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_reoirt
+msgid "Invoice"
+msgstr "Τιμολόγιο"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Customer Invoices"
+msgstr "Παραστατικά πελάτη"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: sale_margin
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Ανοιχτό"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report
+msgid "Invoice Analysis"
+msgstr ""
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index bb95ecac38a..c4b4e526bc9 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,8 +52,11 @@ msgid "State"
 msgstr ""
 
 #. module: sale_margin
-#: view:stock.picking:0
-msgid "Create Invoice"
+#: model:ir.module.module,description:sale_margin.module_meta_information
+msgid " \n"
+"    This module adds the 'Margin' on sales order,\n"
+"    which gives the profitability by calculating the difference between the Unit Price and Cost Price\n"
+"    "
 msgstr ""
 
 #. module: sale_margin
@@ -73,13 +76,13 @@ msgid "Picking List"
 msgstr ""
 
 #. module: sale_margin
-#: field:report.account.invoice.product,type:0
-msgid "Type"
+#: help:sale.order,margin:0
+msgid "It gives profitability by calculating the difference between the Unit Price and Cost Price."
 msgstr ""
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_sale_order_line
-msgid "Sale Order Line"
+#: field:report.account.invoice.product,type:0
+msgid "Type"
 msgstr ""
 
 #. module: sale_margin
@@ -170,11 +173,6 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#. 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:account.invoice.line,cost_price:0
 #: field:report.account.invoice.product,cost_price:0
@@ -187,20 +185,15 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-#: field:report.account.invoice.product,year:0
-msgid "Year"
-msgstr ""
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "January"
 msgstr ""
 
 #. module: sale_margin
-#: model:ir.model,name:sale_margin.model_sale_order
-msgid "Sale Order"
+#: view:report.account.invoice.product:0
+#: field:report.account.invoice.product,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale_margin
@@ -312,6 +305,11 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: sale_margin
 #: selection:report.account.invoice.product,state:0
 msgid "Open"
@@ -322,3 +320,8 @@ msgstr ""
 msgid "Invoice Analysis"
 msgstr ""
 
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 19a4f4ac9ee..c15ea3c2135 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -37,30 +37,3 @@
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so11"))
     assert so.margin, "No margin !" 
--
-  I verify that the picking has been generated for the sale order
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so11"))
-    assert so.picking_ids,"Picking has not been generated"
--
-  Then I click on the 'Create Invoice' button of 'Outgoing Orders'
--
-  !python {model: stock.picking}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so11"))
-    ids = self.search(cr, uid, [('origin', '=', so.name),('type', '=', 'out')])
-    self.create_invoice(cr, uid, ids, {"lang": "en_US", "search_default_available":
-      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
-      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
-      })
--
-  I verify that an invoice has been generated from picking
--
-  !python {model: stock.picking}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so11"))
-    pick_ids = self.search(cr, uid, [('origin', '=', so.name)])
-    pick_brw = self.browse(cr, uid, pick_ids[0])
-    assert pick_brw.invoice_ids,"Invoice has not been created"
-    
\ No newline at end of file
diff --git a/addons/sale_mrp/i18n/mn.po b/addons/sale_mrp/i18n/mn.po
index 3a3060145fa..27157dbeddd 100644
--- a/addons/sale_mrp/i18n/mn.po
+++ b/addons/sale_mrp/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 15:56+0000\n"
+"PO-Revision-Date: 2010-12-18 16:16+0000\n"
 "Last-Translator: badralb <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: 2010-12-17 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -40,12 +40,12 @@ msgstr "Үйлдвэрлэлийн Захиалга"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "Борлуулалтын Лавлах"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Борлуулалтын ба ҮНТ Удирдлага"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 68a1361c0e3..3c48f2cfc18 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,17 +17,12 @@ msgstr ""
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
-msgid "Indicate the Customer Reference from sale order."
+msgid "Indicate the Customer Reference from sales order."
 msgstr ""
 
 #. module: sale_mrp
-#: help:mrp.production,sale_name:0
-msgid "Indicate the name of sale order."
-msgstr ""
-
-#. module: sale_mrp
-#: field:mrp.production,sale_name:0
-msgid "Sale Name"
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
 msgstr ""
 
 #. module: sale_mrp
@@ -36,8 +31,18 @@ msgid "Manufacturing Order"
 msgstr ""
 
 #. module: sale_mrp
-#: field:mrp.production,sale_ref:0
-msgid "Sale Reference"
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid "\n"
+"    This module provides facility to the user to install mrp and sales modules\n"
+"    at a time. It is basically used when we want to keep track of production\n"
+"    orders generated from sales order.\n"
+"    It adds sales name and sales Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
 msgstr ""
 
 #. module: sale_mrp
@@ -50,3 +55,8 @@ msgstr ""
 msgid "Order quantity cannot be negative or zero !"
 msgstr ""
 
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
+
diff --git a/addons/sale_order_dates/i18n/el.po b/addons/sale_order_dates/i18n/el.po
new file mode 100644
index 00000000000..b2f48facb20
--- /dev/null
+++ b/addons/sale_order_dates/i18n/el.po
@@ -0,0 +1,58 @@
+# Greek 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-17 12:28+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: 2010-12-18 05:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created"
+msgstr "Ημερομηνία που δημιουργήθηκε η παραλαβή"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Ημερομηνία έναρξης ισχύος"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 009848a674f..4018dd512e1 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: sale_order_dates
-#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
-msgid "Sale Order Dates"
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
 msgstr ""
 
 #. module: sale_order_dates
@@ -25,29 +25,19 @@ msgstr ""
 msgid "Commitment Date"
 msgstr ""
 
-#. module: sale_order_dates
-#: model:ir.model,name:sale_order_dates.model_sale_order
-msgid "Sale Order"
-msgstr ""
-
-#. module: sale_order_dates
-#: help:sale.order,effective_date:0
-msgid "Date on which picking is created"
-msgstr ""
-
 #. module: sale_order_dates
 #: field:sale.order,effective_date:0
 msgid "Effective Date"
 msgstr ""
 
 #. module: sale_order_dates
-#: help:sale.order,commitment_date:0
-msgid "Date on which delivery of products is to be made"
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
 msgstr ""
 
 #. module: sale_order_dates
-#: help:sale.order,requested_date:0
-msgid "Date on which customer has requested for sales"
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
 msgstr ""
 
 #. module: sale_order_dates
@@ -55,3 +45,20 @@ msgstr ""
 msgid "Requested Date"
 msgstr ""
 
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid "\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+""
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr ""
+
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index d437031ab1d..b350a333cac 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
 
 #. module: share
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
 msgstr ""
 
 #. module: share
@@ -55,8 +55,9 @@ msgid "Sharing Wizard - Step 1"
 msgstr ""
 
 #. module: share
-#: view:share.wizard:0
-msgid "Who would you want to share this data with?"
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
 msgstr ""
 
 #. module: share
@@ -68,10 +69,8 @@ msgid "Dear,\n"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "You may use your existing login and password to view it. As a reminder, your login is %s.\n"
-""
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
 
 #. module: share
@@ -189,14 +188,14 @@ msgid "New users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "%s (Shared)"
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
 msgstr ""
 
 #. module: share
-#: selection:share.wizard,user_type:0
-msgid "New users (emails required)"
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s (Shared)"
 msgstr ""
 
 #. module: share
@@ -205,14 +204,8 @@ msgid "The name of the group must be unique !"
 msgstr ""
 
 #. module: share
-#: model:ir.module.module,shortdesc:share.module_meta_information
-msgid "Sharing Tools"
-msgstr ""
-
-#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
-#, python-format
-msgid "Database"
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
@@ -244,8 +237,18 @@ msgid "Password"
 msgstr ""
 
 #. module: share
-#: field:share.wizard,user_type:0
-msgid "Users to share with"
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid "The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the /shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
 msgstr ""
 
 #. module: share
@@ -260,8 +263,16 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: model:ir.model,name:share.model_res_groups
-msgid "Access Groups"
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "You may use your existing login and password to view it. As a reminder, your login is %s.\n"
+""
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Database"
 msgstr ""
 
 #. module: share
@@ -285,6 +296,11 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:0
 #, python-format
@@ -392,10 +408,8 @@ msgid "Sharing access could not be setup"
 msgstr ""
 
 #. module: share
-#: model:ir.actions.act_window,name:share.action_share_wizard
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 #: model:ir.model,name:share.model_share_wizard
-#: model:ir.ui.menu,name:share.menu_action_share_wizard
 #: field:share.wizard.result.line,share_wizard_id:0
 #: field:share.wizard.user,share_wizard_id:0
 msgid "Share Wizard"
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 0b85511050d..987a0e12493 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -45,10 +45,11 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
-        "security/stock_security.xml",  
-        "security/ir.model.access.csv",                  
+        "security/stock_security.xml",
+        "security/ir.model.access.csv",
         "stock_data.xml",
         "wizard/stock_move_view.xml",
+        "wizard/stock_change_product_qty_view.xml",
         "wizard/stock_partial_picking_view.xml",
         "wizard/stock_partial_move_view.xml",
         "wizard/stock_fill_inventory_view.xml",
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 4ef7f380dc8..93dc81bf14c 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-11-25 19:33+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:44+0000\n"
+"Last-Translator: Jacara <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: 2010-12-17 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -450,7 +450,7 @@ msgstr "Энэ байрлалд бараа алга."
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Гаралтын байршил"
+msgstr "Гаралтын байрлал"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
@@ -1118,6 +1118,12 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Хэлхээт байрлалын төрлийг сонгосон үед хэрэглэгдэнэ. 'Автомат хөдөлгөөн' "
+"сонговол хэлхээт хөдөлгөөний баримт автоматаар үүсч автоматаар "
+"гүйцэтгэгдэнэ.(нэмэлт гар ажиллагаа орохгүй). 'Гараар' сонговол хэлхээт "
+"хөдөлгөөний баримтыг ажилтан гараар гүйцэтгэнэ. 'Нэмэлт хөдөлгөөн үүсэхгүй' "
+"сонговол хэлхээт хөдөлгөөн үүсэхгүй харин үндсэн хөдөлгөөний хүргэх байрлал "
+"нь хэлхээт байрлалаар солигдоно."
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1577,7 +1583,7 @@ 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:0
@@ -1694,7 +1700,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr "Дараагийн үйл ажиллагаа"
+msgstr "Батлах"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1915,7 +1921,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Автомаатаар алхам нэмэгдээгүй"
+msgstr "Нэмэлт хөдөлгөөн үүсгэхгүй"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3027,7 +3033,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "Хэлхээ байрлалын төрөл"
+msgstr "Хэлхээт байрлалын төрөл"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -3061,6 +3067,16 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Тухайн байрлал дээр бараа орлогод авахад залгуулаад ирсэн тоо хэмжээгээр өөр "
+"байрлал руу зарлага гаргах агуулахын баримтыг систем автоматаар үүсгэх "
+"эсэхийг тодорхойлно. Үүнийг хэлхээт хөдөлгөөн гэх ба дараах төрлүүдээр "
+"хийгдэнэ :\n"
+"* Хоосон: Уг байрлалаас хэлхээт хөдөлгөөн хийгдэхгүй\n"
+"* Хэрэглэгч: Уг байрлал дээр орлого авагдахад дагаад хэрэглэгч байрлал руу "
+"зарлага хийгдэх баримт автоматаар үүснэ\n"
+"* Тогтмол байрлал: Уг байрлал дээр орлого авагдахад дагаад өөр байрлал руу "
+"зарлага хийгдэх баримт үүснэ. Хэлхээт байрлал талбарт зарлага хийх байрлалыг "
+"сонгож өгнө."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index f6007531904..32bb0611101 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:25+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:25+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -102,6 +102,7 @@ msgstr ""
 #: report:lot.stock.overview_all:0
 #: field:report.stock.inventory,product_qty:0
 #: field:report.stock.move,product_qty:0
+#: field:stock.change.product.qty,new_quantity:0
 #: field:stock.inventory.line,product_qty:0
 #: field:stock.inventory.line.split,qty:0
 #: report:stock.inventory.move:0
@@ -200,8 +201,8 @@ msgid "Origin"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
 msgstr ""
 
 #. module: stock
@@ -433,11 +434,6 @@ msgstr ""
 msgid "Location Type"
 msgstr ""
 
-#. module: stock
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
@@ -726,8 +722,15 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
+#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
+#: model:ir.model,name:stock.model_stock_change_product_qty
+#: view:stock.change.product.qty:0
+msgid "Change Product Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
 msgstr ""
 
 #. module: stock
@@ -794,6 +797,7 @@ msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
+#: report:stock.picking.list:0
 msgid "Journal"
 msgstr ""
 
@@ -887,6 +891,7 @@ msgid "Address of partner"
 msgstr ""
 
 #. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
 #: model:res.company,overdue_msg:stock.res_company_tinyshop0
 msgid "\n"
 "Date: %(date)s\n"
@@ -1040,8 +1045,8 @@ msgid "Downstream Traceability"
 msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-msgid "Packing List:"
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid "The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
 msgstr ""
 
 #. module: stock
@@ -1050,8 +1055,9 @@ msgid "For the current product, this stock location will be used, instead of the
 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)"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same."
 msgstr ""
 
 #. module: stock
@@ -1082,6 +1088,7 @@ msgid "Shop 1"
 msgstr ""
 
 #. module: stock
+#: view:stock.change.product.qty:0
 #: view:stock.change.standard.price:0
 #: view:stock.fill.inventory:0
 #: view:stock.inventory.merge:0
@@ -1179,6 +1186,11 @@ msgstr ""
 msgid "Generic IT Suppliers"
 msgstr ""
 
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr ""
+
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
@@ -1558,8 +1570,22 @@ msgid "Split in production lots"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_merge
-msgid "Merge Inventory"
+#: model:ir.model,name:stock.model_stock_location
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.change.product.qty,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.location:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.picking,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
 msgstr ""
 
 #. module: stock
@@ -1578,6 +1604,12 @@ msgstr ""
 msgid "Provide the quantities of the returned products."
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same."
+msgstr ""
+
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
@@ -1610,6 +1642,11 @@ msgstr ""
 msgid "Owner Address"
 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 ""
+
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
 msgid "Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance."
@@ -1723,6 +1760,7 @@ msgid "Logistical shipping unit: pallet, box, pack ..."
 msgstr ""
 
 #. module: stock
+#: view:stock.change.product.qty:0
 #: view:stock.change.standard.price:0
 msgid "_Apply"
 msgstr ""
@@ -2165,7 +2203,6 @@ msgid "Stock Level Forecast"
 msgstr ""
 
 #. module: stock
-#: model:account.journal,name:stock.stock_journal
 #: model:ir.model,name:stock.model_stock_journal
 #: field:report.stock.move,stock_journal:0
 #: view:stock.journal:0
@@ -2186,6 +2223,7 @@ msgid "Maxtor Suppliers"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:0
 #: code:addons/stock/wizard/stock_change_standard_price.py:0
 #, python-format
 msgid "Active ID is not set in Context"
@@ -2287,6 +2325,12 @@ msgstr ""
 msgid "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
@@ -2332,6 +2376,12 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -2570,12 +2620,6 @@ msgstr ""
 msgid "Please provide Proper Quantity !"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You are moving %.2f products but only %.2f available in this lot."
-msgstr ""
-
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
@@ -2699,6 +2743,11 @@ msgstr ""
 msgid "Enable Related Account"
 msgstr ""
 
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 #: view:stock.inventory.line.split:0
@@ -2789,8 +2838,8 @@ msgid "Reason"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_journal_form
-msgid "The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
 msgstr ""
 
 #. module: stock
@@ -2923,9 +2972,13 @@ msgid "Merge inventories"
 msgstr ""
 
 #. module: stock
-#: field:product.product,location_id:0
-#: view:stock.location:0
-msgid "Stock Location"
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
 msgstr ""
 
 #. module: stock
@@ -2964,6 +3017,12 @@ msgstr ""
 msgid "Product Category"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:0
+#, python-format
+msgid "INV: "
+msgstr ""
+
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
@@ -2992,8 +3051,8 @@ msgid "This is the list of all your packs. After having selected a Pack, you can
 msgstr ""
 
 #. module: stock
-#: view:report.stock.lines.date:0
-msgid "Non Inv"
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
 msgstr ""
 
 #. module: stock
@@ -3002,6 +3061,12 @@ msgstr ""
 msgid "Existing Lots"
 msgstr ""
 
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
 msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n"
@@ -3063,24 +3128,6 @@ msgstr ""
 msgid "Pack"
 msgstr ""
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_location
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,location_id:0
-#: field:stock.fill.inventory,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: report:stock.inventory.move:0
-#: view:stock.location:0
-#: view:stock.move:0
-#: field:stock.move.consume,location_id:0
-#: field:stock.move.scrap,location_id:0
-#: field:stock.picking,location_id:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,location_id:0
-#: field:stock.report.tracklots,location_id:0
-msgid "Location"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -3097,6 +3144,11 @@ msgstr ""
 msgid "Auto Validate"
 msgstr ""
 
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
@@ -3217,11 +3269,6 @@ msgstr ""
 msgid "Please specify at least one non-zero quantity!"
 msgstr ""
 
-#. module: stock
-#: report:stock.picking.list:0
-msgid "weight"
-msgstr ""
-
 #. module: stock
 #: help:product.template,property_stock_procurement:0
 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 procurements"
@@ -3321,6 +3368,11 @@ msgstr ""
 msgid "XML File"
 msgstr ""
 
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:res.request.link,name:stock.req_link_tracking
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 35715a9e1fb..05b2f83c15b 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -102,9 +102,12 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="after">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="3">
                         <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
+                        <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
+                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,product.group_product_manager"/>
+                        <newline/>
                         <field name="virtual_available"/>
                     </group>
                     <group colspan="2" col="2" name="lot" groups="base.group_extended">
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 94bf69479ac..e310d3c6feb 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -34,6 +34,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Content_Order_Reference_Table">
       <blockAlignment value="LEFT"/>
@@ -51,6 +55,11 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+
     </blockTableStyle>
     <blockTableStyle id="Move_Line_Header">
       <blockAlignment value="LEFT"/>
@@ -180,15 +189,20 @@
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
-          <para style="terp_header">Packing List: [[ picking.name ]]</para>
+          <para style="terp_header">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]] </para>
+          <para style="terp_header">Reception: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+          <para style="terp_header">Picking List: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
+    <blockTable colWidths="100.0,110.0,130.0,120.0,60.0" style="Header_Order_Reference_Tbl">
       <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Order(Origin)</para>
         </td>
@@ -199,12 +213,15 @@
           <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">weight</para>
+          <para style="terp_tblheader_General_Centre">Weight</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="123.0,134.0,133.0,134.0" style="Content_Order_Reference_Table">
+    <blockTable colWidths="100.0,110.0,130.0,120.0,60.0" style="Content_Order_Reference_Table">
       <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
+        </td>
         <td>
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0d8b1933f20..81efdbca71e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -110,11 +110,15 @@ class stock_location(osv.osv):
         @param field_names: Name of field
         @return: Dictionary of values
         """
+        prod_id = context and context.get('product_id', False)
 
         product_product_obj = self.pool.get('product.product')
 
-        cr.execute('select distinct product_id, location_id from stock_move where location_id in %s or location_dest_id in %s', (tuple(ids), tuple(ids)))
-        res_products_by_location = sorted(cr.dictfetchall(), key=itemgetter('location_id'))
+        cr.execute('select distinct product_id, location_id from stock_move where location_id in %s', (tuple(ids), ))
+        dict1 = cr.dictfetchall()
+        cr.execute('select distinct product_id, location_dest_id as location_id from stock_move where location_dest_id in %s', (tuple(ids), ))
+        dict2 = cr.dictfetchall()
+        res_products_by_location = sorted(dict1+dict2, key=itemgetter('location_id'))
         products_by_location = dict((k, [v['product_id'] for v in itr]) for k, itr in groupby(res_products_by_location, itemgetter('location_id')))
 
         result = dict([(i, {}.fromkeys(field_names, 0.0)) for i in ids])
@@ -122,9 +126,10 @@ class stock_location(osv.osv):
 
         currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         currency_obj = self.pool.get('res.currency')
-        currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
-        currency_obj.round(cr, uid, currency, 300)
+        currency = currency_obj.browse(cr, uid, currency_id, context=context)
         for loc_id, product_ids in products_by_location.items():
+            if prod_id:
+                product_ids = [prod_id]
             c = (context or {}).copy()
             c['location'] = loc_id
             for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
@@ -1494,8 +1499,8 @@ class stock_move(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
         'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"),
 
-        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
-        'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, help="Logistical shipping unit: pallet, box, pack ..."),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', states={'done': [('readonly', True)]}, help="Production lot is used to put a serial number on the production", select=True),
+        'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, states={'done': [('readonly', True)]}, help="Logistical shipping unit: pallet, box, pack ..."),
 
         'auto_validate': fields.boolean('Auto Validate'),
 
@@ -1515,7 +1520,7 @@ class stock_move(osv.osv):
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin", store=True),
 
         # used for colors in tree views:
-        'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped'),
+        'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
     }
     _constraints = [
         (_check_tracking,
@@ -1597,7 +1602,7 @@ class stock_move(osv.osv):
         return res
 
     def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False,
-                        loc_id=False, product_id=False, context=None):
+                        loc_id=False, product_id=False, uom_id=False, context=None):
         """ On change of production lot gives a warning message.
         @param prodlot_id: Changed production lot id
         @param product_qty: Quantity of product
@@ -1609,13 +1614,19 @@ class stock_move(osv.osv):
             return {}
         ctx = context and context.copy() or {}
         ctx['location_id'] = loc_id
-        prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id, ctx)
-        location = self.pool.get('stock.location').browse(cr, uid, loc_id)
+        ctx.update({'raise-exception': True})
+        uom_obj = self.pool.get('product.uom')
+        product_obj = self.pool.get('product.product')
+        product_uom = product_obj.browse(cr, uid, product_id, context=ctx).uom_id
+        prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id, context=ctx)
+        location = self.pool.get('stock.location').browse(cr, uid, loc_id, context=ctx)
+        uom = uom_obj.browse(cr, uid, uom_id, context=ctx)
+        amount_actual = uom_obj._compute_qty_obj(cr, uid, product_uom, prodlot.stock_available, uom, context=ctx)
         warning = {}
-        if (location.usage == 'internal') and (product_qty > (prodlot.stock_available or 0.0)):
+        if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
                 'title': _('Insufficient Stock in Lot !'),
-                'message': _('You are moving %.2f products but only %.2f available in this lot.') % (product_qty, prodlot.stock_available or 0.0)
+                'message': _('You are moving %.2f %s products but only %.2f %s available in this lot.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 
@@ -1670,7 +1681,7 @@ class stock_move(osv.osv):
             result['product_qty'] = product_uos_qty
 
         return {'value': result}
-    
+
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
                             loc_dest_id=False, address_id=False):
         """ On change of product id, if finds UoM, UoS, quantity and UoS quantity.
@@ -1934,6 +1945,12 @@ class stock_move(osv.osv):
         acc_variation = accounts.get('property_stock_variation', False)
         journal_id = accounts['stock_journal']
 
+        if acc_dest == acc_variation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same.'))
+
+        if acc_src == acc_variation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same.'))
+
         if not acc_src:
             raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
                                     (move.product_id.name, move.product_id.id,))
@@ -2024,7 +2041,9 @@ class stock_move(osv.osv):
         """
         partial_datas=''
         picking_ids = []
+        move_ids = []
         partial_obj=self.pool.get('stock.partial.picking')
+        wf_service = netsvc.LocalService("workflow")
         partial_id=partial_obj.search(cr,uid,[])
         if partial_id:
             partial_datas = partial_obj.read(cr, uid, partial_id, context=context)[0]
@@ -2039,6 +2058,10 @@ class stock_move(osv.osv):
             self.action_confirm(cr, uid, todo, context=context)
 
         for move in self.browse(cr, uid, ids, context=context):
+            if move.state in ['done','cancel']:
+                continue
+            move_ids.append(move.id)
+
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
             if move.move_dest_id.id and (move.state != 'done'):
@@ -2047,21 +2070,19 @@ class stock_move(osv.osv):
                 if move.move_dest_id.state in ('waiting', 'confirmed'):
                     self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
                     if move.move_dest_id.picking_id:
-                        wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
                     if move.move_dest_id.auto_validate:
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-            prodlot_id =partial_datas and  partial_datas.get('move%s_prodlot_id'%(move.id), False)
+            prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
             if prodlot_id:
-                self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
-            self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_trigger(uid, 'stock.move', id, cr)
+                self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
+
+        self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        for id in move_ids:
+             wf_service.trg_trigger(uid, 'stock.move', id, cr)
 
-        wf_service = netsvc.LocalService("workflow")
         for pick_id in picking_ids:
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
@@ -2251,6 +2272,8 @@ class stock_move(osv.osv):
         res = []
         for move in self.browse(cr, uid, ids, context=context):
             move_qty = move.product_qty
+            if move_qty <= 0:
+                raise osv.except_osv(_('Error!'), _('Can not consume a move with negative or zero quantity !'))
             quantity_rest = move.product_qty
 
             quantity_rest -= quantity
@@ -2447,6 +2470,12 @@ class stock_inventory(osv.osv):
         return self.pool.get('stock.move').create(cr, uid, move_vals)
 
     def action_done(self, cr, uid, ids, context=None):
+        """ Finish the inventory
+        @return: True
+        """
+
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         for inv in self.browse(cr, uid, ids, context=context):
             move_obj.action_done(cr, uid, [x.id for x in inv.move_ids], context=context)
@@ -2454,12 +2483,11 @@ class stock_inventory(osv.osv):
         return True
 
     def action_confirm(self, cr, uid, ids, context=None):
-        """ Finishes the inventory and writes its finished date
+        """ Confirm the inventory and writes its finished date
         @return: True
         """
         if context is None:
             context = {}
-
         # to perform the correct inventory corrections we need analyze stock location by
         # location, never recursively, so we use a special context
         product_context = dict(context, compute_child=False)
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index be1881634eb..e934e525b1b 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -26,51 +26,60 @@
             <field name="name">Physical Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-stock</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_locations_partner" model="stock.location">
             <field name="name">Partner Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-partner</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_locations_virtual" model="stock.location">
             <field name="name">Virtual Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-mrp</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_scrapped" model="stock.location">
             <field name="name">Scrapped</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="scrap_location">True</field>
             <field name="usage">inventory</field>
+            <field name="company_id"></field>
         </record>
         
         <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">inventory</field>
+            <field name="company_id"></field>
         </record>
         <record id="location_procurement" model="stock.location">
             <field name="name">Procurements</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">procurement</field>
+            <field name="company_id"></field>
         </record>
         <record id="location_production" model="stock.location">
             <field name="name">Production</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">production</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_suppliers" model="stock.location">
             <field name="name">Suppliers</field>
             <field name="location_id" ref="stock_location_locations_partner"/>
             <field name="usage">supplier</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_customers" model="stock.location">
             <field name="name">Customers</field>
             <field name="location_id" ref="stock_location_locations_partner"/>
             <field name="usage">customer</field>
+            <field name="company_id"></field>
         </record>
         <record id="stock_location_company" model="stock.location">
-            <field model="res.company" name="name" search="[]" use="name"/>
+            <field name="name" model="res.company" search="[]" use="name"/>
             <field name="usage">view</field>
             <field name="location_id" ref="stock_location_locations"/>
         </record>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 5de12effd2b..f291199f394 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -212,10 +212,8 @@
         </record>
         <record id="res_company_tinyshop0" model="res.company">
             <field name="currency_id" ref="base.EUR"/>
-            <field eval="1.0" name="po_lead"/>
             <field name="partner_id" ref="res_partner_tinyshop1"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field eval="80.0" name="schedule_range"/>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="stock_location_shop0" model="stock.location">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f3780d23e03..24da71da743 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -670,15 +670,15 @@
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         icon="terp-stock_effects-object-colorize"
                                         groups="base.group_extended"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_expected" string="Date Expected"/>
@@ -694,7 +694,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -719,14 +719,14 @@
                                         <button name="%(split_into)d" string="New pack" type="action"
                                               groups="base.group_extended"
                                               icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed,done"  colspan="1"/>
+                                              states="draft,assigned,confirmed"  colspan="1"/>
                                         <field name="prodlot_id" groups="base.group_extended"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"  colspan="3"/>
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"  colspan="3"/>
                                         <button name="%(track_line)d"
                                             groups="base.group_extended"
-                                            states="draft,waiting,confirmed,assigned,done"
+                                            states="draft,waiting,confirmed,assigned"
                                             string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
                                     <label string="" colspan="4"/>
@@ -859,18 +859,18 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="draft,assigned,confirmed,done"
+                                        states="draft,assigned,confirmed"
                                         groups="base.group_extended"/>
                                     <field name="tracking_id" groups="base.group_extended"/>
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         icon="terp-stock_effects-object-colorize"
                                         groups="base.group_extended"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <field name="location_id"/>
                                     <field name="date"/>
                                     <field name="state"/>
@@ -887,7 +887,7 @@
                                                 string="Scrap" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1" groups="base.group_extended"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4" />
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4" />
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" />
@@ -912,14 +912,14 @@
                                           <button name="%(split_into)d" string="New pack" type="action"
                                               groups="base.group_extended"
                                               icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed,done" colspan="1"/>
+                                              states="draft,assigned,confirmed" colspan="1"/>
                                         <field name="prodlot_id" groups="base.group_extended"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                                         <button name="%(track_line)d"
                                               groups="base.group_extended"
-                                              states="draft,waiting,confirmed,assigned,done"
+                                              states="draft,waiting,confirmed,assigned"
                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
                                     <label string="" colspan="4"/>
@@ -940,8 +940,8 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/>
                                 <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1089,7 +1089,7 @@
                                     <button name="setlast_tracking" string="Put in current pack" type="object"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed"/>
                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                                         groups="base.group_extended"
                                         icon="terp-stock_effects-object-colorize"
@@ -1107,7 +1107,7 @@
                                                 string="Scrap" type="action" groups="base.group_extended"
                                                 icon="gtk-convert" context="{'scrap': True}"
                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+                                        <field name="product_uom" string="Unit Of Measure" colspan="4"/>
                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
                                         <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
@@ -1132,14 +1132,14 @@
                                         <button name="%(split_into)d" string="New pack" type="action"
                                               groups="base.group_extended"
                                               icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed,done" colspan="1"/>
+                                              states="draft,assigned,confirmed" colspan="1"/>
                                         <field name="prodlot_id" groups="base.group_extended"
                                             context="{'location_id':location_id, 'product_id':product_id}"
                                             domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                                         <button name="%(track_line)d"
                                               groups="base.group_extended"
-                                              states="draft,waiting,confirmed,assigned,done"
+                                              states="draft,waiting,confirmed,assigned"
                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
                                     </group>
                                     <label string="" colspan="4"/>
@@ -1161,9 +1161,9 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                                 <group colspan="1" states="done">
-                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl"/>
+                                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
                                 </group>
-                                <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                                    <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl"/>
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1312,6 +1312,7 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
+                    <field name="name"/>
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
                     <field name="create_date" invisible="1"/>
@@ -1362,7 +1363,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
+                        <field name="product_uom" string="Unit Of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1399,14 +1400,14 @@
                         <button name="%(split_into)d" string="New pack" type="action"
                               groups="base.group_extended"
                               icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done" colspan="1"/>
+                              states="draft,assigned,confirmed" colspan="1"/>
                         <field name="prodlot_id" groups="base.group_extended"
                             context="{'location_id':location_id, 'product_id':product_id}"
                             domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
+                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                         <button name="%(track_line)d"
                               groups="base.group_extended"
-                              states="draft,waiting,confirmed,assigned,done"
+                              states="draft,waiting,confirmed,assigned"
                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
                     </group>
 
@@ -1558,7 +1559,7 @@
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
+                        <field name="product_uom" string="Unit Of Measure"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1599,7 +1600,7 @@
                         <field name="prodlot_id" groups="base.group_extended"
                             context="{'location_id':location_id, 'product_id':product_id}"
                             domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
+                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
                         <button name="%(track_line)d"
                               groups="base.group_extended"
                               states="draft,waiting,confirmed,assigned,done"
@@ -1758,7 +1759,7 @@
             src_model="stock.location"/>
 
         <act_window
-            context="{'location': active_id, 'search_default_done': 1,'search_default_product_id': [active_id]}"
+            context="{'search_default_done': 1,'search_default_product_id': [active_id]}"
             id="act_product_stock_move_open"
             name="Stock Moves"
             res_model="stock.move"
@@ -1772,7 +1773,7 @@
             src_model="stock.move"/>
 
         <act_window
-            context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}"
+            context="{'search_default_future': 1,'search_default_product_id': [active_id]}"
             domain="[('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 5e35e0e7297..b903f020f82 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -33,6 +33,6 @@ import stock_invoice_onshipping
 import stock_location_product
 import stock_change_standard_price
 import stock_return_picking
-
+import stock_change_product_qty
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
new file mode 100644
index 00000000000..4e437eef815
--- /dev/null
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -0,0 +1,88 @@
+# -*- 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 _
+import time
+
+class stock_change_product_qty(osv.osv_memory):
+    _name = "stock.change.product.qty"
+    _description = "Change Product Quantity"
+    _columns = {
+        'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'), 
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade", domain="[('usage', '=', 'internal')]"), 
+    }
+
+    def default_get(self, cr, uid, fields, context):
+        """ To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
+        """
+        res = super(stock_change_product_qty, self).default_get(cr, uid, fields, context=context)
+
+        if 'new_quantity' in fields:
+            res.update({'new_quantity': 1})
+        return res
+
+    def change_product_qty(self, cr, uid, ids, context=None):
+        """ Changes the Product Quantity by making a Physical Inventory.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
+        @return:
+        """
+        if context is None:
+            context = {}
+
+        move_ids = []
+        rec_id = context and context.get('active_id', False)
+        assert rec_id, _('Active ID is not set in Context')
+
+        inventry_obj = self.pool.get('stock.inventory')
+        inventry_line_obj = self.pool.get('stock.inventory.line')
+        prod_obj_pool = self.pool.get('product.product')
+
+        res_original = prod_obj_pool.browse(cr, uid, rec_id, context=context)
+        for data in self.browse(cr, uid, ids, context=context):
+            inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: ') + str(res_original.name)}, context=context)
+            line_data ={
+                'inventory_id' : inventory_id, 
+                'product_qty' : data.new_quantity, 
+                'location_id' : data.location_id.id, 
+                'product_id' : rec_id, 
+                'product_uom' : res_original.uom_id.id, 
+            }
+            line_id = inventry_line_obj.create(cr , uid, line_data, context=context)
+    
+            inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
+            inventry_obj.action_done(cr, uid, [inventory_id], context=context)
+            
+        return {}
+
+stock_change_product_qty()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
new file mode 100644
index 00000000000..927f3e91f80
--- /dev/null
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_change_product_quantity" model="ir.ui.view">
+            <field name="name">Change Product Quantity</field>
+            <field name="model">stock.change.product.qty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Product Quantity">
+                    <separator string="Select Quantity" colspan="4"/>
+                    <newline/>
+                    <field name="new_quantity" />
+                    <field name="location_id" />
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_change_product_quantity" model="ir.actions.act_window">
+            <field name="name">Change Product Quantity</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.change.product.qty</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_change_product_quantity"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 023db6e3ebc..918c519a1e4 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -58,18 +58,18 @@ class stock_return_picking(osv.osv_memory):
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
-        """ 
+        """
          Creates view dynamically and adding fields at runtime.
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return: New arch of view with new columns.
         """
         if context is None:
             context = {}
         res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) 
+        record_id = context and context.get('active_id', False)
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id, context=context)
@@ -91,15 +91,15 @@ class stock_return_picking(osv.osv_memory):
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
                         context=None, toolbar=False, submenu=False):
-        """ 
+        """
          Changes the view dynamically
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return: New arch of view.
         """
         res = super(stock_return_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
@@ -120,7 +120,7 @@ class stock_return_picking(osv.osv_memory):
                 quantity = m.product_qty
                 if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-                    res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
+                    res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True}
                     res.setdefault('returns', []).append(m.id)
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]}
@@ -138,9 +138,9 @@ class stock_return_picking(osv.osv_memory):
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param ids: List of ids selected 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
+         @param ids: List of ids selected
+         @param context: A standard dictionary
+         @return: A dictionary which of fields with values.
         """
         if context is None:
             context = {} 
@@ -154,7 +154,7 @@ class stock_return_picking(osv.osv_memory):
         data = self.read(cr, uid, ids[0])
         new_picking = None
         date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
-    
+
         set_invoice_state_to_none = True
         returned_lines = 0
         for move in pick.move_lines:
@@ -165,22 +165,22 @@ class stock_return_picking(osv.osv_memory):
                     new_type = 'out'
                 else:
                     new_type = 'internal'
-                new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
+                new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s-return' % pick.name,
                         'move_lines':[], 'state':'draft', 'type':new_type,
                         'date':date_cur, 'invoice_state':data['invoice_state'],})
             new_location=move.location_dest_id.id
             if move.state=='done':
                 new_qty = data['return%s' % move.id]
                 returned_qty = move.product_qty
-    
+
                 for rec in move.move_history_ids2:
                     returned_qty -= rec.product_qty
-        
+
                 if returned_qty != new_qty:
                     set_invoice_state_to_none = False
 
                 if new_qty:
-                    returned_lines += 1 
+                    returned_lines += 1
                     new_move=move_obj.copy(cr, uid, move.id, {
                         'product_qty': new_qty,
                         'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 2d4631f3ebf..d7473e86b59 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -64,7 +64,7 @@ class stock_split_into(osv.osv_memory):
             if quantity_rest>0:
                 quantity_rest = move.product_qty - quantity
                 tracking_id = track_obj.create(cr, uid, {}, context=context)
-                if quantity==0.0:
+                if quantity == 0.0:
                     move_obj.write(cr, uid, [move.id], {'tracking_id': tracking_id}, context=context)
                 else:
                     default_val = {
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 44026c22679..aeccdb335a9 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from osv import fields, osv
 
 class action_traceability(osv.osv_memory):
-    """ 
+    """
     This class defines a function action_traceability for wizard
 
     """
@@ -34,16 +34,17 @@ class action_traceability(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
         @return: A dictionary of values
         """
+        lot_id = ids
         if context is None:
             context = {}
         type1 = context['type'] or 'move_history_ids2'
         field = context['field'] or 'tracking_id'
         obj = self.pool.get('stock.move')
-        ids = obj.search(cr, uid, [(field, 'in',context['active_ids'])])
+        ids = obj.search(cr, uid, [(field, 'in',lot_id)])
         cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type1, 'tree'))
         view_id = cr.fetchone()[0]
         value = {
@@ -54,7 +55,7 @@ class action_traceability(osv.osv_memory):
             'field_parent': type1,
             'view_id': (view_id,'View'),
             'type': 'ir.actions.act_window',
-            'nodestroy':True,            
+            'nodestroy':True,
         }
         return value
 
diff --git a/addons/stock_invoice_directly/i18n/mn.po b/addons/stock_invoice_directly/i18n/mn.po
index 0bde989d4fb..8e3c69a4752 100644
--- a/addons/stock_invoice_directly/i18n/mn.po
+++ b/addons/stock_invoice_directly/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-11 05:38+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-12-18 16:10+0000\n"
+"Last-Translator: badralb <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: 2010-12-17 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Дутуу түүвэр"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
index ff07645632f..b94b4d1b699 100644
--- a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
+++ b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:25+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:25+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,14 @@ msgstr ""
 msgid "Partial Picking"
 msgstr ""
 
+#. module: stock_invoice_directly
+#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
+msgid "\n"
+"        When you send or deliver goods, this module automatically launch\n"
+"        the invoicing wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index fd549c60525..43969cff36e 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,7 @@ msgid "Parameters"
 msgstr ""
 
 #. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
 msgstr ""
@@ -86,7 +87,6 @@ msgstr ""
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
-#: field:product.pulled.flow,location_id:0
 msgid "Location"
 msgstr ""
 
@@ -96,12 +96,22 @@ msgstr ""
 msgid "Invoice Status"
 msgstr ""
 
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
 #. module: stock_location
 #: help:stock.location.path,auto:0
 msgid "This is used to define paths the product has to follow within the location tree.\n"
 "The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
 msgstr ""
 
+#. module: stock_location
+#: model:ir.module.module,shortdesc:stock_location.module_meta_information
+msgid "Warehouse Locations Paths"
+msgstr ""
+
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
@@ -112,11 +122,6 @@ msgstr ""
 msgid "Pack Zone"
 msgstr ""
 
-#. module: stock_location
-#: field:product.pulled.flow,name:0
-msgid "Name"
-msgstr ""
-
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
 msgid "Gate B"
@@ -143,8 +148,8 @@ msgid "Dispatch Zone"
 msgstr ""
 
 #. module: stock_location
-#: model:ir.module.module,shortdesc:stock_location.module_meta_information
-msgid "Warehouse Locations Paths"
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: stock_location
@@ -159,13 +164,8 @@ msgid "Company"
 msgstr ""
 
 #. module: stock_location
-#: model:ir.model,name:stock_location.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: stock_location
-#: model:ir.model,name:stock_location.model_procurement_order
-msgid "Procurement"
+#: view:product.product:0
+msgid "Logistics Flows"
 msgstr ""
 
 #. module: stock_location
@@ -205,8 +205,67 @@ msgid "Number of days to do this transition"
 msgstr ""
 
 #. module: stock_location
-#: help:product.pulled.flow,name:0
-msgid "This field will fill the packing Origin and the name of its moves"
+#: model:ir.module.module,description:stock_location.module_meta_information
+msgid "\n"
+"This module supplements the Warehouse application by adding support for per-product\n"
+"location paths, effectively implementing Push and Pull inventory flows.\n"
+"\n"
+"Typically this could be used to:\n"
+"* Manage product manufacturing chains\n"
+"* Manage default locations per product\n"
+"* Define routes within your warehouse according to business needs, such as:\n"
+"   - Quality Control\n"
+"   - After Sales Services\n"
+"   - Supplier Returns\n"
+"* Help rental management, by generating automated return moves for rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product form, where you can add\n"
+"Push and Pull flow specifications. The demo data of  CPU1 product for that push/pull :\n"
+"\n"
+"Push flows\n"
+"----------\n"
+"Push flows are useful when the arrival of certain products in a given location should always\n"
+"be followed by a corresponding move to another location, optionally after a certain delay.\n"
+"The original Warehouse application already supports such Push flow specifications on the\n"
+"Locations themselves, but these cannot be refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which location, and with\n"
+"what parameters. As soon as a given quantity of products is moved in the source location,\n"
+"a chained move is automatically foreseen according to the parameters set on the flow specification\n"
+"(destination location, delay, type of move, journal, etc.) The new move can be automatically\n"
+"processed, or require a manual confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows\n"
+"----------\n"
+"Pull flows are a bit different from Pull flows, in the sense that they are not related to\n"
+"the processing of product moves, but rather to the processing of procurement orders.\n"
+"What is being pulled is a need, not directly products.\n"
+"A classical example of Push flow is when you have an Outlet company, with a parent Company\n"
+"that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives\n"
+"in the Outlet, it is converted into another procurement (B, via a Push flow of type 'move')\n"
+"requested from the Holding. When procurement order B is processed by the Holding company, and\n"
+"if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier\n"
+"(Push flow of type Purchase). The result is that the procurement order, the need, is pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, not only depending on\n"
+"the product being considered, but also depending on which location holds the \"need\" for that\n"
+"product (i.e. the destination location of that procurement order).\n"
+"\n"
+"Use-Case\n"
+"--------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"  CPU1: Sell some CPU1 from Shop 1 and run the scheduler\n"
+"     - Warehouse: delivery order, Shop 1: reception\n"
+"  CPU3:\n"
+"     - When receiving the product, it goes to Quality Control location then stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A\n"
+"    "
 msgstr ""
 
 #. module: stock_location
@@ -220,8 +279,8 @@ msgid "Is used to know to which company belong packings and moves"
 msgstr ""
 
 #. module: stock_location
-#: view:product.product:0
-msgid "Logistics Flow"
+#: field:product.pulled.flow,name:0
+msgid "Name"
 msgstr ""
 
 #. module: stock_location
@@ -311,11 +370,12 @@ msgid "You try to assign a lot which is not from the same product"
 msgstr ""
 
 #. module: stock_location
-#: field:product.pulled.flow,location_src_id:0
-msgid "Location Source"
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
 msgstr ""
 
 #. module: stock_location
+#: field:product.pulled.flow,location_id:0
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
 msgstr ""
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index 9c764d80524..b802c2d2b0a 100644
--- a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
+++ b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,19 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
+#. module: stock_no_autopicking
+#: model:ir.module.module,description:stock_no_autopicking.module_meta_information
+msgid "\n"
+"    This module allows an intermediate picking process to provide raw materials\n"
+"    to production orders.\n"
+"\n"
+"    One example of usage of this module is to manage production made by your\n"
+"    suppliers (sub-contracting). To achieve this, set the assembled product\n"
+"    which is sub-contracted to \"No Auto-Picking\" and put the location of the\n"
+"    supplier in the routing of the assembly operation.\n"
+"    "
+msgstr ""
+
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
diff --git a/addons/stock_no_autopicking/i18n/vi.po b/addons/stock_no_autopicking/i18n/vi.po
index 3303ff6a4cc..e0355cc1f19 100644
--- a/addons/stock_no_autopicking/i18n/vi.po
+++ b/addons/stock_no_autopicking/i18n/vi.po
@@ -1,26 +1,26 @@
 # 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-02 14:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-17 17:53+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\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: 2010-12-17 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
@@ -30,22 +30,22 @@ msgstr ""
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "Tự động chọn hàng"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "Tự động chọn nguyên liệu thô theo yêu cầu sản xuất"
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Lỗi: mã EAN không hợp lệ"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
+msgstr "Hàng không tự động chọn"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
index bdd9e0e34c2..6cb82017e9b 100644
--- a/addons/stock_planning/i18n/stock_planning.pot
+++ b/addons/stock_planning/i18n/stock_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:27+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:27+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -550,8 +550,10 @@ msgid "Start Date"
 msgstr ""
 
 #. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "\n"
+" Already Out: "
 msgstr ""
 
 #. module: stock_planning
@@ -878,6 +880,11 @@ msgstr ""
 msgid "Ending date for planning period."
 msgstr ""
 
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
 #. module: stock_planning
 #: help:stock.planning.createlines,forecasted_products:0
 msgid "Check this box to create planning for all products having any forecast for selected Warehouse and Period. Product Category field will be ignored."
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index b0dd8f7986a..dac501f8714 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:27+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:27+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -188,6 +188,7 @@ msgid "Days"
 msgstr ""
 
 #. module: subscription
+#: field:subscription.document,active:0
 #: field:subscription.subscription,active:0
 msgid "Active"
 msgstr ""
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 895de959416..14d12838a38 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-15 23:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-19 10:19+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -199,16 +199,18 @@ msgid ""
 "than the number of answer.                                     Please use a "
 "number that is smaller than %d."
 msgstr ""
+"Le nombre de réponses nécessaires que vous avez saisi est plus grand que le "
+"nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "Nombre total de réponses"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "Numéro de la ligne"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
@@ -223,7 +225,7 @@ msgstr "Questions du sondage"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr ""
+msgstr "Matrice des choix (une seule réponse par ligne)"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -232,6 +234,8 @@ msgid ""
 "Maximum Required Answer you entered for your maximum is greater than the "
 "number of answer. Please use a number that is smaller than %d."
 msgstr ""
+"Le nombre de réponses nécessaires que vous avez saisi est plus grand que le "
+"nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_question_message
@@ -240,7 +244,7 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Survey Question"
-msgstr ""
+msgstr "Question du sondage"
 
 #. module: survey
 #: view:survey.question.column.heading:0
@@ -251,7 +255,7 @@ msgstr ""
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "Inclure le numéro de page"
 
 #. module: survey
 #: view:survey.page:0
@@ -268,12 +272,12 @@ msgstr "Titre de la page"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "Définir les sondages"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
 msgid "Survey History"
-msgstr ""
+msgstr "Historique des sondages"
 
 #. module: survey
 #: field:survey.response.answer,comment:0
@@ -285,7 +289,7 @@ msgstr "Remarques"
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "Rechercher dans les sondages"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
@@ -301,7 +305,7 @@ msgstr " En-tête de colonne"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "Répondre à un sondage"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -322,7 +326,7 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "Statistiques des sondages"
 
 #. module: survey
 #: selection:survey,state:0
diff --git a/addons/survey/i18n/mn.po b/addons/survey/i18n/mn.po
index edf76a312d6..128a5500432 100644
--- a/addons/survey/i18n/mn.po
+++ b/addons/survey/i18n/mn.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-11-02 07:26+0000\n"
+"PO-Revision-Date: 2010-12-20 04:28+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: 2010-12-17 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Хэвлэх"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -41,7 +41,7 @@ msgstr "Таны мэссэж"
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr "Текстийн алдаа шалгах"
+msgstr "Текст батлах"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -56,12 +56,12 @@ msgstr ""
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr "Уригдсан хэрэглэгч"
+msgstr "Урьсан хэрэглэгч"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Character"
-msgstr "Зан байдал"
+msgstr "Тэмдэгт"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -70,7 +70,7 @@ msgstr "Зан байдал"
 #: model:ir.ui.menu,name:survey.menu_survey_form
 #: model:ir.ui.menu,name:survey.menu_surveys
 msgid "Surveys"
-msgstr "Судалгаа"
+msgstr "Санал асуулгууд"
 
 #. module: survey
 #: view:survey:0
@@ -80,7 +80,7 @@ msgstr "Ноороглох"
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr "Хариултын төрөл харагдахгүй байна уу?"
+msgstr "Энэ хариултыг далдлах уу?"
 
 #. module: survey
 #: view:survey:0
@@ -88,7 +88,7 @@ msgstr "Хариултын төрөл харагдахгүй байна уу?"
 #: view:survey.question:0
 #: view:survey.request:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
@@ -98,7 +98,7 @@ msgstr "Үр дүн:"
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "Асуулгын хүсэлт"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -108,7 +108,7 @@ msgstr ""
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "Хүснэгтэн хариулт"
 
 #. module: survey
 #: field:survey.history,date:0
@@ -118,7 +118,7 @@ msgstr "Эхэлсэн огноо"
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr "Түүхийн шугамууд"
+msgstr "Түүхийн мөрүүд"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -131,7 +131,7 @@ msgstr ""
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "Цэс сонголтыг далдлах уу?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
@@ -141,49 +141,49 @@ msgstr "Бие"
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Тайлбарыг зөвшөөрөх"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "A4 (210mm x 297mm)"
-msgstr ""
+msgstr "A4 (210mm x 297mm)"
 
 #. module: survey
 #: field:survey.question,comment_maximum_date:0
 #: field:survey.question,validation_maximum_date:0
 msgid "Maximum date"
-msgstr ""
+msgstr "Хамгийн их огноо"
 
 #. module: survey
 #: field:survey.question,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible?"
-msgstr ""
+msgstr "Цэс сонголтыг далдлах уу?"
 
 #. module: survey
 #: view:survey:0
 msgid "Completed"
-msgstr ""
+msgstr "Дууссан"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "Яг"
 
 #. module: survey
 #: view:survey:0
 msgid "Open Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ноороглох"
 
 #. module: survey
 #: field:survey.question,is_comment_require:0
 msgid "Add Comment Field"
-msgstr ""
+msgstr "Тайлбарын талбар нэмэх"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -197,22 +197,22 @@ msgstr ""
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "Нийт хариулт"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "Мөрийн дугаар"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
 msgid "survey.name.wiz"
-msgstr ""
+msgstr "survey.name.wiz"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "Survey Questions"
-msgstr "Судалгааны асуулт"
+msgstr "Санал асуулгын асуулт"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -245,14 +245,14 @@ msgstr ""
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "Хуудас дугаартай байх"
 
 #. module: survey
 #: view:survey.page:0
 #: view:survey.question:0
 #: view:survey.send.invitation.log:0
 msgid "Ok"
-msgstr ""
+msgstr "Тийм"
 
 #. module: survey
 #: field:survey.page,title:0
@@ -262,7 +262,7 @@ msgstr "Хуудасны гарчиг"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "Үндсэн санал асуулга"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
@@ -279,23 +279,23 @@ msgstr "Тэмдэглэгээ"
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "Асуулга хайх"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
 #: field:survey.tbl.column.heading,value:0
 msgid "Value"
-msgstr ""
+msgstr "Утга"
 
 #. module: survey
 #: field:survey.question,column_heading_ids:0
 msgid " Column heading"
-msgstr ""
+msgstr " Баганы гарчиг"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "Санал асуулгад хариулах"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "Статистик"
 
 #. module: survey
 #: selection:survey,state:0
@@ -333,7 +333,7 @@ msgstr ""
 #. module: survey
 #: field:survey.question,comment_field_type:0
 msgid "Comment Field Type"
-msgstr ""
+msgstr "Тайлбар талбарын төрөл"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -363,32 +363,32 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "Edit Survey"
-msgstr ""
+msgstr "Засах"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Survey Answer Line"
-msgstr ""
+msgstr "Хариултын мөр"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
 msgid "Menu Choice"
-msgstr ""
+msgstr "Цэс сонгох"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "Ихдээ"
 
 #. module: survey
 #: field:survey.question,is_validation_require:0
 msgid "Validate Text"
-msgstr ""
+msgstr "Батлах текст"
 
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "Текст"
 
 #. module: survey
 #: constraint:res.users:0
@@ -399,18 +399,18 @@ msgstr ""
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "Захидал (8.5\" x 11\")"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr "Хариуцлагатай"
+msgstr "Хариуцагч"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "survey.request"
 
 #. module: survey
 #: field:survey.send.invitation,mail_subject:0
@@ -427,12 +427,12 @@ msgstr ""
 #. module: survey
 #: selection:survey.request,state:0
 msgid "Wating Answer"
-msgstr ""
+msgstr "Хариулт хүлээж байна"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "Хоцрох"
 
 #. module: survey
 #: sql_constraint:res.users:0
@@ -448,7 +448,7 @@ msgstr "Хаанаас"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Don't Validate Comment Text."
-msgstr ""
+msgstr "Тайлбар текст батлагдсангүй."
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -468,7 +468,7 @@ msgstr "Асуулт"
 #. module: survey
 #: view:survey.page:0
 msgid "Search Survey Page"
-msgstr ""
+msgstr "Асуулгын хуудас хайх"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -493,26 +493,26 @@ msgstr ""
 #: view:survey.request:0
 #: field:survey.request,state:0
 msgid "State"
-msgstr ""
+msgstr "Төлөв"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Үнэлгээг төлөвлөх үе шат"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "Хооронд"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Print"
-msgstr ""
+msgstr "Хэвлэх"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
@@ -523,27 +523,27 @@ msgstr ""
 #: view:survey:0
 #: field:survey,type:0
 msgid "Type"
-msgstr ""
+msgstr "Төрөл"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Email"
-msgstr ""
+msgstr "Э-мэйл"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_answer_surveys
 msgid "Answer Surveys"
-msgstr ""
+msgstr "Санал асуулгын хариулт"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "Дуусаагүй"
 
 #. module: survey
 #: view:survey.print:0
 msgid "Survey Print"
-msgstr ""
+msgstr "Асуулга хэвлэх"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -553,7 +553,7 @@ msgstr "Оролцогч сонгох"
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "Асуултын төрөл"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -564,7 +564,7 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Answers"
-msgstr ""
+msgstr "Хариултууд"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -582,12 +582,12 @@ msgstr "Линк"
 #: model:ir.model,name:survey.model_survey_type
 #: view:survey.type:0
 msgid "Survey Type"
-msgstr ""
+msgstr "Асуулгын төрөл"
 
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "Дугаар"
 
 #. module: survey
 #: view:survey:0
@@ -596,12 +596,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "Тайлбар текст"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Бага урьтамжтай хариулт"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -614,7 +614,7 @@ msgstr ""
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Алдааны мэссэж"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -625,41 +625,41 @@ msgstr ""
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "Товлосон огноо"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "Огноо А байх ёстой"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
 msgid "survey.print"
-msgstr ""
+msgstr "survey.print"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 #: field:survey.question.column.heading,title:0
 msgid "Column Heading"
-msgstr ""
+msgstr "Баганы гарчиг"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Хариулах шаардлагатай асуулт"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_request_tree
 #: model:ir.ui.menu,name:survey.menu_survey_type_form1
 msgid "Survey Requests"
-msgstr ""
+msgstr "Санал асуулгын хүсэлт"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "Та нэгээс олон баганад гарчиг оруулах ёстой"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -670,12 +670,12 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "survey.browse.answer"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Текстийн хэв"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -703,12 +703,12 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "Сонголт"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "Санал асуулга ачааллах"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
@@ -729,20 +729,20 @@ msgstr "Санал асуулгын хариулт"
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Сонголт"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Хариулах асуулга"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "Тайлбарын талбар"
 
 #. module: survey
 #: selection:survey.response,response_type:0
@@ -762,13 +762,13 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "#Хариулт"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Хуудас таслахгүй хэвлэх"
 
 #. module: survey
 #: view:survey:0
@@ -789,7 +789,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:survey.act_survey_page_question
 #: model:ir.actions.act_window,name:survey.act_survey_question
 msgid "Questions"
-msgstr ""
+msgstr "Асуултууд"
 
 #. module: survey
 #: help:survey,response_user:0
@@ -810,12 +810,12 @@ msgstr "Мэссэж"
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "Миний"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "Хамгийн чухал хариулт"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
@@ -833,13 +833,13 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+msgstr "мөн"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
 #: view:survey.print.statistics:0
 msgid "Survey Print Statistics"
-msgstr ""
+msgstr "Статистикийг хэвлэх"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
@@ -851,7 +851,7 @@ msgstr "Лог"
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the choices do not add up correctly, display this error message"
-msgstr ""
+msgstr "Зөвийг нэмэлгүй сонгох үед энэ алдааны мэссэж дэлгэцэнд харагдана"
 
 #. module: survey
 #: field:survey,date_close:0
@@ -884,7 +884,7 @@ msgstr ""
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "Хамгийн их дугаар"
 
 #. module: survey
 #: selection:survey,state:0
@@ -896,7 +896,7 @@ msgstr "Ноорог"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
 msgid "survey.print.statistics"
-msgstr ""
+msgstr "survey.print.statistics"
 
 #. module: survey
 #: selection:survey,state:0
@@ -933,12 +933,12 @@ msgstr "Хариулт"
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "Хамгийн их хариултын лимит"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "Урилга илгээх"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
@@ -948,7 +948,7 @@ msgstr "Нөөц хариулт"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "Огноо болон хугацаа"
 
 #. module: survey
 #: field:survey,state:0
@@ -960,40 +960,40 @@ msgstr "Төлөв"
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "Асуулга хэвлэх"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "Э-мэйлээр хариу мэдэгдэх"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "Сонгох утга"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+msgstr "Эхлэсэн"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
 #: view:survey:0
 #: view:survey.print.answer:0
 msgid "Print Answer"
-msgstr ""
+msgstr "Хариулт хэвлэх"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Хос текст"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "Хөндлөнгөөр"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
@@ -1019,19 +1019,19 @@ msgstr ""
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "Хариултын төрөл"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
+msgstr "Батлагдсан"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Waiting Answer"
-msgstr ""
+msgstr "Хариулт хүлээх"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1048,17 +1048,17 @@ msgstr "Группүүд"
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Бүхэл тоо"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
 msgid "survey.send.invitation"
-msgstr ""
+msgstr "survey.send.invitation"
 
 #. module: survey
 #: field:survey.history,user_id:0
@@ -1082,18 +1082,18 @@ msgstr "Алгассан"
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "Цаасны хэмжээ"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "Багана"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "survey.tbl.column.heading"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
@@ -1104,7 +1104,7 @@ msgstr ""
 #: code:addons/survey/wizard/survey_selection.py:0
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "Та энэ санал асуулгад  %s -с илүү цаг хариулт өгөхгүй байж болно"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1140,7 +1140,7 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
 msgid "survey.question.wiz"
-msgstr ""
+msgstr "survey.question.wiz"
 
 #. module: survey
 #: view:survey:0
@@ -1156,18 +1156,18 @@ msgstr ""
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
 msgid "Surveys Statistics"
-msgstr ""
+msgstr "Санал асуулгын статистик"
 
 #. module: survey
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "Харагдац"
 
 #. module: survey
 #: view:survey:0
@@ -1175,23 +1175,23 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "Дараалал"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Э-мэйл"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "Хамгийн бага дугаар"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "#Шаардлагатай хариулт"
 
 #. module: survey
 #: field:survey.answer,sequence:0
@@ -1202,7 +1202,7 @@ msgstr "Дараалал"
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "Талбарын хаяг"
 
 #. module: survey
 #: view:survey:0
@@ -1218,7 +1218,7 @@ msgstr "Дууссан"
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "Тест"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
@@ -1274,7 +1274,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "Дууссан "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
@@ -1294,17 +1294,17 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "Асуулгын хариулт өгөх"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: survey
 #: view:survey:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1325,12 +1325,12 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "Хариултын төрөл"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "Хариулах ёстой"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
@@ -1347,7 +1347,7 @@ msgstr ""
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "Асуулт хайх"
 
 #. module: survey
 #: field:survey,title:0
@@ -1357,7 +1357,7 @@ msgstr "Санал асуулгын гарчиг"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "Дан текст"
 
 #. module: survey
 #: field:survey,note:0
@@ -1388,7 +1388,7 @@ msgstr ""
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "Босоо"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1433,17 +1433,17 @@ msgstr "Санал асуулгын Хариултууд"
 #. module: survey
 #: view:survey.browse.answer:0
 msgid "Select Survey and related answer"
-msgstr ""
+msgstr "Сонгосон санал асуулгатай холбоотой хариулт"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "Санал асуулгын хариултууд"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "Хуудсууд"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -1464,12 +1464,12 @@ msgstr ""
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Legal (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "Нэр"
 
 #. module: survey
 #: view:survey.page:0
@@ -1479,7 +1479,7 @@ msgstr "#Асуултууд"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
 msgid "survey.response"
-msgstr ""
+msgstr "survey.response"
 
 #. module: survey
 #: field:survey.question,comment_valid_err_msg:0
@@ -1487,7 +1487,7 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "Алдааны мэссэж"
 
 #. module: survey
 #: model:ir.module.module,shortdesc:survey.module_meta_information
@@ -1504,7 +1504,7 @@ msgstr "Шинэ хэрэглэгчид имэйл илгээх"
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "Та нэгээс илүү хариулт оруулах ёстой."
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -1518,7 +1518,7 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Цэс сонгох"
 
 #. module: survey
 #: field:survey,page_ids:0
@@ -1543,7 +1543,7 @@ msgstr "Хэрэглэгч үүсгэх"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "Бүх"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1564,7 +1564,7 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "survey.print.answer"
 
 #. module: survey
 #: view:survey.answer:0
@@ -1579,7 +1579,7 @@ msgstr ""
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "Дан текст"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:0
@@ -1590,12 +1590,12 @@ msgstr ""
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Жин"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "Огноо & Цаг"
 
 #. module: survey
 #: field:survey.response,date_create:0
@@ -1606,7 +1606,7 @@ msgstr "Үүсгэх огноо"
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Бананы нэр"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1619,30 +1619,30 @@ msgstr "Санал асуулгын хуудсууд"
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Бүх сонголтын нийлбэр"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Хүснэгт"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "Та нөөцийг хуулбарлаж болохгүй!"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "Хамгийн бага огноо"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Хэрэглэгч бүрийн хамгийн их хариулт"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index f8578e64f9f..d46876b2803 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -549,6 +549,16 @@ msgstr ""
 msgid "Answers"
 msgstr ""
 
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid "\n"
+"    This module is used for surveying. It depends on the answers or reviews of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to that survey is done. \n"
+"    Partners are also sent mails with user name and password for the invitation of the survey\n"
+"    "
+msgstr ""
+
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 1bfc9a961b3..4a645339df6 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-19 10:10+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.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: 2010-12-17 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -101,6 +100,8 @@ 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 adjuntar con cualquier elemento en OpenERP o crear uno de nuevo."
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 147788b32c7..63e63daf9d3 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:41+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-19 09:43+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -101,6 +100,9 @@ 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 email aux documents d'OpenERP. "
+"Vous pouvez l'attacher sur n'importe quel objet existant dans OpenERP ou en "
+"créer un nouveau."
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
diff --git a/addons/thunderbird/i18n/thunderbird.pot b/addons/thunderbird/i18n/thunderbird.pot
index 83d5358d022..591e65a1627 100644
--- a/addons/thunderbird/i18n/thunderbird.pot
+++ b/addons/thunderbird/i18n/thunderbird.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,9 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: thunderbird
-#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
-#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
-#: view:thunderbird.installer:0
-msgid "Thunderbird Plug-In Configuration"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,pdf_file:0
-msgid "Installation Manual"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Configure"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_thunderbird_installer
-msgid "thunderbird.installer"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,description:0
-msgid "Description"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "title"
-msgstr ""
-
-#. module: thunderbird
-#: help:thunderbird.installer,plugin_file:0
-msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Skip"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,name:0
-#: field:thunderbird.installer,pdf_name:0
-msgid "File name"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_thunderbird_partner
-msgid "Thunderbid mails"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
-#: view:thunderbird.installer:0
-msgid "Thunderbird Plug-In"
-msgstr ""
-
-#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "_Close"
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
 msgstr ""
 
 #. module: thunderbird
@@ -85,8 +27,8 @@ msgid "Allows you to select an object that you’d like to add to your email and
 msgstr ""
 
 #. module: thunderbird
-#: view:thunderbird.installer:0
-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."
+#: help:thunderbird.installer,plugin_file:0
+msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
 msgstr ""
 
 #. module: thunderbird
@@ -99,29 +41,101 @@ msgstr ""
 msgid "Email Server Tools"
 msgstr ""
 
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid "\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"      account,or any other object and attach selected mail as .eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+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 ""
+
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
 msgid "Thunderbird Interface"
 msgstr ""
 
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
 msgstr ""
 
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In Configuration"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid Plugin Tools"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr ""
+
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
 msgstr ""
 
-#. module: thunderbird
-#: field:thunderbird.installer,plugin_file:0
-#: field:thunderbird.installer,thunderbird:0
-msgid "Thunderbird Plug-in"
-msgstr ""
-
-#. module: thunderbird
-#: field:thunderbird.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
diff --git a/addons/users_ldap/i18n/fr.po b/addons/users_ldap/i18n/fr.po
index b74a9130e71..9de56e588d7 100644
--- a/addons/users_ldap/i18n/fr.po
+++ b/addons/users_ldap/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 05:12+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-17 22:01+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
@@ -25,17 +26,17 @@ msgstr "Configuration LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_binddn:0
 msgid "LDAP binddn"
-msgstr ""
+msgstr "LDAP binddn"
 
 #. module: users_ldap
 #: help:res.company.ldap,create_user:0
 msgid "Create the user if not in database"
-msgstr ""
+msgstr "Créer l'utilisateur s'il n'est pas dans la base de données"
 
 #. module: users_ldap
 #: help:res.company.ldap,user:0
 msgid "Model used for user creation"
-msgstr ""
+msgstr "Modèle utilisé pour la création d'utilisateur"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -50,7 +51,7 @@ msgstr "Société"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server:0
 msgid "LDAP Server address"
-msgstr ""
+msgstr "Adresse du serveur LDAP"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -60,22 +61,22 @@ msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
 #. module: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
 msgid "Authenticate users with ldap server"
-msgstr ""
+msgstr "Authentifier les utilisateurs avec le serveur LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server_port:0
 msgid "LDAP Server port"
-msgstr ""
+msgstr "Port du serveur LDAP"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
 msgid "res.company.ldap"
-msgstr ""
+msgstr "res.company.ldap"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
 msgid "LDAP password"
-msgstr ""
+msgstr "Mot de passe LDAP"
 
 #. module: users_ldap
 #: constraint:res.users:0
@@ -85,12 +86,12 @@ msgstr "La société choisie n'est pas autorisée pour cet utilisateur."
 #. module: users_ldap
 #: field:res.company,ldaps:0
 msgid "LDAP Parameters"
-msgstr ""
+msgstr "Paramètres LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
-msgstr ""
+msgstr "Utilisateur modèle"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -105,12 +106,12 @@ msgstr "res.users"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
 msgid "LDAP base"
-msgstr ""
+msgstr "Base LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
 msgid "LDAP filter"
-msgstr ""
+msgstr "Filtre LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,create_user:0
diff --git a/addons/users_ldap/i18n/mn.po b/addons/users_ldap/i18n/mn.po
index 6cf295ea083..0cfc7b2f1ae 100644
--- a/addons/users_ldap/i18n/mn.po
+++ b/addons/users_ldap/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 15:19+0000\n"
+"PO-Revision-Date: 2010-12-18 16:09+0000\n"
 "Last-Translator: badralb <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: 2010-12-17 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
@@ -25,7 +25,7 @@ msgstr "LDAP Тохиргоо"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_binddn:0
 msgid "LDAP binddn"
-msgstr ""
+msgstr "LDAP binddn"
 
 #. module: users_ldap
 #: help:res.company.ldap,create_user:0
@@ -70,7 +70,7 @@ msgstr "LDAP сервер порт"
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
 msgid "res.company.ldap"
-msgstr ""
+msgstr "res.company.ldap"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
diff --git a/addons/users_ldap/i18n/users_ldap.pot b/addons/users_ldap/i18n/users_ldap.pot
index 687e6c95346..39d5d66bc20 100644
--- a/addons/users_ldap/i18n/users_ldap.pot
+++ b/addons/users_ldap/i18n/users_ldap.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,21 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr ""
+
 #. module: users_ldap
 #: view:res.company:0
 msgid "LDAP Configuration"
@@ -35,11 +50,6 @@ msgstr ""
 msgid "Model used for user creation"
 msgstr ""
 
-#. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company
-msgid "Companies"
-msgstr ""
-
 #. module: users_ldap
 #: field:res.company.ldap,company:0
 msgid "Company"
@@ -50,24 +60,19 @@ msgstr ""
 msgid "LDAP Server address"
 msgstr ""
 
-#. module: users_ldap
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: users_ldap
-#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
-msgid "Authenticate users with ldap server"
-msgstr ""
-
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server_port:0
 msgid "LDAP Server port"
 msgstr ""
 
 #. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company_ldap
-msgid "res.company.ldap"
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: users_ldap
@@ -76,18 +81,13 @@ msgid "LDAP password"
 msgstr ""
 
 #. module: users_ldap
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
 msgstr ""
 
 #. module: users_ldap
-#: field:res.company,ldaps:0
-msgid "LDAP Parameters"
-msgstr ""
-
-#. module: users_ldap
-#: field:res.company.ldap,user:0
-msgid "Model User"
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
 msgstr ""
 
 #. module: users_ldap
@@ -96,13 +96,23 @@ msgid "Sequence"
 msgstr ""
 
 #. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_users
-msgid "res.users"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
 msgstr ""
 
 #. module: users_ldap
-#: field:res.company.ldap,ldap_base:0
-msgid "LDAP base"
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
 msgstr ""
 
 #. module: users_ldap
@@ -115,8 +125,3 @@ msgstr ""
 msgid "Create user"
 msgstr ""
 
-#. module: users_ldap
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index f0680bc2585..a766dd1eb71 100644
--- a/addons/warning/i18n/el.po
+++ b/addons/warning/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-16 17:27+0000\n"
+"PO-Revision-Date: 2010-12-17 21:14+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: 2010-12-17 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 5507b63a6e2..a1f8d728358 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-08-13 14:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-18 10:08+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-12-17 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -35,12 +35,12 @@ msgstr "Bericht voor Aankooporderregel"
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fout ! U kunt geen recursieve aangesloten leden maken."
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Verzamellijst"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
@@ -56,7 +56,7 @@ msgstr "Waarschuw wanneer dit product gekocht wordt"
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: warning
 #: view:product.product:0
@@ -185,7 +185,7 @@ msgstr "Waarschuwing op de inkooporder"
 #: code:addons/warning/warning.py:0
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "Waarschuwing voor %s"
 
 #. module: warning
 #: view:res.partner:0
@@ -195,7 +195,7 @@ msgstr "Waarschuwing bij de verkooporder."
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fout: ongeldige ean code"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -205,7 +205,7 @@ msgstr "Bericht voor Picking"
 #. module: warning
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
diff --git a/addons/warning/i18n/warning.pot b/addons/warning/i18n/warning.pot
index fce33a13251..3c9348b735a 100644
--- a/addons/warning/i18n/warning.pot
+++ b/addons/warning/i18n/warning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,6 @@ msgid "Picking List"
 msgstr ""
 
 #. module: warning
-#: model:ir.model,name:warning.model_sale_order_line
 #: field:product.product,sale_line_warn:0
 msgid "Sale Order Line"
 msgstr ""
@@ -115,14 +114,13 @@ msgid "Warning when Selling this Product"
 msgstr ""
 
 #. module: warning
-#: model:ir.model,name:warning.model_sale_order
 #: field:res.partner,sale_warn:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: warning
-#: field:res.partner,invoice_warn_msg:0
-msgid "Message for Invoice"
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
 msgstr ""
 
 #. module: warning
@@ -154,8 +152,14 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: warning
-#: field:res.partner,picking_warn:0
-msgid "Stock Picking"
+#: code:addons/warning/warning.py:0
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
 msgstr ""
 
 #. module: warning
@@ -199,3 +203,13 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
diff --git a/addons/web_livechat/i18n/web_livechat.pot b/addons/web_livechat/i18n/web_livechat.pot
new file mode 100644
index 00000000000..c8631e2f76a
--- /dev/null
+++ b/addons/web_livechat/i18n/web_livechat.pot
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* web_livechat
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:19+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: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid "Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+
diff --git a/addons/web_uservoice/i18n/web_uservoice.pot b/addons/web_uservoice/i18n/web_uservoice.pot
new file mode 100644
index 00000000000..3fe8cd89045
--- /dev/null
+++ b/addons/web_uservoice/i18n/web_uservoice.pot
@@ -0,0 +1,22 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* web_uservoice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:20+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: web_uservoice
+#: model:ir.module.module,shortdesc:web_uservoice.module_meta_information
+msgid "Add uservoice button in header"
+msgstr ""
+
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index bcf5e9d9152..cc4e61c5f1a 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-12-15 09:36+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-20 03:53+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: 2010-12-17 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -30,7 +31,7 @@ msgstr "Pages du wiki"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Méthode d'affichage"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +58,7 @@ msgstr "Section"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Indique si cette page a une table des matières ou non"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -79,18 +80,18 @@ msgstr "Contenu"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Pages enfants"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Page parente"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Dernier contributeur"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +101,7 @@ msgstr "Menu Parent"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Sujet, aussi appelé groupe du wiki"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -139,7 +140,7 @@ msgstr "Attention !"
 #: code:addons/wiki/wiki.py:0
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "Il n'y a pas de changement dans les révisions"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
@@ -159,7 +160,7 @@ msgstr "Description"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "A besoin d'une relecture"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +168,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Indique que cette page doit être relue, elle attire l'attention des autres "
+"contributeurs"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -177,7 +180,7 @@ msgstr "Menu Information"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "Historique de la page"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -204,6 +207,8 @@ msgstr "Avertissement"
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
 msgstr ""
+"Nécessite la sélection d'une page si la méthode d'affichage est Page "
+"d'accueil"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
@@ -220,7 +225,7 @@ msgstr "Souhaitez vous créer un index sur les pages sélectionnées ? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Différence"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -230,7 +235,7 @@ msgstr "Pages"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr ""
+msgstr "Description du groupe"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -240,7 +245,7 @@ msgstr "Utilisez des code de section de page comme 1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Voulez-vous ouvrir une page du wiki ? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -297,7 +302,7 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "Définir le comportement par défaut du menu créé sur ce groupe"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
@@ -323,12 +328,12 @@ msgstr "Page d'accueil"
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Vous permet de lier une autre page au sujet actuel"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Informations de modification"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -375,6 +380,11 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Les pages de wiki vous permettent de partager des idées et des questions "
+"avec vos collaborateurs. Vous pouvez créer un nouveau document qui peut être "
+"lié à une ou plusieurs applications (CRM, Ventes, etc.). Vous pouvez "
+"utiliser des mots-clés pour faciliter l'accès à vos page de wiki. Il y a une "
+"édition wiki classique pour le formatage des textes."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -419,12 +429,12 @@ msgstr "Table des matières"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Ouvrir une page de wiki"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "Assistant d'ouverture de page"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -446,7 +456,7 @@ msgstr "Besoin d'une relecture"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Pages en attente de relecture"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
diff --git a/addons/wiki/i18n/lv.po b/addons/wiki/i18n/lv.po
new file mode 100644
index 00000000000..dfd51939d7f
--- /dev/null
+++ b/addons/wiki/i18n/lv.po
@@ -0,0 +1,453 @@
+# Latvian 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-18 19:19+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\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: 2010-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki
+#: field:wiki.groups,template:0
+msgid "Wiki Template"
+msgstr "Wiki sagatave"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
+msgid "Wiki Pages"
+msgstr "Wiki lapas"
+
+#. module: wiki
+#: field:wiki.groups,method:0
+msgid "Display Method"
+msgstr "Attēlošanas metode"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,create_uid:0
+msgid "Author"
+msgstr "Autors"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
+#: view:wiki.wiki.page.open:0
+msgid "Open Page"
+msgstr "Atvērt lapu"
+
+#. module: wiki
+#: field:wiki.groups,menu_id:0
+msgid "Menu"
+msgstr "Izvēlne"
+
+#. module: wiki
+#: field:wiki.wiki,section:0
+msgid "Section"
+msgstr "Sadaļa"
+
+#. module: wiki
+#: help:wiki.wiki,toc:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "Norāda vai šai lapai ir satura rādītājs vai nē"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_history
+#: view:wiki.wiki.history:0
+msgid "Wiki History"
+msgstr "Wiki vēsture"
+
+#. module: wiki
+#: field:wiki.wiki,minor_edit:0
+msgid "Minor edit"
+msgstr "Maznozīmīgi labojumi"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,text_area:0
+msgid "Content"
+msgstr "Saturs"
+
+#. module: wiki
+#: field:wiki.wiki,child_ids:0
+msgid "Child Pages"
+msgstr "Apakšlapas"
+
+#. module: wiki
+#: field:wiki.wiki,parent_id:0
+msgid "Parent Page"
+msgstr "Virslapa"
+
+#. module: wiki
+#: view:wiki.wiki:0
+#: field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "Pēdējais papildināja"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "VirsIzvēlne"
+
+#. module: wiki
+#: help:wiki.wiki,group_id:0
+msgid "Topic, also called Wiki Group"
+msgstr "Tēma, arī saukta Wiki grupa"
+
+#. module: wiki
+#: field:wiki.groups,name:0
+#: view:wiki.wiki:0
+#: field:wiki.wiki,group_id:0
+msgid "Wiki Group"
+msgstr "Wiki grupa"
+
+#. module: wiki
+#: field:wiki.wiki,name:0
+msgid "Title"
+msgstr "Virsraksts"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "Vednis Veidot izvēlni"
+
+#. module: wiki
+#: field:wiki.wiki,history_id:0
+msgid "History Lines"
+msgstr "Vēstures rindas"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Page Content"
+msgstr "Lapas saturs"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Uzmanību!"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:0
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "Revīzijās nav izmaiņu"
+
+#. module: wiki
+#: model:ir.module.module,shortdesc:wiki.module_meta_information
+msgid "Document Management - Wiki"
+msgstr "Dokumentu pārvaldība - Wiki"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "Izvēlnes Nosaukums"
+
+#. module: wiki
+#: field:wiki.groups,notes:0
+msgid "Description"
+msgstr "Apraksts"
+
+#. module: wiki
+#: field:wiki.wiki,review:0
+msgid "Needs Review"
+msgstr "Nepieciešams izskatīt"
+
+#. module: wiki
+#: help:wiki.wiki,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr ""
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+msgid "Menu Information"
+msgstr "Izvēlnes informācija"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
+msgid "Page History"
+msgstr "Lapas vēsture"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "Tree"
+msgstr ""
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Page Template"
+msgstr "Lapas sagatave"
+
+#. module: wiki
+#: field:wiki.wiki,tags:0
+msgid "Keywords"
+msgstr "Atslēgvārdi"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#, python-format
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+
+#. module: wiki
+#: field:wiki.wiki.history,create_date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: wiki
+#: view:wiki.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr ""
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
+#: view:wizard.wiki.history.show_diff:0
+msgid "Difference"
+msgstr "Atšķirība"
+
+#. module: wiki
+#: field:wiki.groups,page_ids:0
+msgid "Pages"
+msgstr "Lapas"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Group Description"
+msgstr "Grupas apraksts"
+
+#. module: wiki
+#: help:wiki.wiki,section:0
+msgid "Use page section code like 1.2.1"
+msgstr "Izmantojiet lapas sadaļas kodu, piem. 1.2.1."
+
+#. module: wiki
+#: view:wiki.wiki.page.open:0
+msgid "Want to open a wiki page? "
+msgstr ""
+
+#. module: wiki
+#: field:wiki.groups,section:0
+msgid "Make Section ?"
+msgstr "Izveidot sadaļu?"
+
+#. module: wiki
+#: field:wiki.wiki.history,text_area:0
+msgid "Text area"
+msgstr "Teksta lauks"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Meta Information"
+msgstr "Meta informācija"
+
+#. module: wiki
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
+msgstr "Izveidots"
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wizard.wiki.history.show_diff:0
+msgid "Notes"
+msgstr "Piezīmes"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "List"
+msgstr "Saraksts"
+
+#. module: wiki
+#: field:wiki.wiki,summary:0
+#: field:wiki.wiki.history,summary:0
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#. module: wiki
+#: field:wiki.groups,create_date:0
+msgid "Created Date"
+msgstr "Izveides Datums"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_history
+msgid "All Page Histories"
+msgstr "Visu lapu vēsture"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki
+msgid "wiki.wiki"
+msgstr "wiki.wiki"
+
+#. module: wiki
+#: help:wiki.groups,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr "Definējiet šajā grupā veidoto izvēļņu noklusējuma uzvedību"
+
+#. module: wiki
+#: view:wizard.wiki.history.show_diff:0
+msgid "Close"
+msgstr "Aizvērt"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
+msgid "wizard.wiki.history.show_diff"
+msgstr "wizard.wiki.history.show_diff"
+
+#. module: wiki
+#: field:wiki.wiki.history,wiki_id:0
+msgid "Wiki Id"
+msgstr "Wiki Id"
+
+#. module: wiki
+#: field:wiki.groups,home:0
+#: selection:wiki.groups,method:0
+msgid "Home Page"
+msgstr "Sākuma lapa"
+
+#. module: wiki
+#: help:wiki.wiki,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr ""
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Modification Information"
+msgstr "Izmaiņu informācija"
+
+#. module: wiki
+#: model:ir.ui.menu,name:wiki.menu_wiki_configuration
+#: view:wiki.wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,write_date:0
+msgid "Modification Date"
+msgstr "Izmaiņu datums"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Configuration"
+msgstr "Konfigurācija"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
+#: model:ir.model,name:wiki.model_wiki_make_index
+#: view:wiki.make.index:0
+msgid "Create Index"
+msgstr "Izveidot satura rādītāju"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr ""
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: wiki
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid ""
+"Wiki Pages  allows you to share ideas and questions with your coworkers. You "
+"can create a new document that can be link to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
+#: view:wiki.create.menu:0
+#: view:wiki.groups:0
+#: view:wiki.make.index:0
+msgid "Create Menu"
+msgstr "Izveidot Izvēlni"
+
+#. module: wiki
+#: field:wiki.wiki.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr "Vai šis bija nozīmīgas izmaiņas?"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
+#: model:ir.model,name:wiki.model_wiki_groups
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups
+#: view:wiki.groups:0
+msgid "Wiki Groups"
+msgstr "Wiki grupas"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Topic"
+msgstr "Tēma"
+
+#. module: wiki
+#: field:wiki.wiki.history,write_uid:0
+msgid "Modify By"
+msgstr "Laboja"
+
+#. module: wiki
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:0
+#: field:wiki.wiki,toc:0
+#, python-format
+msgid "Table of Contents"
+msgstr "Satura rādītājs"
+
+#. module: wiki
+#: view:wiki.groups:0
+#: view:wiki.wiki.page.open:0
+msgid "Open Wiki Page"
+msgstr "Atvērt Wiki lapu"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr ""
+
+#. module: wiki
+#: view:wiki.create.menu:0
+#: view:wiki.make.index:0
+#: view:wiki.wiki.page.open:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: wiki
+#: field:wizard.wiki.history.show_diff,file_path:0
+msgid "Diff"
+msgstr "Atšķirība"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Need Review"
+msgstr "Nepieciešams izskatīt"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr "Lapas, kas gaida izskatīšanu"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
+msgid "Search Page"
+msgstr "Meklēt lapu"
diff --git a/addons/wiki/i18n/wiki.pot b/addons/wiki/i18n/wiki.pot
index b86f8f22675..01fc3cd4ac5 100644
--- a/addons/wiki/i18n/wiki.pot
+++ b/addons/wiki/i18n/wiki.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -198,8 +198,8 @@ msgid "Warning"
 msgstr ""
 
 #. module: wiki
-#: help:wiki.groups,home:0
-msgid "Required to select home page if display method is Home Page"
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: wiki
@@ -255,8 +255,12 @@ msgid "Meta Information"
 msgstr ""
 
 #. module: wiki
-#: field:wiki.wiki,create_date:0
-msgid "Created on"
+#: model:ir.module.module,description:wiki.module_meta_information
+msgid "\n"
+"The base module to manage documents(wiki)\n"
+"\n"
+"keep track for the wiki groups, pages, and history\n"
+"    "
 msgstr ""
 
 #. module: wiki
@@ -265,6 +269,11 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/wiki/i18n/zh_CN.po
index 3a38319fb74..e5b5388e18e 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/wiki/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-10-30 14:37+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-19 07:16+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2010-12-17 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -30,7 +30,7 @@ msgstr "Wiki页"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "显示方式"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +79,18 @@ msgstr "内容"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "子页面"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "上级页面"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "最近的贡献者"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "上级菜单"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "主题，也叫做维基组"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,7 +117,7 @@ msgstr "标题"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "向导创建菜单"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -127,13 +127,13 @@ msgstr "日志明细"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "页面内容"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告 !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
@@ -159,7 +159,7 @@ msgstr "描述"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "需要复审"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -177,12 +177,12 @@ msgstr "菜单信息"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "页面编辑历史"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "树形列表"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -192,7 +192,7 @@ msgstr "页模板"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "关键字"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:0
@@ -220,7 +220,7 @@ msgstr "想在选择的页创建一索引? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "差异"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -230,7 +230,7 @@ msgstr "页"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr ""
+msgstr "组描述"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -240,7 +240,7 @@ msgstr "用户页段代码如1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "想打开一个维基页面？ "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -255,7 +255,7 @@ msgstr "文本区"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "元信息"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -271,7 +271,7 @@ msgstr "备注"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -297,12 +297,12 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "定义组菜单创建后的默认行为"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -318,17 +318,17 @@ msgstr "维基页标识符"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "主页"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允许您链接其他页面到本主题"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -363,7 +363,7 @@ msgstr "您因该选定最少一个或最多两个历史差异！"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -399,7 +399,7 @@ msgstr "Wiki组"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "主题"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -417,7 +417,7 @@ msgstr "目录"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "打开维基页面"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
@@ -444,12 +444,12 @@ msgstr "需要预览"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "正在等待复审的页面"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "搜索页面"
 
 #~ msgid "Document Management"
 #~ msgstr "文档管理"
diff --git a/addons/wiki_faq/i18n/sv.po b/addons/wiki_faq/i18n/sv.po
new file mode 100644
index 00000000000..b7af702e133
--- /dev/null
+++ b/addons/wiki_faq/i18n/sv.po
@@ -0,0 +1,27 @@
+# Swedish 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-18 06:32+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2010-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Denna modul ger en wiki FAQ mall\n"
+"    "
diff --git a/addons/wiki_faq/i18n/wiki_faq.pot b/addons/wiki_faq/i18n/wiki_faq.pot
index 90a4e1186f9..7f87e960dcd 100644
--- a/addons/wiki_faq/i18n/wiki_faq.pot
+++ b/addons/wiki_faq/i18n/wiki_faq.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,3 +21,8 @@ msgid "This module provides a wiki FAQ Template\n"
 "    "
 msgstr ""
 
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr ""
+
diff --git a/addons/wiki_quality_manual/i18n/sv.po b/addons/wiki_quality_manual/i18n/sv.po
new file mode 100644
index 00000000000..b60a2585aaf
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/sv.po
@@ -0,0 +1,27 @@
+# Swedish 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-18 06:34+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2010-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"Kvalitetsmanual mall\n"
+"    "
diff --git a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
index 63e7484304a..b57e24749c6 100644
--- a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
+++ b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,3 +21,8 @@ msgid "Quality Manual Template\n"
 "    "
 msgstr ""
 
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr ""
+
diff --git a/addons/wiki_sale_faq/i18n/mn.po b/addons/wiki_sale_faq/i18n/mn.po
index 9e90c032347..88ab91e33d5 100644
--- a/addons/wiki_sale_faq/i18n/mn.po
+++ b/addons/wiki_sale_faq/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:06+0000\n"
-"PO-Revision-Date: 2010-09-29 09:04+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-12-19 23:55+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: 2010-12-17 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -26,6 +26,12 @@ msgid ""
 "used to easily tag wiki pages. You should use this application with the "
 "OpenERP web client interface."
 msgstr ""
+"Вики хуудсууд нь танд хамтран ажиллагчидтайгаа санал бодлоо болон "
+"асуултуудаа хуваалцах боломж олгоно. Нэг болон хэд хэдэн аппликэшнтэй "
+"(төслийн тодорхойлолт, борлуулалтын багийн FAQ г.м. ) холбогдох бичиг "
+"баримтыг үүсгэх боломжтой. Түлхүүр үгс нь вики хуудсуудыг хялбар таг хийхэд "
+"ашиглагдана. Энэ аппликэшнийг OpenERP веб клиент интэрфэйстэй хамтад нь "
+"ашиглах хэрэгтэй."
 
 #. module: wiki_sale_faq
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
diff --git a/addons/wiki_sale_faq/i18n/sv.po b/addons/wiki_sale_faq/i18n/sv.po
new file mode 100644
index 00000000000..e0bf6725f56
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/sv.po
@@ -0,0 +1,69 @@
+# Swedish 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: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-18 06:35+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\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: 2010-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with co-workers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, a FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "Dokument"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wikisidor"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Denna modul ger en wiki FAQ mall\n"
+"    "
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents gives you an access to all attached files to any record. It is a "
+"repository of all documents such as emails, project related attachments or "
+"any other documents. From this view, you can search on the content of the "
+"documents. OpenERP automatically assign meta-data based on the record like "
+"the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
+".PDF documents."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr "Wiki - Försäljning - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
index 9df32dac9b5..400e5fe1ca0 100644
--- a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
+++ b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,7 @@ msgid "Wiki pages allow you to share ideas and questions with co-workers. You ca
 msgstr ""
 
 #. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
 msgid "Documents"