diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 38502ad287f..73b1e82e244 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-26 15:09+0000\n"
+"PO-Revision-Date: 2012-11-27 20:06+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: account
@@ -2399,7 +2399,7 @@ msgstr "Avgiftsdefinisjon"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "konfigurere regnskap."
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -2420,7 +2420,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Bra jobba!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
@@ -2515,7 +2515,7 @@ msgstr "Åpne poster"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Neste leverandør kredit notat nummer."
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2555,12 +2555,12 @@ msgstr "Konto for avgifter"
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Du har ikke rett til å åpne denne %s journalen !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Sjekk total på leverandør fakturaer."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2781,7 +2781,7 @@ msgstr "skattemessige posisjoner"
 #: code:addons/account/account_move_line.py:592
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en lukket konto% s% s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2816,7 +2816,7 @@ msgstr "Kunde fakturakladd"
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Konto egenskaper."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2826,7 +2826,7 @@ msgstr "Avstemming av partner"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Fin. Konto."
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2903,7 +2903,7 @@ msgstr "EXJ"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Credit Note"
-msgstr ""
+msgstr "Opprett kredit notat."
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -3001,7 +3001,7 @@ msgstr "Kontodimensjon"
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Standard omsetnings skatt."
 
 #. module: account
 #: view:account.account:0
@@ -3175,7 +3175,7 @@ msgstr "Kommuniksjonstype"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Konto og periode må tilhøre samme selskap."
 
 #. module: account
 #: constraint:res.currency:0
@@ -3213,7 +3213,7 @@ msgstr "Avskrivningsbeløp"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3222,12 +3222,14 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"Valgt faktura (e) kan ikke bekreftes som de ikke er i \"Kladd\" eller \"pro-"
+"forma 'tilstand."
 
 #. module: account
 #: code:addons/account/account.py:1114
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Du bør velge de periodene som tilhører samme selskap."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3240,17 +3242,17 @@ msgstr "Salg pr. konto"
 #: code:addons/account/account.py:1471
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Du kan ikke slette en publisert bilagsregistrering \"% s\"."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Accounting Period"
-msgstr ""
+msgstr "Regnskaps periode."
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Salgs journal."
 
 #. module: account
 #: code:addons/account/account.py:2323
@@ -3346,7 +3348,7 @@ msgstr "Obligatorisk"
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Bare en diagram mal tilgjengelig."
 
 #. module: account
 #: view:account.chart.template:0
@@ -3359,7 +3361,7 @@ msgstr "Kostnadskonto"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Oppsummering."
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3481,7 +3483,7 @@ msgstr "Velg regnskapsår"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Dato område."
 
 #. module: account
 #: view:account.period:0
@@ -3533,7 +3535,7 @@ msgstr ""
 #: code:addons/account/account.py:2650
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Det er ingen overordnede kode for denne malen kontoen."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3617,12 +3619,12 @@ msgstr "Elektonisk fil"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Feil: Ugyldig ean kode."
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Selskapet har en konto plan."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3638,7 +3640,7 @@ msgstr "Konto Partner ledger"
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "%s <b>created</b>."
-msgstr ""
+msgstr "%s <b>Opprettet</b>."
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -3648,7 +3650,7 @@ msgstr "Gir sekvensen for å merke kolonne."
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Konto periode."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3676,7 +3678,7 @@ msgstr "Kontoplanmal"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaksjoner."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3851,6 +3853,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Kan ikke finne noen konto journal of% s for denne bedriften.\n"
+"\n"
+"Du kan opprette en i menyen:\n"
+"Konfigurasjon / Tidsskrifter / tidsskrifter."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3890,7 +3896,7 @@ msgstr "år"
 #. module: account
 #: field:account.config.settings,date_start:0
 msgid "Start date"
-msgstr ""
+msgstr "Starts dato."
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -3938,7 +3944,7 @@ msgstr "Kontoplan"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Ta ut penger."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4059,7 +4065,7 @@ msgstr "Detaljert"
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
-msgstr ""
+msgstr "Kjøpet skatt vil bli tildelt som standard på nye produkter."
 
 #. module: account
 #: report:account.invoice:0
@@ -4087,7 +4093,7 @@ msgstr "(Hvis du ikke velger periode vil alle åpne perioder bli valgt)"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "konto.journal.Pengeboks.linje."
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4227,7 +4233,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Sjekk totalen av leverandør fakturaer."
 
 #. module: account
 #: view:account.tax:0
@@ -4314,7 +4320,7 @@ msgstr "Multiplikasjonsfaktor Skatt kode"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Fullfør sett av skatter."
 
 #. module: account
 #: field:account.account,name:0
@@ -4342,7 +4348,7 @@ msgstr ""
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "paid"
-msgstr ""
+msgstr "Betalt."
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4376,7 +4382,7 @@ msgstr "Standardkoder"
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
@@ -4417,7 +4423,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1236
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Du kan ikke bruke en inaktiv konto."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4485,7 +4491,7 @@ msgstr "tittel"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft credit note"
-msgstr ""
+msgstr "Opprett en kladd kredit notat."
 
 #. module: account
 #: view:account.invoice:0
@@ -4517,7 +4523,7 @@ msgstr "Eiendeler"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Regnskap & Finans."
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4544,7 +4550,7 @@ msgstr "(Faktura må settes ikke-avstemt før den kan åpnes)"
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Faktura skatt analytisk konto."
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4705,6 +4711,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Feil!\n"
+"Du kan ikke opprette rekursive skatte koder."
 
 #. module: account
 #: constraint:account.period:0
@@ -4712,6 +4720,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Feil!\n"
+"Varigheten av perioden (e) er / er ugyldig."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4727,7 +4737,7 @@ msgstr "Måned"
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Leverandør faktura sekvens."
 
 #. module: account
 #: code:addons/account/account_invoice.py:571
@@ -4859,7 +4869,7 @@ msgstr "Vis modus"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Balansert."
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4877,7 +4887,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Sett dine regnskaps tillegg."
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4968,7 +4978,7 @@ msgstr "Navnet på perioden må være unikt per selskap!"
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Valuta som per selskapets land."
 
 #. module: account
 #: view:account.tax:0
@@ -5009,6 +5019,8 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Feil!\n"
+"Du kan ikke opprette en konto som har overordnede hensyn til ulike selskap."
 
 #. module: account
 #: code:addons/account/account_invoice.py:615
@@ -5140,7 +5152,7 @@ msgstr "Annulert faktura"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Mine fakturaer."
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5150,7 +5162,7 @@ msgstr "Ny"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Selg skatt."
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5225,7 +5237,7 @@ msgstr "SAJ"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -5265,7 +5277,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "Eller."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5358,7 +5370,7 @@ msgstr ""
 #: field:account.invoice,message_comment_ids:0
 #: help:account.invoice,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5393,7 +5405,7 @@ msgstr "Aktiv"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Kontant kontroll."
 
 #. module: account
 #: field:account.analytic.balance,date2:0
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 9b54647e726..a70fdf38f3c 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,14 +7,14 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Accounting" groups="account.group_account_user">
+                    <page string="Accounting" groups="account.group_account_invoice">
                         <group name="properties">
                             <group>
-                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
                                 <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" />
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
                                 <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                         </group>
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index 7240f08569a..2a5ef937b6e 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2010-12-17 09:40+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 13:16+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Menu Boekhouding openen"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fd32edba0a1..be2a504658f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -60,14 +60,13 @@
                                     or view
                                 </span>
 
-                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                <span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
                                     No order to invoice, create
-                                </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    />
+                                    /></span>
                             </td>
                         </tr><tr>
                             <td class="oe_timesheet_grey">
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index ba7a0cc051d..bf7c124bb91 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -1,91 +1,46 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 09:42+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:22+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_invoiced:0
-msgid ""
-"Number of hours that can be invoiced plus those that already have been "
-"invoiced."
-msgstr ""
-"Número de horas que pueden ser facturadas más aquellas que ya han sido "
-"facturadas."
+#: view:account.analytic.account:0
+msgid "No order to invoice, create"
+msgstr "No existe orden a facturar"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_ca:0
-msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr ""
-"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+#: view:account.analytic.account:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_hours:0
-msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
+#: view:account.analytic.account:0
+msgid "To Invoice"
+msgstr "Para facturar"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
-#, python-format
-msgid "AccessError"
-msgstr "Error de acceso"
+#: view:account.analytic.account:0
+msgid "Remaining"
+msgstr "Restante"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
-
-#. 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 ""
-"\n"
-"Este módulo modifica la vista de cuenta analítica para mostrar\n"
-"datos importantes para el director de proyectos en empresas de servicios.\n"
-"Añade menú para mostrar información relevante para cada director.\n"
-"\n"
-"También puede ver el informe del resumen contable analítico\n"
-"a nivel de usuario, así como a nivel mensual.\n"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,theorical_margin:0
-msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
-msgstr "Tasa de margen real (%)"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theoretical Revenue"
-msgstr "Ingresos teóricos"
+#: view:account.analytic.account:0
+msgid "Contracts in progress"
+msgstr "Contratos en progreso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -93,59 +48,13 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
-"coste que se ha facturado."
-
-#. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Billing"
-msgstr "Facturación"
+"Si factura a partir de los costos, ésta es la fecha del último trabajo o "
+"costo que se ha facturado."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "Fecha del último coste/trabajo"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,total_cost:0
-msgid "Total Costs"
-msgstr "Costes totales"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_quantity:0
-msgid ""
-"Number of hours you spent on the analytic account (from timesheet). It "
-"computes on all journal of type 'general'."
-msgstr ""
-"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
-"en todos los diarios del tipo 'general'."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theoretical Margin"
-msgstr "Márgen teórico"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,ca_theorical:0
-msgid ""
-"Based on the costs you had on the project, what would have been the revenue "
-"if all these costs have been invoiced at the normal sale price provided by "
-"the pricelist."
-msgstr ""
-"Basado en los costes que tenía en el proyecto, lo que habría sido el "
-"ingreso si todos estos costes se hubieran facturado con el precio de venta "
-"normal proporcionado por la tarifa."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,user_ids:0
-#: field:account_analytic_analysis.summary.user,user:0
-msgid "User"
-msgstr "Usuario"
+msgstr "Fecha del último costo/trabajo"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -153,71 +62,194 @@ msgid "Uninvoiced Amount"
 msgstr "Importe no facturado"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,real_margin:0
-msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
+#: view:account.analytic.account:0
+msgid ""
+"When invoicing on timesheet, OpenERP uses the\n"
+"                            pricelist of the contract which uses the price\n"
+"                            defined on the product related to each employee "
+"to\n"
+"                            define the customer invoice price rate."
+msgstr ""
+"Cuando se factura la Hoja de trabajo, OpenERP usa la\n"
+"                            lista de precios del contracto que a su vez usa "
+"el precio\n"
+"                           definido en el producto relacionado a cada "
+"empleado para\n"
+"                            definir el precio de la factura del cliente."
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Uninvoiced Hours"
-msgstr "Horas no facturadas"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Fecha del último trabajo realizado en esta cuenta."
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
-msgid "report_account_analytic"
-msgstr "Informes contabilidad analítica"
-
-#. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours Summary by User"
-msgstr "Resumen de horas por usuario"
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "Facturar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
-#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
-#, python-format
-msgid "You try to bypass an access rule (Document type: %s)."
-msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Fecha del último coste facturado"
+msgstr "Fecha del último costo facturado"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_invoiced:0
-msgid "Invoiced Hours"
-msgstr "Horas facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin:0
-msgid "Real Margin"
-msgstr "Margen real"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+#: help:account.analytic.account,fix_price_to_invoice:0
+msgid "Sum of quotations for this contract."
+msgstr "Suma de las cotizaciones para este contrato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
 msgstr "Importe total facturado al cliente para esta cuenta."
 
+#. module: account_analytic_analysis
+#: help:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Sum of timesheet lines invoiced for this contract."
+msgstr ""
+"Suma de las lineas de la hoja de trabajo facturadas para este contrato."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Total Time"
+msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts not assigned"
+msgstr "No tiene contratos asignados"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts that are not assigned to an account manager."
+msgstr "Contratos que no han sido asignados a un gerente de cuenta"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new contract.\n"
+"              </p><p>\n"
+"                You will find here the contracts to be renewed because the\n"
+"                end date is passed or the working effort is higher than the\n"
+"                maximum authorized one.\n"
+"              </p><p>\n"
+"                OpenERP automatically sets contracts to be renewed in a "
+"pending\n"
+"                state. After the negociation, the salesman should close or "
+"renew\n"
+"                pending contracts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click para definir un nuevo contrato.\n"
+"              </p><p>\n"
+"                Aquí encontrará  los contratos que serán renovados a los que "
+"\n"
+"                la fecha ha expirado o la cantidad de trabajo es mayor que "
+"el \n"
+"                máximo autorizado.\n"
+"              </p><p>\n"
+"                OpenERP cambia automaticamente los contratos a ser renovados "
+"a estado pendiente.\n"
+"                Despues de negociar, el vendedor deve cerrar o renovar "
+"contratos pendientes.\n"
+"              </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "End Date"
+msgstr "Fecha de término"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours_to_invoice:0
+msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
+msgstr "Calculado usando la formula: Tiempo Máximo - Tiempo total facturado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Expected"
+msgstr "Esperado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theoretical Revenue - Total Costs"
+msgstr "Calculado utilizando la formula: Ingresos Teóricos - Costos totales"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Time"
+msgstr "Tiempo facturado"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Tasa de margen real (%)"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Time - Total Worked Time"
+msgstr ""
+"Calculado utilizando la formula: Tiempo Maximo - Tiempo Total Trabajado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of time you spent on the analytic account (from timesheet). It "
+"computes quantities on all journal of type 'general'."
+msgstr ""
+"Cantidad de tiempo que utilizaste en la cuenta analítica (Hoja de trabajo). "
+"Calcula cantidades en todos los diarios de tipo 'General'."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Nada por facturar"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Template of Contract"
+msgstr "Plantilla de contrato"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Total Worked Time"
+msgstr "Tiempo total trabajado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Margen real"
+
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
@@ -229,18 +261,346 @@ msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of hours (from journal of type 'general') that can be invoiced if you "
-"invoice based on analytic account."
-msgstr ""
-"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
-"si factura basado en contabilidad analítica."
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "o vista"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Analytic accounts"
-msgstr "Cuentas analíticas"
+msgid "Parent"
+msgstr "Padre"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "Time & Materials to Invoice"
+msgstr "Tiempo y materiales a facturar."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
+"Costos totales para esta cuenta. Incluye costos reales (desde facturas) y "
+"costos indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"The contracts to be renewed because the deadline is passed or the working "
+"hours are higher than the allocated hours"
+msgstr ""
+"El contrato necesita ser renovado porque la fecha de finalización ha "
+"terminado o las horas trabajadas son más que las asignadas"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending contracts to renew with your customer"
+msgstr "Contratos pendientes para renovar con el cliente"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
+#, python-format
+msgid "Sale Order Lines of %s"
+msgstr "Lineas de venta para %s"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,is_overdue_quantity:0
+msgid "Overdue Quantity"
+msgstr "Cantidad sobrepasada"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr "Ingresos teóricos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "To Renew"
+msgstr "Para renovar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"A contract in OpenERP is an analytic account having a partner set on it."
+msgstr ""
+"Un contrato en OpenERP es una cuenta analítica que tiene un cliente asignado."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
+msgid "Sales Orders"
+msgstr "Orden de Venta"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr "Si factura desde costos, esta es la fecha de lo último facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Basado en los costes que tenía en el proyecto, lo que habría sido el "
+"ingreso si todos estos costes se hubieran facturado con el precio de venta "
+"normal proporcionado por la lista de precios."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click here to create a template of contract.\n"
+"                </p><p>\n"
+"                    Templates are used to prefigure contract/project that \n"
+"                    can be selected by the salespeople to quickly configure "
+"the\n"
+"                    terms and conditions of the contract.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click aquí para crear una plantilla de contrato.\n"
+"                </p><p>\n"
+"                    Las plantillas son utilizadas para pre-configurar "
+"contratos/proyectos que \n"
+"                    que pueden ser seleccionados por los agentes de ventas "
+"para configurar rápidamente los\n"
+"                    términos y condiciones del contrato.\n"
+"                </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of time (hours/days) that can be invoiced plus those that already "
+"have been invoiced."
+msgstr ""
+"Cantidad de tiempo(horas/días) que pueden ser facturadas más las que ya han "
+"sido facturadas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Time (real)"
+msgstr "Beneficio por tiempo(real)"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a new contract.\n"
+"                </p><p>\n"
+"                    Use contracts to follow tasks, issues, timesheets or "
+"invoicing based on\n"
+"                    work done, expenses and/or sales orders. OpenERP will "
+"automatically manage\n"
+"                    the alerts for the renewal of the contracts to the right "
+"salesperson.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click aquí para crear un nuevo contrato.\n"
+"                </p><p>\n"
+"                    Use contratos para dar seguimiento a tareas, problemas, "
+"hojas de trabajo o facturacion basada en \n"
+"                    trabajos realizados, gastos y/o ordenes de venta. "
+"OpenERP maneja automáticamente alertas\n"
+"                    para la renovación de contratos a la persona de ventas "
+"indicada.\n"
+"                </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,toinvoice_total:0
+msgid "Total to Invoice"
+msgstr "Total a facturar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Sale Orders"
+msgstr "Pedidos de venta"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Open"
+msgstr "Abierta"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,invoiced_total:0
+msgid "Total Invoiced"
+msgstr "Total Facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Ultima fecha de factura"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
+msgid ""
+"<p>\n"
+"                You will find here timesheets and purchases you did for\n"
+"                contracts that can be reinvoiced to the customer.  If you "
+"want\n"
+"                to record new activities to invoice, you should use the "
+"timesheet\n"
+"                menu instead.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                Encontrara aqui las hojas de trabajo y compras que ha "
+"realizado para\n"
+"                contratos que pueden ser refacturados al cliente. Si desea "
+"agregar \n"
+"                nuevas lineas para facturar, debe utilizar el menú de hoja "
+"de trabajo.\n"
+"              </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Time"
+msgstr "Tiempo sin facturar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Costos totales"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_total:0
+msgid ""
+"Expectation of remaining income for this contract. Computed as the sum of "
+"remaining subtotals which, in turn, are computed as the maximum between "
+"'(Estimation - Invoiced)' and 'To Invoice' amounts"
+msgstr ""
+"Expectativa de ingresos restantes para este contrato. Calculado como la suma "
+"de los subtotales restantes que, a su vez, se calculan como el máximo entre "
+"'(Estimación - facturado)' y cantidades 'a facturar'"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
+msgid "Contracts to Renew"
+msgstr "Contratos a renovar"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,toinvoice_total:0
+msgid " Sum of everything that could be invoiced for this contract."
+msgstr " Suma de todo lo que puede ser facturado en este contrato."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr "Márgen teórico"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_total:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Calculado utilizando la fórmula: Importe facturado - Costos totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_est:0
+msgid "Estimation of Hours to Invoice"
+msgstr "Estimacion de horas a facturar."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,fix_price_invoices:0
+msgid "Fixed Price"
+msgstr "Precio fijo"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts Having a Partner"
+msgstr "Contratos que tiene una empresa"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,est_total:0
+msgid "Total Estimation"
+msgstr "Estimación Total"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -253,128 +613,29 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
-"Si factura basado en contabilidad analítica, el importe restante que puede "
-"facturar al cliente basado en los costes totales."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,revenue_per_hour:0
-msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,revenue_per_hour:0
-msgid "Revenue per Hours (real)"
-msgstr "Ingresos por horas (real)"
+"Si factura desde contabilidad analítica, el importe restante que puede "
+"facturar al cliente basado en los costos totales."
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
 #: field:account_analytic_analysis.summary.user,unit_amount:0
 msgid "Total Time"
-msgstr "Tiempo total"
+msgstr "Tiempo Total"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,month_ids:0
-#: field:account_analytic_analysis.summary.month,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:account.analytic.account,invoice_on_timesheets:0
+msgid "On Timesheets"
+msgstr "En hojas de trabajo"
 
 #. module: account_analytic_analysis
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:account.analytic.account,fix_price_to_invoice:0
+#: field:account.analytic.account,remaining_hours:0
+#: field:account.analytic.account,remaining_hours_to_invoice:0
+#: field:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Remaining Time"
+msgstr "Tiempo restante"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
-msgid "Overpassed Accounts"
-msgstr "Cuentas caducadas"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
-msgid "All Uninvoiced Entries"
-msgstr "Todas las entradas no facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Horas totales"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,total_cost:0
-msgid ""
-"Total of costs for this account. It includes real costs (from invoices) and "
-"indirect costs, like time spent on timesheets."
-msgstr ""
-"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
-"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
-
-#~ msgid "Hours summary by user"
-#~ msgstr "Resumen de horas por usuario"
-
-#~ msgid "All Analytic Accounts"
-#~ msgstr "Todas las cuentas analíticas"
-
-#~ msgid "My Current Accounts"
-#~ msgstr "Mis cuentas actuales"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Theorical Revenue"
-#~ msgstr "Ingresos teóricos"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "New Analytic Account"
-#~ msgstr "Nueva cuenta analítica"
-
-#~ msgid "Theorical Margin"
-#~ msgstr "Margen teórico"
-
-#~ msgid "Current Analytic Accounts"
-#~ msgstr "Cuentas analíticas actuales"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "My Pending Accounts"
-#~ msgstr "Mis cuentas pendientes"
-
-#~ msgid "My Uninvoiced Entries"
-#~ msgstr "Mis entradas no facturadas"
-
-#~ msgid "My Accounts"
-#~ msgstr "Mis cuentas"
-
-#~ msgid "Analytic Accounts"
-#~ msgstr "Cuentas analíticas"
-
-#~ msgid "Financial Project Management"
-#~ msgstr "Gestión de proyectos financieros"
-
-#~ msgid "Pending Analytic Accounts"
-#~ msgstr "Cuentas analíticas pendientes"
-
-#~ msgid ""
-#~ "Modify account analytic view to show\n"
-#~ "important data for project manager of services companies.\n"
-#~ "Add menu to show relevant information for each manager."
-#~ msgstr ""
-#~ "Modifica la vista de cuenta analítica para mostrar\n"
-#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
-#~ "Añade menú para mostrar información relevante para cada director."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+#: view:account.analytic.account:0
+msgid "Total"
+msgstr "Total"
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index 2de02ed6c80..b49ba52c5ec 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -1,38 +1,21 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_default
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-26 08:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:44+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:29+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_analytic_default
-#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
-msgid "Account Analytic Default"
-msgstr "Cuenta analítica por defecto"
-
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"select a partner which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytical account)"
-msgstr ""
-"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta empresa, automáticamente se "
-"utilizará esta cuenta analítica)."
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -41,16 +24,6 @@ msgstr ""
 msgid "Analytic Rules"
 msgstr "Reglas analíticas"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,analytic_id:0
-msgid "Analytical Account"
-msgstr "Cuenta analítica"
-
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Current"
-msgstr "Actual"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
@@ -58,13 +31,13 @@ msgstr "Agrupar por..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
-msgid "Default end date for this Analytical Account"
-msgstr "Fecha final por defecto para esta cuenta analítica."
+msgid "Default end date for this Analytic Account."
+msgstr "Fecha final default para esta Cuenta Analítica."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr "Lista de Movimientos."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -72,21 +45,15 @@ msgid "Conditions"
 msgstr "Condiciones"
 
 #. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
+#: help:account.analytic.default,partner_id:0
 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)"
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
-"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta compañía, automáticamente se "
-"utilizará esta cuenta analítica)."
-
-#. module: account_analytic_default
-#: help:account.analytic.default,date_start:0
-msgid "Default start date for this Analytical Account"
-msgstr "Fecha inicial por defecto para esta cuenta analítica."
+"Seleccione la empresa que utilizara la cuenta analítica especificada por "
+"defecto.(ej. crea una nueva factura de cliente u Orden de venta si "
+"seleccionamos esta empresa, este automáticamente toma esta cuenta analítica)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -116,65 +83,57 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione el producto que utilizara la cuenta espeficifcada por defecto "
+"(ej. crea una nueva factura de cliente u orden de venta si seleccionamos "
+"este producto, este, automáticamente tomara esto como una cuenta analítica)"
+
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,user_id:0
-msgid ""
-"select a user which will use analytical account specified in analytic default"
-msgstr ""
-"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto."
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr "Análisis: Valores por defecto"
+msgstr "Valores analíticos por defecto"
 
 #. 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 ""
-"\n"
-"Permite seleccionar automáticamente cuentas analíticas según estos "
-"criterios:\n"
-"* Producto\n"
-"* Empresa\n"
-"* Usuario\n"
-"* Compañía\n"
-"* Fecha\n"
-"    "
-
-#. 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)"
-msgstr ""
-"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona este producto, automáticamente se "
-"utilizará esta cuenta analítica)."
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referencia debe ser única por compañía!"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione una compañía que utilizara la cuenta analítica espeficificada por "
+"defecto (ej. crea una nueva factura de cliente u orden de venta si "
+"selecciona esta compañía, este, automáticamente la toma como una cuenta "
+"analítica)"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"Select a user which will use analytic account specified in analytic default."
+msgstr "Seleccione un usuario que utilizara la cuenta analítica por defecto."
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -184,7 +143,12 @@ msgstr "Línea de factura"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytic Account."
+msgstr "Fecha inicial por defecto para esta Cuenta Analítica."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -213,22 +177,4 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Seq"
-#~ msgstr "Secuencia"
-
-#~ msgid "Analytic Distributions"
-#~ msgstr "Distribuciones analíticas"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Línea de Orden de venta"
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 0c9fa6be3e2..6dab7d0e1ed 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 12:58+0000\n"
+"PO-Revision-Date: 2012-11-27 13:19+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "Groeperen op..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Standaard einddatum voor deze analytische rekening"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +50,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een relatie voor wie de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies deze relatie; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -86,6 +89,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een product waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit product; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -116,12 +122,16 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een bedrijf waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit bedrijf; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Kies een gebruiker die de analytische standaardrekening zal gebruiken."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -137,7 +147,7 @@ msgstr "Analytische rekening"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standaard begindatum voor deze analytische rekening."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 9113d020291..185508ddcab 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:53+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:42+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "分组..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认结束日期"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -137,7 +137,7 @@ msgstr "辅助核算项"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认开始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index 2838f67fb03..e2f05df843c 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -1,32 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-12 18:12+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:35+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. 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 ""
-"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
+"Este modelo de distribución ha sido guardado. Podrá utilizarlo después."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr "Id plan"
+msgstr "Id del plan"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -51,11 +52,6 @@ msgstr "Analítica cruzada"
 msgid "Analytic Plan"
 msgstr "Plan analítico"
 
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Gestión de múltiples planes en contabilidad analítica"
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
@@ -69,12 +65,6 @@ msgstr "Diario analítico"
 msgid "Analytic Plan Line"
 msgstr "Línea de plan analítico"
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
-#, python-format
-msgid "User Error"
-msgstr "Error de usuario"
-
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
@@ -85,11 +75,6 @@ msgstr "Instancia de plan analítico"
 msgid "Ok"
 msgstr "Aceptar"
 
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
@@ -98,17 +83,26 @@ msgstr "Plan del modelo"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "Id cuenta2"
+msgstr "Id de cuenta2"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "Id cuenta"
+msgstr "Id de cuenta"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr "Importe"
+msgstr "Monto"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -123,7 +117,7 @@ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr "Id cuenta6"
+msgstr "Id de cuenta6"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@@ -136,9 +130,24 @@ msgid "Bank Statement Line"
 msgstr "Línea extracto bancario"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "There is no analytic plan defined."
+msgstr "No hay plan analítico definido."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
@@ -148,20 +157,12 @@ msgstr "¡El código del diario debe ser único por compañía!"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr "Referencia cuenta analítica"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
-"una empresa."
+msgstr "Referencia de cuenta analítica"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
+msgstr "Línea de Orden de venta"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@@ -182,20 +183,20 @@ msgstr "Imprimir"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
-msgid "A model having this name and code already exists !"
-msgstr "¡Ya existe un modelo con este nombre y código!"
+msgid "There are no analytic lines related to account %s."
+msgstr "No hay lineas analíticas relacionadas a la cuenta %s"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "No analytic plan defined !"
-msgstr "¡No se ha definido un plan analítico!"
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -230,18 +231,31 @@ msgid "Analytic Plan Lines"
 msgstr "Líneas de plan analítico"
 
 #. module: account_analytic_plans
-#: constraint:account.bank.statement.line:0
-msgid ""
-"The amount of the voucher must be the same amount as the one on the "
-"statement line"
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
-"El importe del recibo debe ser el mismo importe que el de la línea del "
-"extracto"
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Línea factura"
+msgstr "Línea de factura"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -249,9 +263,9 @@ msgid "Currency"
 msgstr "Moneda"
 
 #. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
-msgstr "Fecha inicial"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "No puede crear una linea analitica a una cuenta de vista."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -261,7 +275,12 @@ msgstr "Compañía"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "Id cuenta5"
+msgstr "Id de cuenta5"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -276,14 +295,14 @@ msgstr "Cuenta principal"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr "Hasta fecha"
+msgstr "Hasta la Fecha"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+msgid "You have to define an analytic journal on the '%s' journal."
+msgstr "Tiene que definir un diario analitico en el diario '%s'"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -295,82 +314,16 @@ msgstr "No mostrar líneas vacías"
 msgid "analytic.plan.create.model.action"
 msgstr "analitica.plan.crear.modelo.accion"
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
 msgstr "Cuenta analítica:"
 
-#. module: account_analytic_plans
-#: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid ""
-"This module allows to use several analytic plans, according to the general "
-"journal,\n"
-"so that multiple analytic lines are created when the invoice or the entries\n"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-"  Projects\n"
-"      Project 1\n"
-"          SubProj 1.1\n"
-"          SubProj 1.2\n"
-"      Project 2\n"
-"  Salesman\n"
-"      Eric\n"
-"      Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-"    SubProject 1.1 : 50%\n"
-"    SubProject 1.2 : 50%\n"
-"Plan2:\n"
-"    Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic "
-"lines,\n"
-"for one account entry.\n"
-"The analytic plan validates the minimum and maximum percentage at the time "
-"of creation\n"
-"of distribution models.\n"
-"        "
-msgstr ""
-"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-"diario general,\n"
-"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
-"sean confirmados.\n"
-"\n"
-"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-"  Proyectos\n"
-"      Proyecto 1\n"
-"          Subproyecto 1,1\n"
-"          Subproyecto 1,2\n"
-"      Proyecto 2\n"
-"  Comerciales\n"
-"      Eduardo\n"
-"      Marta\n"
-"\n"
-"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-"debe\n"
-"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-"1.1 y\n"
-"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-"\n"
-"Plan1:\n"
-"    Subproyecto 1.1: 50%\n"
-"    Subproyecto 1.2: 50%\n"
-"Plan2:\n"
-"    Eduardo: 100%\n"
-"\n"
-"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-"analíticas para un asiento contable.\n"
-"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
-"creación de los modelos de distribución.\n"
-"        "
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
@@ -379,7 +332,7 @@ msgstr "Referencia cuenta analítica:"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr "Nombre de plan"
+msgstr "Nombre del plan"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
@@ -394,12 +347,7 @@ msgstr "Elementos diario"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr "Id cuenta1"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+msgstr "Id de cuenta1"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -411,14 +359,6 @@ msgstr "Mínimo permitido (%)"
 msgid "Root account of this plan."
 msgstr "Cuenta principal de este plan."
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "Error"
-msgstr "Error"
-
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
@@ -430,10 +370,9 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr "¡Introduzca un nombre y un código antes de guardar el modelo!"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
@@ -441,11 +380,11 @@ msgid "Print Crossovered Analytic"
 msgstr "Imprimir analítica cruzada"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
+msgstr "¡No hay diario analítico!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -455,7 +394,7 @@ msgstr "Extracto bancario"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr "Id cuenta3"
+msgstr "Id de cuenta3"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -471,28 +410,28 @@ msgstr "Cancelar"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "Id cuenta4"
+msgstr "Id de cuenta4"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The total should be between %s and %s."
+msgstr "El total debe estar entre %s y %s"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
 msgstr "Líneas de distribución analítica"
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "The Total Should be Between %s and %s"
-msgstr "El total debería estar entre %s y %s"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr "a las"
+msgstr "en"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Nombre de cuenta"
+msgstr "Nombre de la cuenta"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -504,11 +443,6 @@ msgstr "Línea de distribución analítica"
 msgid "Distribution Code"
 msgstr "Código de distribución"
 
-#. 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%"
@@ -530,6 +464,16 @@ msgstr "Distribución analítica"
 msgid "Journal"
 msgstr "Diario"
 
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+"¡Error de confuguración!\n"
+"La moneda seleccionada también tiene que ser la que está en las cuentas por "
+"defecto."
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
@@ -543,7 +487,37 @@ msgstr "Fecha final"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr "Modelos distribución"
+msgstr "Modelos de distribución"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model."
+msgstr "Por favor ponga un nombre y código antes de guardar el modelo."
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_plans
+#: 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 ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -556,120 +530,13 @@ msgid "The name of the journal must be unique per company !"
 msgstr "¡El nombre del diaro debe ser único por compañía!"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "Value Error"
-msgstr "Valor erróneo"
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "or"
+msgstr "ó"
 
 #. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Currency:"
-#~ msgstr "Moneda:"
-
-#~ msgid "Select Information"
-#~ msgstr "Seleccionar información"
-
-#~ msgid "Analytic Account Ref."
-#~ msgstr "Ref. cuenta analítica"
-
-#~ msgid "Create Model"
-#~ msgstr "Crear modelo"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Period from"
-#~ msgstr "Período desde"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Analytic Distribution's models"
-#~ msgstr "Modelos de distribución analítica"
-
-#~ msgid ""
-#~ "This distribution model has been saved. You will be able to reuse it later."
-#~ msgstr ""
-#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "This module allows to use several analytic plans, according to the general "
-#~ "journal,\n"
-#~ "so that multiple analytic lines are created when the invoice or the entries\n"
-#~ "are confirmed.\n"
-#~ "\n"
-#~ "For example, you can define the following analytic structure:\n"
-#~ "  Projects\n"
-#~ "      Project 1\n"
-#~ "          SubProj 1.1\n"
-#~ "          SubProj 1.2\n"
-#~ "      Project 2\n"
-#~ "  Salesman\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
-#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-#~ "Fabien. The amount can also be split. The following example is for\n"
-#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    SubProject 1.1 : 50%\n"
-#~ "    SubProject 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
-#~ "lines,\n"
-#~ "for one account entry.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-#~ "diario general,\n"
-#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
-#~ "sean confirmados.\n"
-#~ "\n"
-#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-#~ "  Proyectos\n"
-#~ "      Proyecto 1\n"
-#~ "          Subproyecto 1,1\n"
-#~ "          Subproyecto 1,2\n"
-#~ "      Proyecto 2\n"
-#~ "  Comerciales\n"
-#~ "      Eduardo\n"
-#~ "      Marta\n"
-#~ "\n"
-#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-#~ "debe\n"
-#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-#~ "1.1 y\n"
-#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    Subproyecto 1.1: 50%\n"
-#~ "    Subproyecto 1.2: 50%\n"
-#~ "Plan2:\n"
-#~ "    Eduardo: 100%\n"
-#~ "\n"
-#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-#~ "analíticas para un asiento contable.\n"
-#~ "        "
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model with this name and code already exists."
+msgstr "Un modelo con este código y nombre ya existe."
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index def75b4c77c..ae8e2eb2dee 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -1,44 +1,60 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-12 11:29+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:37+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:45+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr " Propiedades de contabilidad"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgid "Error ! You cannot create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas"
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
+"Error: The default Unit of Measure and the purchase Unit of Measure must be "
+"in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
+"Error:  La unidad de medida por defecto y la unidad de medida de compra "
+"deben ser de la misma categoría."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -48,23 +64,13 @@ msgstr "Línea de factura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "Pedido de compra"
+msgstr "Orden de Compra"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
-#. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Accounting for Anglo Saxon countries"
-msgstr "Contabilidad de stocks para países anglo-sajones"
-
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
@@ -79,43 +85,7 @@ msgstr "Factura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by\n"
-"    changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries\n"
-"    and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at the moment the goods "
-"are shipped.\n"
-"    This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account\n"
-"    when the invoice is created to transfer this amount to the debtor or "
-"creditor account.\n"
-"    Secondly, price differences between actual purchase price and fixed "
-"product standard price are booked on a separate account"
-msgstr ""
-"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
-"    el cambio de la lógica contable con las transacciones de inventario. La "
-"diferencia entre contabilidad de países anglo-sajones\n"
-"    y el RHINE o también llamada contabilidad de países continentales es el "
-"momento de considerar los costes de las mercancías vendidas respecto al "
-"coste de las ventas.\n"
-"    La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
-"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
-"el momento de que las mercancías son enviadas.\n"
-"    Este modulo añade esta funcionalidad usando una cuenta provisional, para "
-"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
-"cuenta provisional\n"
-"    cuando se crea la factura para transferir este importe a la cuenta "
-"deudora o acreedora.\n"
-"    Secundariamente, las diferencias de precios entre el actual precio de "
-"compra y el precio estándar fijo del producto son registrados en cuentas "
-"separadas."
+msgstr "Lista de Movimientos."
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -125,38 +95,4 @@ msgid ""
 "and cost price."
 msgstr ""
 "Esta cuenta se utilizará para valorar la diferencia de precios entre el "
-"precio de compra y precio de coste."
-
-#~ msgid "Stock Account"
-#~ msgstr "Cuenta de Valores"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
-
-#~ msgid ""
-#~ "This module will support the Anglo-Saxons accounting methodology by \n"
-#~ "    changing the accounting logic with stock transactions. The difference "
-#~ "between the Anglo-Saxon accounting countries \n"
-#~ "    and the Rhine or also called Continental accounting countries is the "
-#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
-#~ "created, Continental accounting will take the cost at he moment the goods "
-#~ "are shipped.\n"
-#~ "    This module will add this functionality by using a interim account, to "
-#~ "store the value of shipped goods and will contra book this interim account \n"
-#~ "    when the invoice is created to transfer this amount to the debtor or "
-#~ "creditor account."
-#~ msgstr ""
-#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
-#~ "    cambiando la lógica de contabilización con transacciones de acciones. La "
-#~ "diferencia entre los países de contabilización Anglosajona \n"
-#~ "    y el Rin o también llamados países de contabilización Continental es el "
-#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
-#~ "    La contabilización Anglosajona toma el costo cuando la factura de ventas "
-#~ "es creada, la contabilización Continental tomará el costo en el momento en "
-#~ "que los bienes son enviados.\n"
-#~ "    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
-#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
-#~ "provisional \n"
-#~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
-#~ "acreedor de la cuenta."
+"precio de compra y precio de costo."
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index dfb2e1cd7b0..99f28458554 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-03-01 17:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:28+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -53,6 +53,8 @@ msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
 msgstr ""
+"Fout: de standaardmaateenheid moet tot dezelfde categorie behoren als de "
+"aankoopmaateenheid."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 101c89f7956..155f6e9099e 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 14:34+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:41+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -52,7 +52,7 @@ msgstr "BBA传输结构有误！"
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 66cedb8b82c..7684caf86dc 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -1,332 +1,274 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:58+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
-msgid "Open Assets"
-msgstr "Activos abiertos"
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Activos en estado borrador y abierto"
 
 #. module: account_asset
-#: field:account.asset.property,method_end:0
-#: field:account.asset.property.history,method_end:0
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
 msgid "Ending date"
 msgstr "Fecha final"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation board"
-msgstr "cuadro de drepeciación"
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Cuenta gastos amortización"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcular activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Importe bruto"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-#: field:account.asset.asset,name:0
-#: field:account.asset.board,asset_id:0
-#: field:account.asset.property,asset_id:0
-#: field:account.invoice.line,asset_id:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
 #: field:account.move.line,asset_id:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
 msgid "Asset"
 msgstr "Activo"
 
 #. module: account_asset
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica que el primer asiento de depreciación para este activo tiene que ser "
+"hecho desde la fecha de compra en vez de desde el 1 de enero"
 
 #. module: account_asset
-#: selection:account.asset.property,method:0
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change duration"
-msgstr "Cambiar duración"
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
 
 #. module: account_asset
-#: field:account.asset.asset,child_ids:0
-msgid "Child assets"
-msgstr "Activos hijos"
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modificar"
 
 #. module: account_asset
-#: field:account.asset.board,value_asset:0
-msgid "Asset Value"
-msgstr "valor de activos"
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "En ejecución"
 
 #. module: account_asset
-#: wizard_field:account.asset.modify,init,name:0
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importe de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Análisis activos"
+
+#. module: account_asset
+#: field:asset.modify,name:0
 msgid "Reason"
 msgstr "Razón"
 
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Factor degresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorías de activo"
+
 #. module: account_asset
 #: view:account.asset.asset:0
-#: field:account.asset.asset,entry_ids:0
-#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
 msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-msgid "Generated entries"
-msgstr "Asientos generados"
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Líneas de depreciación"
 
 #. module: account_asset
-#: wizard_field:account.asset.modify,init,method_delay:0
-#: field:account.asset.property,method_delay:0
-#: field:account.asset.property.history,method_delay:0
-msgid "Number of interval"
-msgstr "Numero de intervalo"
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "Es el importe que prevee tener que no puede depreciar"
 
 #. module: account_asset
-#: wizard_button:account.asset.compute,asset_compute,asset_open:0
-msgid "Open entries"
-msgstr "Abrir asientos"
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr "¡Error! No puede crear activos recursivos."
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Importe asentado"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
-#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
 msgstr "Activos"
 
 #. module: account_asset
-#: selection:account.asset.property,method:0
-msgid "Progressive"
-msgstr "Progresivo"
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "Cuenta de amortización"
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
-msgid "Draft Assets"
-msgstr "Activos en estado borrador"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_field:account.asset.modify,init,note:0
-#: view:account.asset.property.history:0
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change history"
-msgstr "Cambio histórico"
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Asiento de amortización"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# de líneas de amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Numero de meses en un periodo."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Activos en estado borrador"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-msgid "Depreciation entries"
-msgstr "Asiento de dotación a la amortización"
+msgid "Account Asset"
+msgstr "Cuenta de activo"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Methods"
-msgstr "Métodos"
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcular amortizaciones"
 
 #. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-msgid "Asset properties to modify"
-msgstr "Propiedades de activos para modificar"
-
-#. module: account_asset
-#: field:account.asset.asset,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: account_asset
-#: wizard_field:account.asset.modify,init,method_period:0
-#: field:account.asset.property,method_period:0
-#: field:account.asset.property.history,method_period:0
-msgid "Period per interval"
-msgstr "Período por intervalo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation duration"
-msgstr "Plazo de amortización"
-
-#. module: account_asset
-#: field:account.asset.property,account_analytic_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: account_asset
-#: field:account.asset.property,state:0
-msgid "State"
-msgstr "Provincia"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation methods"
-msgstr "Metodos de drepreciación"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Other information"
-msgstr "Otra información"
-
-#. module: account_asset
-#: field:account.asset.board,value_asset_cumul:0
-msgid "Cumul. value"
-msgstr "Valor acumulado"
-
-#. module: account_asset
-#: view:account.asset.property:0
-msgid "Assets methods"
-msgstr "metodos activos"
-
-#. module: account_asset
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_asset_property
-msgid "Asset property"
-msgstr "Propiedad del activo"
-
-#. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-#: wizard_view:account.asset.compute,init:0
-#: wizard_button:account.asset.compute,init,asset_compute:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
-#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
-msgid "Compute assets"
-msgstr "Calcular activos"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_button:account.asset.modify,init,asset_modify:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
-msgid "Modify asset"
-msgstr "Modificar activo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Confirm asset"
-msgstr "Confirmar activo"
-
-#. module: account_asset
-#: view:account.asset.property.history:0
-#: model:ir.model,name:account_asset.model_account_asset_property_history
-msgid "Asset history"
-msgstr "Histórico del activo"
-
-#. module: account_asset
-#: field:account.asset.property,date:0
-msgid "Date created"
-msgstr "Fecha de creación"
-
-#. module: account_asset
-#: model:ir.module.module,description:account_asset.module_meta_information
-msgid ""
-"Financial and accounting asset management.\n"
-"    Allows to define\n"
-"    * Asset category. \n"
-"    * Assets.\n"
-"    *Asset usage period and property.\n"
-"    "
-msgstr ""
-"Gestión financiera y contable de activos.\n"
-"  Permite definir\n"
-"  * Categorías de activo. \n"
-"  * Activos.\n"
-"  * Período y propiedades del activo usado.\n"
-"    "
-
-#. module: account_asset
-#: field:account.asset.board,value_gross:0
-#: field:account.asset.property,value_total:0
-msgid "Gross value"
-msgstr "Valor bruto"
-
-#. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Ending period"
-msgstr "Período final"
-
-#. module: account_asset
-#: field:account.asset.board,name:0
-msgid "Asset name"
-msgstr "nombre de activos"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Accounts information"
-msgstr "información de cuentas"
-
-#. module: account_asset
-#: field:account.asset.asset,note:0
-#: field:account.asset.category,note:0
-#: field:account.asset.property.history,note:0
-msgid "Note"
-msgstr "Nota"
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Longitud de periodo"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
-#: selection:account.asset.property,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: account_asset
-#: field:account.asset.property,type:0
-msgid "Depr. method type"
-msgstr "Tipo de método de amortización"
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Fecha de compra del activo"
 
 #. module: account_asset
-#: field:account.asset.property,account_asset_id:0
-msgid "Asset account"
-msgstr "cuenta de activos"
-
-#. module: account_asset
-#: field:account.asset.property.history,asset_property_id:0
-msgid "Method"
-msgstr "Método"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "Normal"
-msgstr "Normal"
-
-#. module: account_asset
-#: field:account.asset.property,method_progress_factor:0
-msgid "Progressif factor"
-msgstr "Factor de progresión"
-
-#. module: account_asset
-#: field:account.asset.asset,localisation:0
-msgid "Localisation"
-msgstr "Localización"
-
-#. module: account_asset
-#: field:account.asset.property,method:0
-msgid "Computation method"
-msgstr "metodo de computación"
-
-#. module: account_asset
-#: field:account.asset.property,method_time:0
-msgid "Time method"
-msgstr "Método temporal"
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcula la amortización en el periodo especificado"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -334,201 +276,543 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: account_asset
-#: field:account.asset.property.history,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Cambiar duración"
 
 #. module: account_asset
-#: field:account.asset.asset,property_ids:0
-msgid "Asset method name"
-msgstr "Nombre de método de asiento"
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "Información analítica"
 
 #. module: account_asset
-#: field:account.asset.asset,date:0
-#: field:account.asset.property.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
 
 #. module: account_asset
-#: field:account.asset.board,value_net:0
-msgid "Net value"
-msgstr "Valor neto"
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Método de cálculo"
 
 #. module: account_asset
-#: wizard_view:account.asset.close,init:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
-msgid "Close asset"
-msgstr "Activo cerrado"
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
 
 #. module: account_asset
-#: field:account.asset.property,history_ids:0
-msgid "History"
-msgstr "Historia"
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de "
+"amortizaciones\""
 
 #. module: account_asset
-#: field:account.asset.property,account_actif_id:0
-msgid "Depreciation account"
-msgstr "Cuenta de amortización"
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
-#: field:account.asset.asset,period_id:0
-#: wizard_field:account.asset.compute,init,period_id:0
-msgid "Period"
-msgstr "Período"
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiempo en meses entre 2 depreciaciones"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valor de salvaguarda"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
 msgid "Asset Category"
 msgstr "Categoría de activo"
 
 #. module: account_asset
-#: wizard_button:account.asset.close,init,end:0
-#: wizard_button:account.asset.compute,init,end:0
-#: wizard_button:account.asset.modify,init,end:0
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Activos en estado cerrado"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "Activo padre"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Buscar categoría de activo"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Tabla de amortización"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Importe no asentado"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "Método de tiempo"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Escoja el método a usar en el cálculo del importe de las líneas de "
+"amortización\n"
+"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Escoja el método a utilizar para calcular las fechas y número de las líneas "
+"de depreciación\n"
+"  * Número de depreciaciones: Establece el número de líneas de depreciación "
+"y el tiempo entre dos depreciaciones.\n"
+"  * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la "
+"depreciación no irá más allá."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Activos en ejecución"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+"Cuando un activo es creado, el estado es 'Borrador'\n"
+"Si el activo es confirmado, el estado cambia a 'En ejecucion' y las lineas "
+"de depreciacion pueden ser asentadas en la contabilidad.\n"
+"Puede cerrar manualmente un activo cuando la depreciacion ha terminado.  Si "
+"la ultima linea de depreciacion es asentade, el activo automaticamente "
+"cambia de estado."
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Líneas de amortización asentadas"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "Asistente de confirmación de depreciación de activo"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Estado del activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Nombre depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "General"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "Tiempo prorateado"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Marcar como cerrado"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
-#: wizard_button:account.asset.compute,asset_compute,end:0
-#: selection:account.asset.property,state:0
+#: selection:asset.asset.report,state:0
 msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: selection:account.asset.property,state:0
-msgid "Open"
-msgstr "Abrir"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
 
 #. module: account_asset
-#: constraint:ir.model:0
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr "Duraciones de activo para modificar"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Regresivo"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+"Escoja el periodo para el que desea asentar automáticamente las líneas de "
+"depreciación para los activos en ejecución"
 
 #. module: account_asset
-#: model:ir.module.module,shortdesc:account_asset.module_meta_information
-msgid "Asset management"
-msgstr "Gestión del activo"
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Actual"
 
 #. module: account_asset
-#: view:account.asset.board:0
-#: field:account.asset.property,board_ids:0
-#: model:ir.model,name:account_asset.model_account_asset_board
-msgid "Asset board"
-msgstr "Tablero de activos"
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Importe a depreciar"
 
 #. module: account_asset
-#: field:account.asset.asset,state:0
-msgid "Global state"
-msgstr "Estado global"
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr "Nombre del activo."
 
 #. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Delay"
-msgstr "Retrasar"
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Omitir estado borrador"
 
 #. module: account_asset
-#: wizard_view:account.asset.close,init:0
-msgid "General information"
-msgstr "Información general"
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr "Fechas de depreciación"
 
 #. module: account_asset
-#: field:account.asset.property,journal_analytic_id:0
-msgid "Analytic journal"
-msgstr "Diario analítico"
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: account_asset
-#: field:account.asset.property,name:0
-msgid "Method name"
-msgstr "Nombre del método"
-
-#. module: account_asset
-#: field:account.asset.property,journal_id:0
+#: field:account.asset.category,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset
-#: field:account.asset.property.history,name:0
+#: field:account.asset.history,name:0
 msgid "History name"
-msgstr "Nombre histórico"
+msgstr "Nombre del histórico"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "el importe ya ha sido depreciado"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p>\n"
+"            Desde este reporte, puede tener un panorama de toda la "
+"depreciación, la \n"
+"            herramienta búsqueda puede ser utilizada para personalizar sus "
+"reportes de activos, asi\n"
+"            que utilice esta herramienta de acuerdo a sus necesidades.\n"
+"          </p>\n"
+"        "
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr "Valor bruto"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Valide si desea confirmar automáticamente el activo de esta categoría cuando "
+"es creado desde una factura."
 
 #. module: account_asset
 #: view:account.asset.asset:0
-msgid "Close method"
-msgstr "Método cerrado"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
-#: field:account.asset.property,entry_asset_ids:0
-msgid "Asset Entries"
-msgstr "Asientos de activo"
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Línea de depreciación del activo"
 
 #. module: account_asset
-#: field:account.asset.asset,category_id:0
 #: view:account.asset.category:0
-#: field:account.asset.category,name:0
+#: field:asset.asset.report,asset_category_id:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
 msgstr "Categoría de activo"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation"
-msgstr "Amortización"
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Importe de las líneas de amortización"
 
 #. module: account_asset
-#: field:account.asset.asset,code:0
-#: field:account.asset.category,code:0
-msgid "Asset code"
-msgstr "Código de activo"
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Movimientos de activos creados"
 
 #. module: account_asset
-#: field:account.asset.asset,value_total:0
-msgid "Total value"
-msgstr "Valor total"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "View"
-msgstr "Vista"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "General info"
-msgstr "Información general"
-
-#. module: account_asset
-#: field:account.asset.asset,sequence:0
+#: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: account_asset
-#: field:account.asset.property,value_residual:0
-msgid "Residual value"
-msgstr "Valor residual"
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
 #. module: account_asset
-#: wizard_button:account.asset.close,init,asset_close:0
-msgid "End of asset"
-msgstr "Final de activo"
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Número de depreciaciones"
 
 #. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Direct"
-msgstr "Directo"
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr "Crear asiento"
 
 #. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Indirect"
-msgstr "Indirecto"
-
-#. module: account_asset
-#: field:account.asset.asset,parent_id:0
-msgid "Parent asset"
-msgstr "Activo padre"
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Confirmar activo"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index ca2ee6748ae..7736ca427f0 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 13:02+0000\n"
+"PO-Revision-Date: 2012-11-27 13:35+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -160,7 +160,7 @@ msgstr "Afschrijvingsdatum"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "U kunt niet dezelfde investeringen maken."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -210,7 +210,7 @@ msgstr "# afschrijvingslijnen"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Aantal maanden in een periode"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -367,7 +367,7 @@ msgstr "Afschrijvingen in status gesloten"
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -427,12 +427,12 @@ msgstr "Tijdmethode"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een afgesloten rekening."
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -489,12 +489,18 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"Als een investering wordt gemaakt, is de status 'Concept'.\n"
+"Als de investering wordt bevestigd, verandert de status in 'Lopend'; de "
+"afschrijvingslijnen kunnen worden geboekt.\n"
+"U kunt een investering manueel afsluiten als deze volledig is afgeschreven. "
+"Als de laatste lijn van de afschrijving is geboekt, gaat een investering "
+"automatisch in deze status."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -541,7 +547,7 @@ msgstr "Berekenen"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Activahistoriek"
 
 #. module: account_asset
 #: field:asset.asset.report,name:0
@@ -662,7 +668,7 @@ msgstr "Af te schrijven bedrag"
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Activanaam"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -713,11 +719,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"Dit rapport biedt een overzicht van alle afschrijvingen. De zoekfunctie kan "
+"worden aangepast om het overzicht van uw investeringen te personaliseren, "
+"zodat u de gewenste analyse krijgt.\n"
+"        "
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Brutowaarde"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -727,7 +737,7 @@ msgstr "Naam"
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -770,7 +780,7 @@ msgstr "Gemaakte investeringsboekingen"
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgnummer"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
new file mode 100644
index 00000000000..2abefb1cd5d
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -0,0 +1,390 @@
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 01:06+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar transacciones bancarias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Id global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código padre"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar las líneas seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Fecha valor"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "La CC y/o IBAN no es válido"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirma las lineas seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Informe de balances de extractos bancarios"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelación de las líneas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Información del pago por lote"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed.             Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"Operacion de borrado no permitida. Por favor vaya a el asiento bancario "
+"asociado para poder eliminar y/o modificar lineas de asientos bancarios."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar líneas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transacciones"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo:"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Lineas de extracto confirmadas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transacciones de crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Eliminar las lineas de extracto seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Numero de contrapartida"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Importe global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transacciones de débito"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Las líneas confirmadas no pueden ser modificadas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
+"para realizar pagos válidos"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"¿Estás seguro que quiere cancelar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Transacción bancaria"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Monto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moneda de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"¿Está seguro que desea confirmar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar las transacciones pertenecientes al mismo nivel "
+"global en un pago por lotes"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Líneas de extracto en borrador."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Imp. global"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: 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 ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nombre de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Línea de extracto"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "¡El código debe ser único!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Pagos por lote hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Líneas de extracto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID global"
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index 46c361de1ea..556834afe50 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -1,20 +1,29 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_budget
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 20:28+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 01:18+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:40+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -32,12 +41,6 @@ msgstr "Confirmado"
 msgid "Budgetary Positions"
 msgstr "Posiciones presupuestarias"
 
-#. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "The General Budget '%s' has no Accounts!"
-msgstr "¡El presupuesto general '%s' no tiene cuentas!"
-
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
@@ -80,7 +83,7 @@ msgstr "Borrador"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr "a las"
+msgstr "en"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -109,55 +112,22 @@ msgstr "Validado"
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#. module: account_budget
-#: report:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Estado"
 
 #. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid ""
-"A budget is a forecast of your company's income and expenses expected for a "
-"period in the future. With a budget, a company is able to carefully look at "
-"how much money they are taking in during a given period, and figure out the "
-"best way to divide it among various categories. By keeping track of where "
-"your money goes, you may be less likely to overspend, and more likely to "
-"meet your financial goals. Forecast a budget by detailing the expected "
-"revenue per analytic account and monitor its evolution based on the actuals "
-"realised during that period."
-msgstr ""
-"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
-"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
-"observar minuciosamente cuánto dinero están ingresando en un período "
-"determinado, y pensar en la mejor manera de dividirlo entre varias "
-"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
-"menos tendencia a un sobregasto, y se aproximará más a sus metas "
-"financieras. Haga una previsión de un presupuesto detallando el ingreso "
-"esperado por cuenta analítica y monitorice su evaluación basándose en los "
-"valores actuales durante ese período."
-
-#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
-
-#. module: account_budget
-#: report:account.budget:0
-#: report:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The Budget '%s' has no accounts!"
+msgstr "¡El presupuesto '%s' no tiene cuentas!"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descripción"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -169,6 +139,11 @@ msgstr "Moneda"
 msgid "Total :"
 msgstr "Total :"
 
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
@@ -177,9 +152,9 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: account_budget
-#: view:crossovered.budget:0
-msgid "To Approve"
-msgstr "Para aprobar"
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -229,7 +204,7 @@ msgstr "Fecha final"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr "Informe presupuesto contable para contabilidad analítica"
+msgstr "Informe de presupuesto contable para contabilidad analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -247,12 +222,6 @@ msgstr "Nombre"
 msgid "Budget Line"
 msgstr "Línea de presupuesto"
 
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Líneas"
-
 #. module: account_budget
 #: report:account.budget:0
 #: view:crossovered.budget:0
@@ -264,10 +233,14 @@ msgid "Budget"
 msgstr "Presupuesto"
 
 #. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
+#: view:crossovered.budget:0
+msgid "To Approve Budgets"
+msgstr "Presupuestos por aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Duration"
+msgstr "Duración"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -283,7 +256,6 @@ msgstr "Este asistente es utilizado para imprimir el presupuesto"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_report
 #: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
@@ -294,18 +266,15 @@ msgid "Budgets"
 msgstr "Presupuestos"
 
 #. module: account_budget
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
 msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelado/a"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -313,10 +282,9 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: account_budget
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -345,12 +313,10 @@ msgid "Theoretical Amt"
 msgstr "Importe teórico"
 
 #. module: account_budget
-#: view:account.budget.analytic:0
-#: view:account.budget.crossvered.report:0
-#: view:account.budget.crossvered.summary.report:0
-#: view:account.budget.report:0
-msgid "Select Dates Period"
-msgstr "Seleccione fechas del período"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -361,74 +327,54 @@ msgid "Print"
 msgstr "Imprimir"
 
 #. module: account_budget
-#: model:ir.module.module,description:account_budget.module_meta_information
-msgid ""
-"This module allows accountants to manage analytic and crossovered budgets.\n"
-"\n"
-"Once the Master Budgets and the Budgets are defined (in "
-"Accounting/Budgets/),\n"
-"the Project Managers can set the planned amount on each Analytic Account.\n"
-"\n"
-"The accountant has the possibility to see the total of amount planned for "
-"each\n"
-"Budget and Master Budget in order to ensure the total planned is not\n"
-"greater/lower than what he planned for this Budget/Master Budget. Each list "
-"of\n"
-"record can also be switched to a graphical view of it.\n"
-"\n"
-"Three reports are available:\n"
-"    1. The first is available from a list of Budgets. It gives the "
-"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-"\n"
-"    2. The second is a summary of the previous one, it only gives the "
-"spreading, for the selected Budgets, of the Analytic Accounts.\n"
-"\n"
-"    3. The last one is available from the Analytic Chart of Accounts. It "
-"gives the spreading, for the selected Analytic Accounts, of the Master "
-"Budgets per Budgets.\n"
-"\n"
-msgstr ""
-"Este módulo permite a los contables gestionar presupuestos analíticos "
-"(costes) y cruzados.\n"
-"\n"
-"Una vez que se han definido los presupuestos principales y los presupuestos "
-"(en Contabilidad/Presupuestos/),\n"
-"los gestores de proyectos pueden establecer el importe previsto en cada "
-"cuenta analítica.\n"
-"\n"
-"El contable tiene la posibilidad de ver el total del importe previsto para "
-"cada\n"
-"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-"es\n"
-"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-"principal.\n"
-"Cada lista de datos también puede cambiarse a una vista gráfica de la "
-"misma.\n"
-"\n"
-"Están disponibles tres informes:\n"
-"    1. El primero está disponible desde una lista de presupuestos. "
-"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-"por presupuestos principales.\n"
-"\n"
-"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-"los presupuestos seleccionados, de las cuentas analíticas.\n"
-"\n"
-"    3. El último está disponible desde el plan de cuentas analítico. Indica "
-"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-"principales por presupuestos.\n"
-"\n"
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoretical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "or"
+msgstr "ó"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
 msgstr "Presupuesto :"
 
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"<p>\n"
+"                A budget is a forecast of your company's income and/or "
+"expenses\n"
+"                expected for a period in the future. A budget is defined on "
+"some\n"
+"                financial accounts and/or analytic accounts (that may "
+"represent\n"
+"                projects, departments, categories of products, etc.)\n"
+"              </p><p>\n"
+"                By keeping track of where your money goes, you may be less\n"
+"                likely to overspend, and more likely to meet your financial\n"
+"                goals. Forecast a budget by detailing the expected revenue "
+"per\n"
+"                analytic account and monitor its evolution based on the "
+"actuals\n"
+"                realised during that period.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
@@ -465,14 +411,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_budget
-#: model:ir.module.module,shortdesc:account_budget.module_meta_information
-msgid "Budget Management"
-msgstr "Gestión presupuestaria"
-
-#. module: account_budget
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -480,163 +422,7 @@ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 msgid "Analysis from"
 msgstr "Análisis desde"
 
-#~ msgid "% performance"
-#~ msgstr "% rendimiento"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Period"
-#~ msgstr "Período"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Dotations"
-#~ msgstr "Dotaciones"
-
-#~ msgid "Performance"
-#~ msgstr "Rendimiento"
-
-#~ msgid "From"
-#~ msgstr "Desde"
-
-#~ msgid "Results"
-#~ msgstr "Resultados"
-
-#~ msgid "A/c No."
-#~ msgstr "Núm. de cuenta"
-
-#~ msgid "Period Budget"
-#~ msgstr "Período del presupuesto"
-
-#~ msgid "Budget Analysis"
-#~ msgstr "Análisis presupuestario"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Select Options"
-#~ msgstr "Seleccionar opciones"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Print Summary of Budgets"
-#~ msgstr "Imprimir resumen de presupuestos"
-
-#~ msgid "Spread amount"
-#~ msgstr "Cantidad Extendida"
-
-#~ msgid "Amount"
-#~ msgstr "Importe"
-
-#~ msgid "Total Planned Amount"
-#~ msgstr "Importe total previsto"
-
-#~ msgid "Item"
-#~ msgstr "Item"
-
-#~ msgid "Theoretical Amount"
-#~ msgstr "Importe teórico"
-
-#~ msgid "Fiscal Year"
-#~ msgstr "Ejercicio fiscal"
-
-#~ msgid "Spread"
-#~ msgstr "Extensión"
-
-#~ msgid "Select period"
-#~ msgstr "Seleccionar período"
-
-#~ msgid "Analytic Account :"
-#~ msgstr "Cuenta analítica:"
-
-#, python-format
-#~ msgid "Insufficient Data!"
-#~ msgstr "¡Datos Insuficientes!"
-
-#~ msgid "Print Budget"
-#~ msgstr "Imprimir presupuestos"
-
-#~ msgid "Spreading"
-#~ msgstr "Difusión"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Budget Dotation"
-#~ msgstr "Dotación presupuestaria"
-
-#~ msgid "Budget Dotations"
-#~ msgstr "Dotaciones presupuestarias"
-
-#~ msgid "Budget Item Detail"
-#~ msgstr "Detalle de elemento presupuestario"
-
-#, python-format
-#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
-#~ msgstr ""
-#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
-#~ "presupuesto %s!"
-
-#~ msgid ""
-#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
-#~ "\n"
-#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
-#~ "Management/Budgets/), the Project Managers can set the planned amount on "
-#~ "each\n"
-#~ "Analytic Account.\n"
-#~ "\n"
-#~ "The accountant has the possibility to see the total of amount planned for "
-#~ "each\n"
-#~ "Budget and Master Budget in order to ensure the total planned is not\n"
-#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
-#~ "of\n"
-#~ "record can also be switched to a graphical view of it.\n"
-#~ "\n"
-#~ "Three reports are available:\n"
-#~ "    1. The first is available from a list of Budgets. It gives the "
-#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-#~ "\n"
-#~ "    2. The second is a summary of the previous one, it only gives the "
-#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
-#~ "\n"
-#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
-#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
-#~ "Budgets per Budgets.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
-#~ "(costes) y cruzados.\n"
-#~ "\n"
-#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
-#~ "(en Gestión\n"
-#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
-#~ "importe previsto en\n"
-#~ "cada cuenta analítica.\n"
-#~ "\n"
-#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
-#~ "cada\n"
-#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-#~ "es\n"
-#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-#~ "principal.\n"
-#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
-#~ "misma.\n"
-#~ "\n"
-#~ "Están disponibles tres informes:\n"
-#~ "    1. El primero está disponible desde una lista de presupuestos. "
-#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-#~ "por presupuestos principales.\n"
-#~ "\n"
-#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
-#~ "\n"
-#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
-#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-#~ "principales por presupuestos.\n"
-#~ "\n"
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Draft Budgets"
+msgstr "Presupuestos borrador"
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 0e28897fdf9..b0831fd0495 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-10 23:08+0000\n"
+"PO-Revision-Date: 2012-11-27 22:05+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "Toplam :"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Birbirini çağıran analitik hesaplar oluşturamazsın."
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "Bütçeleri Onaylama"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "Teorik Tutar"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 746fef7b511..6192b43088c 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-10-30 15:45+0000\n"
+"PO-Revision-Date: 2012-11-27 10:37+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:07+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -28,6 +28,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个付款单。\n"
+"              </p><p>\n"
+"                付款单是一个支付请求，从你公司付款供应商或者给客户退款.\n"
+"              </p>\n"
+"            "
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -125,7 +131,7 @@ msgstr "填充付款声明"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -207,6 +213,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"一个付款单的初始状态是'草稿'.\n"
+" 一旦银行确认，状态被设置为'确定'.\n"
+" 然后付款单被支付后，状态成为'完成'."
 
 #. module: account_payment
 #: view:payment.order:0
@@ -232,7 +241,7 @@ msgstr "已安排"
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "导入付款明细"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -271,7 +280,7 @@ msgstr "选择付款单选项“固定”由你指定一个指定的日期，“
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -339,7 +348,7 @@ msgstr "业务伙伴"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -395,7 +404,7 @@ msgstr "付款帐户填充声明"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "这个凭证行没有定义合作伙伴"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -427,7 +436,7 @@ msgstr "草稿"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -479,7 +488,7 @@ msgstr "搜索"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -494,7 +503,7 @@ msgstr "合计:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "执行日期"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -617,7 +626,7 @@ msgstr "讯息2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -678,7 +687,7 @@ msgstr "名称"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -715,19 +724,19 @@ msgstr "建立付款"
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "计划时间"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
index d0ee611c96e..9bdf0b61ed2 100644
--- a/addons/account_sequence/i18n/nl_BE.po
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 13:19+0000\n"
+"PO-Revision-Date: 2012-11-27 13:36+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een afgesloten rekening."
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -116,7 +116,7 @@ msgstr "Naam"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
 
 #. module: account_sequence
 #: constraint:account.journal:0
@@ -124,6 +124,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Configuratiefout.\n"
+"De gekozen munt moet door de standaardrekeningen worden gedeeld."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -135,6 +137,8 @@ msgstr "Verkeerde credit– of debetwaarde in de boeking."
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"U kunt niet meer dan één boeking per periode doen in een gecentraliseerd "
+"dagboek."
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -144,7 +148,7 @@ msgstr "Intern volgnummer"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4dd9431736b..4dc753deedc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -174,7 +174,7 @@
             <field name="view_id" ref="view_voucher_form"/>
             <field name="act_window_id" ref="action_voucher_list"/>
         </record>
-        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
+        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6" groups="base.group_no_one"/>
 
         <act_window
             id="act_journal_voucher_open"
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index da353da82ae..3524e48d1fc 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,51 +7,51 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2009-04-10 09:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-27 13:39+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Afpunting"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:348
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Afschrijving"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Betalingsreferentie"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totaalbedrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Openstaande boekingen klanten"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
diff --git a/addons/auth_anonymous/i18n/nl_BE.po b/addons/auth_anonymous/i18n/nl_BE.po
new file mode 100644
index 00000000000..52400d66436
--- /dev/null
+++ b/addons/auth_anonymous/i18n/nl_BE.po
@@ -0,0 +1,30 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 13:37+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Aanmelden"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/zh_CN.po b/addons/auth_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..95afb2638c6
--- /dev/null
+++ b/addons/auth_anonymous/i18n/zh_CN.po
@@ -0,0 +1,30 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 16:43+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "登录"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "匿名组"
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index c07359a062c..983549f9378 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-
         <record id="provider_openerp" model="auth.oauth.provider">
-            <field name="name">OpenERP Accounts</field>
+            <field name="name">OpenERP.com Accounts</field>
             <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
             <field name="scope">userinfo</field>
             <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Sign in with OpenERP account</field>
+            <field name="body">Log in with OpenERP.com</field>
+            <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">
             <field name="name">Facebook Graph</field>
@@ -18,7 +18,7 @@
             <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial facebook</field>
-            <field name="body">Sign in with facebook</field>
+            <field name="body">Log in with facebook</field>
         </record>
         <record id="provider_google" model="auth.oauth.provider">
             <field name="name">Google OAuth2</field>
@@ -27,9 +27,10 @@
             <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
             <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
             <field name="css_class">zocial google</field>
-            <field name="body">Sign in with google</field>
+            <field name="body">Log in with google</field>
         </record>
-        <!-- <record id="provider_twitter" model="auth.oauth.provider">
+        <!--
+        <record id="provider_twitter" model="auth.oauth.provider">
             <field name="name">Twitter OAuth</field>
             <field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field>
             <field name="scope"></field>
@@ -37,7 +38,7 @@
             <field name="data_endpoint"></field>
             <field name="css_class">zocial twitter</field>
             <field name="body">Sign in with twitter</field>
-        </record> -->
-        
+        </record>
+        -->
     </data>
 </openerp>
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 7e7b3753a4e..b1c7e214f12 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -45,6 +45,25 @@ class res_users(osv.Model):
             validation.update(data)
         return validation
 
+    def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+        """ retrieve and sign in the user corresponding to provider and validated access token
+            :param provider: oauth provider id (int)
+            :param validation: result of validation of access token (dict)
+            :param params: oauth parameters (dict)
+            :return: user login (str)
+            :raise: openerp.exceptions.AccessDenied if signin failed
+
+            This method can be overridden to add alternative signin methods.
+        """
+        oauth_uid = validation['user_id']
+        user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
+        if not user_ids:
+            raise openerp.exceptions.AccessDenied()
+        assert len(user_ids) == 1
+        user = self.browse(cr, uid, user_ids[0], context=context)
+        user.write({'oauth_access_token': params['access_token']})
+        return user.login
+
     def auth_oauth(self, cr, uid, provider, params, context=None):
         # Advice by Google (to avoid Confused Deputy Problem)
         # if validation.audience != OUR_CLIENT_ID:
@@ -53,39 +72,15 @@ class res_users(osv.Model):
         #   continue with the process
         access_token = params.get('access_token')
         validation = self._auth_oauth_validate(cr, uid, provider, access_token)
-        # required
-        oauth_uid = validation['user_id']
-        if not oauth_uid:
+        # required check
+        if not validation.get('user_id'):
             raise openerp.exceptions.AccessDenied()
-        email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
-        login = email
-        # optional
-        name = validation.get('name', email)
-        res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
-        if res:
-            assert len(res) == 1
-            user = self.browse(cr, uid, res[0], context=context)
-            login = user.login
-            user.write({'oauth_access_token': access_token})
-        else:
-            # New user if signup module available
-            if not hasattr(self, '_signup_create_user'):
-                raise openerp.exceptions.AccessDenied()
-
-            new_user = {
-                'name': name,
-                'login': login,
-                'user_email': email,
-                'oauth_provider_id': provider,
-                'oauth_uid': oauth_uid,
-                'oauth_access_token': access_token,
-                'active': True,
-            }
-            # TODO pass signup token to allow attach new user to right partner
-            self._signup_create_user(cr, uid, new_user)
-
-        credentials = (cr.dbname, login, access_token)
-        return credentials
+        # retrieve and sign in user
+        login = self._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+        if not login:
+            raise openerp.exceptions.AccessDenied()
+        # return user credentials
+        return (cr.dbname, login, access_token)
 
     def check_credentials(self, cr, uid, password):
         try:
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
index ed6130e3123..0489229042a 100644
--- a/addons/auth_oauth/static/src/css/auth_oauth.css
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -9,7 +9,6 @@
 }
 
 .openerp a.zocial.openerp {
-    float: right;
     border: 1px solid #222222;
     color: white;
     margin: 0;
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 2aa66877d42..c24dab3d55a 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -35,27 +35,33 @@ openerp.auth_oauth = function(instance) {
         on_oauth_sign_in: function(ev) {
             ev.preventDefault();
             var index = $(ev.target).data('index');
-            var p = this.oauth_providers[index];
-            var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
+            var provider = this.oauth_providers[index];
+            return this.do_oauth_sign_in(provider);
+        },
+        do_oauth_sign_in: function(provider) {
+            var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
             if (instance.session.debug) {
-                ret += '?debug';
+                return_url += '?debug';
             }
-            var dbname = self.$("form [name=db]").val();
-            var state_object = {
-                d: dbname,
-                p: p.id
-            };
-            var state = JSON.stringify(state_object);
+            var state = this._oauth_state(provider);
             var params = {
                 response_type: 'token',
-                client_id: p.client_id,
-                redirect_uri: ret,
-                scope: p.scope,
-                state: state,
+                client_id: provider.client_id,
+                redirect_uri: return_url,
+                scope: provider.scope,
+                state: JSON.stringify(state),
             };
-            var url = p.auth_endpoint + '?' + $.param(params);
+            var url = provider.auth_endpoint + '?' + $.param(params);
             window.location = url;
         },
+        _oauth_state: function(provider) {
+            // return the state object sent back with the redirected uri
+            var dbname = this.$("form [name=db]").val();
+            return {
+                d: dbname,
+                p: provider.id,
+            };
+        },
     });
 
 };
diff --git a/addons/auth_oauth_signup/__init__.py b/addons/auth_oauth_signup/__init__.py
new file mode 100644
index 00000000000..bc40c87d118
--- /dev/null
+++ b/addons/auth_oauth_signup/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import res_users
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
new file mode 100644
index 00000000000..1e5767065a4
--- /dev/null
+++ b/addons/auth_oauth_signup/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Signup with OAuth2 Authentication',
+    'version': '1.0',
+    'category': 'Hidden',
+    'description': """
+Allow users to sign up through OAuth2 Provider.
+===============================================
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['auth_oauth', 'auth_signup'],
+    'data': [],
+    'js': ['static/src/js/auth_oauth_signup.js'],
+    'css': [],
+    'qweb': [],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
new file mode 100644
index 00000000000..83400f7c008
--- /dev/null
+++ b/addons/auth_oauth_signup/res_users.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+import simplejson
+
+import openerp
+from openerp.osv import osv, fields
+
+_logger = logging.getLogger(__name__)
+
+class res_users(osv.Model):
+    _inherit = 'res.users'
+
+    def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+        # overridden to use signup method if regular oauth signin fails
+        try:
+            login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+
+        except openerp.exceptions.AccessDenied:
+            state = simplejson.loads(params['state'])
+            token = state.get('t')
+            oauth_uid = validation['user_id']
+            email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
+            name = validation.get('name', email)
+            values = {
+                'name': name,
+                'login': email,
+                'email': email,
+                'oauth_provider_id': provider,
+                'oauth_uid': oauth_uid,
+                'oauth_access_token': params['access_token'],
+                'active': True,
+            }
+            _, login, _ = self.signup(cr, uid, values, token, context=context)
+
+        return login
diff --git a/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
new file mode 100644
index 00000000000..6715943af9b
--- /dev/null
+++ b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
@@ -0,0 +1,14 @@
+openerp.auth_oauth_signup = function(instance) {
+
+    // override Login._oauth_state to add the signup token in the state
+    instance.web.Login.include({
+        _oauth_state: function(provider) {
+            var state = this._super.apply(this, arguments);
+            if (this.params.token) {
+                state.t = this.params.token;
+            }
+            return state;
+        },
+    });
+
+};
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index 819e2c90be6..4388e70ee46 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 22:49+0000\n"
+"PO-Revision-Date: 2012-11-27 22:07+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: auth_openid
 #. openerp-web
@@ -69,7 +69,7 @@ msgstr ""
 #. module: auth_openid
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
 
 #. module: auth_openid
 #: field:res.users,openid_key:0
@@ -79,7 +79,7 @@ msgstr "OpenID Anahtarı"
 #. module: auth_openid
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: auth_openid
 #: constraint:res.users:0
@@ -94,7 +94,7 @@ msgstr "OpenID E-posta"
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_reset_password/i18n/tr.po b/addons/auth_reset_password/i18n/tr.po
new file mode 100644
index 00000000000..3feaf33754c
--- /dev/null
+++ b/addons/auth_reset_password/i18n/tr.po
@@ -0,0 +1,83 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 22:15+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+"\n"
+"<p>Bu epostayla ilişkili OpenERP hesabı için bir parola sıfırlama isteği "
+"istendi.</p>\n"
+"\n"
+"<p>Şifrenizi şu adresten değiştirebilirsiniz.  <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Not: Eğer bu parola değiştirme isteğini siz yapmadıysanız bu mesajı "
+"görmezden gelebilirsiniz. </p>"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Parolayı Sıfırla"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Parola sıfırlandı"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Hata: Geçersiz EAN barkodu"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Seçilen şirket bu kullanıcı için izin verilen şirketler arasında yok"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
index b1039031812..cfac20c76f9 100644
--- a/addons/auth_reset_password/res_users.py
+++ b/addons/auth_reset_password/res_users.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
 
 from datetime import datetime, timedelta
 
@@ -54,6 +55,8 @@ class res_users(osv.osv):
         template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_reset_password', 'reset_password_email')
         assert template._name == 'email.template'
         for user in self.browse(cr, uid, ids, context):
+            if not user.email:
+                raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
             self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
 
         return True
diff --git a/addons/auth_reset_password/res_users_view.xml b/addons/auth_reset_password/res_users_view.xml
index 9952162ae65..628e95b6ff9 100644
--- a/addons/auth_reset_password/res_users_view.xml
+++ b/addons/auth_reset_password/res_users_view.xml
@@ -7,11 +7,17 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
+                <!-- Reset Password button -->
                 <xpath expr="//sheet/*[1]" position="before">
                     <div class="oe_right oe_button_box">
-                        <button string="Reset Password" type="object" name="action_reset_password"/>
+                        <button string="Reset Password" type="object" name="action_reset_password"
+                            help="Send a special url by email to make the user (re)set their password."/>
                     </div>
                 </xpath>
+                <!-- password is never required; one can use Reset Password -->
+                <field name="new_password" position="attributes">
+                    <attribute name="attrs">{}</attribute>
+                </field>
             </field>
         </record>
 
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 9cbeb60638f..235ac047346 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -37,6 +37,5 @@ Allow users to sign up.
         'res_users_view.xml',
     ],
     'js': ['static/src/js/auth_signup.js'],
-    'css' : ['static/src/css/base.css'],
     'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 69ec45b80e5..7dbb19853a2 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -150,8 +150,12 @@ class res_users(osv.Model):
     _inherit = 'res.users'
 
     def _get_state(self, cr, uid, ids, name, arg, context=None):
-        return dict((user.id, 'new' if not user.login_date else 'reset' if user.signup_token else 'active')
-                    for user in self.browse(cr, uid, ids, context))
+        res = {}
+        for user in self.browse(cr, uid, ids, context):
+            res[user.id] = ('reset' if user.signup_valid else
+                            'active' if user.login_date else
+                            'new')
+        return res
 
     _columns = {
         'state': fields.function(_get_state, string='Status', type='selection',
diff --git a/addons/auth_signup/static/src/css/Makefile b/addons/auth_signup/static/src/css/Makefile
deleted file mode 100644
index d6b4f4b2fc8..00000000000
--- a/addons/auth_signup/static/src/css/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-base.css: base.sass
-	sass --trace -t expanded base.sass base.css
-
diff --git a/addons/auth_signup/static/src/css/base.css b/addons/auth_signup/static/src/css/base.css
deleted file mode 100644
index 3f97e7a9301..00000000000
--- a/addons/auth_signup/static/src/css/base.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@charset "utf-8";
-.openerp .oe_login .oe_signup_show {
-  display: none;
-}
-.openerp .oe_login_signup .oe_signup_show {
-  display: block !important;
-}
-.openerp .oe_login_signup .oe_signup_hide {
-  display: none;
-}
diff --git a/addons/auth_signup/static/src/css/base.sass b/addons/auth_signup/static/src/css/base.sass
deleted file mode 100644
index f97665d192c..00000000000
--- a/addons/auth_signup/static/src/css/base.sass
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "utf-8"
-
-.openerp
-    // Regular login form
-    .oe_login
-        .oe_signup_show
-            display: none
-    // Signup form
-    .oe_login_signup
-        .oe_signup_show
-            display: block !important
-        .oe_signup_hide
-            display: none
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 962a54f5920..a6b401a4c7b 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -7,12 +7,15 @@ openerp.auth_signup = function(instance) {
             var self = this;
             var d = this._super();
 
+            self.$(".oe_signup_show").hide();
             // to switch between the signup and regular login form
             this.$('a.oe_signup_signup').click(function(ev) {
                 if (ev) {
                     ev.preventDefault();
                 }
                 self.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 return false;
             });
             this.$('a.oe_signup_back').click(function(ev) {
@@ -20,6 +23,8 @@ openerp.auth_signup = function(instance) {
                     ev.preventDefault();
                 }
                 self.$el.removeClass("oe_login_signup");
+                self.$(".oe_signup_show").hide();
+                self.$(".oe_signup_hide").show();
                 delete self.params.token;
                 return false;
             });
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index e63bd5863b0..a51ced3778d 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1: -->
+<!-- vim:fdl=1:
+-->
 <templates id="template" xml:space="preserve">
 
     <t t-extend="Login">
@@ -16,12 +17,12 @@
             <li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
         </t>
         <t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
-            <li class="oe_signup_hide"><button name="submit">Log in</button></li>
-            <li class="oe_signup_show"><button name="submit">Sign in</button></li>
-        </t>
-        <t t-jquery="form ul:first li:last" t-operation="after">
-            <li><a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a></li>
-            <li><a class="oe_signup_show oe_signup_back" href="#">Back to Login</a></li>
+            <li>
+                <button class="oe_signup_hide" name="submit">Log in</button>
+                <button class="oe_signup_show" name="submit">Sign up</button>
+                <a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
+                <a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
+            </li>
         </t>
     </t>
 
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 6a0590cfbbe..24ea4a9da7c 100644
--- a/addons/base_crypt/i18n/tr.po
+++ b/addons/base_crypt/i18n/tr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 21:53+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "Seçilen firma bu kullanıcı için izin verilen firmalar arasında yok"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index cab3828f12d..143b96d3c0f 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 20:20+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "İptal"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 431a39bfe02..abee97593ac 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 39aed5e32b3..209639474fc 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.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: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-23 22:01+0000\n"
+"PO-Revision-Date: 2012-11-27 21:48+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "Geçerliliğini Kontrol et"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:147
@@ -60,12 +60,12 @@ msgstr "Hata! Özyinelemeli firmalar oluşturamazsınız."
 #: code:addons/base_vat/base_vat.py:111
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po
index c4f38f1f584..f4b3a345289 100644
--- a/addons/contacts/i18n/es.po
+++ b/addons/contacts/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: contacts
diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
new file mode 100644
index 00000000000..9b414baee4e
--- /dev/null
+++ b/addons/contacts/i18n/hu.po
@@ -0,0 +1,37 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:56+0000\n"
+"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kapcsolatok"
diff --git a/addons/contacts/i18n/tr.po b/addons/contacts/i18n/tr.po
new file mode 100644
index 00000000000..9b68dbf5ddc
--- /dev/null
+++ b/addons/contacts/i18n/tr.po
@@ -0,0 +1,44 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 21:52+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Adres defterinizden bir carinin  üzerine tıklayın.\n"
+"          </p><p>\n"
+"            OpenERP bir müşteriye ait bütün aktiviteleri takip etmenize\n"
+"            yardım eder; mesela iş fırsatlarını, dökümanları, vs.\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Cariler"
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index 68a2aeeccbc..40c9d42e153 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: crm_todo
diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index 95078305c13..1da382b14d0 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-03-01 17:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:41+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
 "Error! You cannot define the decimal precision of 'Account' as greater than "
 "the rounding factor of the company's main currency"
 msgstr ""
+"U kunt de decimale precisie voor Rekening niet groter zetten dan de "
+"afrondingsfactor van de standaardmunt van uw bedrijf."
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index c028b40ab6e..2920c8bd9ce 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: delivery
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 86a4e7ea912..0c7c6a448d5 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-10 07:02+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:44+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -30,7 +30,7 @@ msgstr "文档"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "单据属性"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -41,7 +41,7 @@ msgstr "文档属性列表"
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "目录必须有个上级或者是存储"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -182,7 +182,7 @@ msgstr "创建人"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "单据属性"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
@@ -192,7 +192,7 @@ msgstr "DAV属性"
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "错误！你不能创建循环目录"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index aea467b0a0f..26e12724682 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 22:33+0000\n"
+"PO-Revision-Date: 2012-11-27 22:29+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Neden:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "öküman başarılı bir şekilde içeri alındı!"
 
 #. module: edi
 #: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Üzgünüm, Döküman içeri alınamadı."
 
 #. module: edi
 #: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "Şirketler"
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "Döviz"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Döküman içeri alma Uyarısı"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Kayıp Uygulama"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -114,11 +114,13 @@ msgid ""
 "Error! You cannot define a rounding factor for the company's main currency "
 "that is smaller than the decimal precision of 'Account'."
 msgstr ""
+"Hata! Şirketin ana hesap dövizi için  Muhasebe ondalık hassasiyetinden daha "
+"küçük bir yuvarlama çarpanı seçemezsiniz."
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI altsistemi"
 
 #~ msgid "Partner Addresses"
 #~ msgstr "Cari Adresleri"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 1043991c9a2..6251eb81991 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-19 14:10+0000\n"
+"PO-Revision-Date: 2012-11-28 00:07+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -24,17 +24,18 @@ msgstr "Megerősítve"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Kiszolgálónév"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Szkript"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Feldolgozás sorrendjének meghatározása, alacsonyabb érték magasabb prioritás"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -51,7 +52,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,is_ssl:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -69,7 +70,7 @@ msgstr "POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Letöltés most"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -95,7 +96,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "Státusz"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -120,7 +121,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Utolsó letöltés időpontja"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -137,39 +138,39 @@ msgstr "E-mailek száma"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Eredeti megtartása"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Haladó beállítások"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Beállítás"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Bejövő levelek kiszolgálója"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Csatlakozás teszt nem sikerült!"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Felhasználónév"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Levelező szerver hostneve vagy IP címe"
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -192,7 +193,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Szerverművelet"
 
 #. module: fetchmail
 #: field:mail.mail,fetchmail_server_id:0
@@ -225,7 +226,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Elküldött levelek"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -245,7 +246,7 @@ msgstr "IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Szerver típusa: POP3"
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -280,7 +281,7 @@ msgstr ""
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Speciális"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 9a3c37cedb2..9a2ff824da7 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: fetchmail
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bcee15e02e8..7d27fe456b8 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -227,6 +227,7 @@
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="coach_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index efee5a9bb02..7131a0b306b 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.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: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-26 20:53+0000\n"
+"PO-Revision-Date: 2012-11-27 21:53+0000\n"
 "Last-Translator: Lovro Lazarin <lovro.lazarin@slobodni-programi.hr>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 "Language: hr\n"
 
@@ -389,7 +389,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -404,7 +404,7 @@ msgstr "Nadređena kategorija"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID po dobavljaču mora biti jedinstven"
 
 #. module: hr
 #: view:hr.department:0
@@ -440,6 +440,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                            "
+"Kliknite da bi definirali novo radno mjesto.\n"
+"                                                                  </p><p>\n"
+"                                                                            "
+"Radna mjesta se koriste da bi definirali funkciju i zahtjeve za taj posao.\n"
+"                                                                            "
+"Možete voditi evidenciju broja radnika po radnom mjestu i pratit planirani \n"
+"                                                                            "
+"razvoj.\n"
+"                                                                  </p><p>\n"
+"                                                                            "
+"Možete dodati anketu za radno mjesto, koja će se koristiti za ispitivanje \n"
+"                                                                            "
+"kandidata u procesu zapošljavanja.\n"
+"                                                                   </p>\n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -456,22 +473,22 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Ovo instalira modul hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivnu hijerarhiju radnika."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Ovo instalira modul hr_attendance."
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Fotografija malih dimenzija"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -482,12 +499,12 @@ msgstr "Kategorija djelatnika"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Oznake"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Ovo instalira modul hr_contract."
 
 #. module: hr
 #: view:hr.employee:0
@@ -497,7 +514,7 @@ msgstr "Povezani Korisnik"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -507,12 +524,12 @@ msgstr "Kategorija"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Zaustavi proces zapošljavanja"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Instaliraj modul za praćenje prisustva"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -542,7 +559,7 @@ msgstr "Kontakt podaci"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Upravljaj godišnjima, izostancima i zahtjevima za slobodne dane"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -569,12 +586,12 @@ msgstr "Ugovor djelatnika"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Ugovori"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i povijest komuniciranja"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -584,12 +601,12 @@ msgstr "JMBG"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Sljedbenik"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Upravljaj procesom zapošljavanja"
 
 #. module: hr
 #: view:hr.employee:0
@@ -599,12 +616,12 @@ msgstr "Aktivan"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Upravljanje ljudskim resursima"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Instaliraj plaće za Vašu državu"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -619,7 +636,7 @@ msgstr "Tvrtke"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -644,21 +661,33 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                             "
+"Kliknite da bi dodali novog radnika.\n"
+"                                                                    </p><p>\n"
+"                                                                             "
+"Sa samo brzim pogledom na OpenERP karticu s radnikom, možete\n"
+"                                                                             "
+"lako sazanti sve potrebne informacije za svaku osobu;\n"
+"                                                                             "
+"kontakt podaci, radno mjesto, dostupnost, itd.\n"
+"                                                                     </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "HR postavke (Ljudski resursi)"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Državljanstvo i ostale informacije"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne odjele."
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -673,7 +702,7 @@ msgstr "Poslovna adresa"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Javne informacije"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -698,7 +727,7 @@ msgstr "Fotografija"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -713,17 +742,30 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                            "
+"Kliknite da bi kreirali odjel.\n"
+"                                                                      "
+"</p><p>\n"
+"                                                                            "
+"OpenERP odjelska struktura se koristi za upravljanje svim dokumentima \n"
+"                                                                            "
+"vezanih za radnika prema odjelima: troškovi, kontrolne kartice, \n"
+"                                                                            "
+"godišnji i odsustva, zapošljavanja, itd.\n"
+"                                                                      </p>\n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Ovo instalira modul hr_timesheet."
 
 #. module: hr
 #: field:hr.job,message_comment_ids:0
 #: help:hr.job,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Komentari i e-pošta."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -738,6 +780,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                           "
+"Kliknite da bi definirali novi odjel.\n"
+"                                                                  </p><p>\n"
+"                                                                           "
+"Vaša odjelska struktura se koristi kako bi upravljali svim dokumentima\n"
+"                                                                           "
+"vezanim za radnike po odjelima: troškovi i kontrolne kartice, odsustva i "
+"godišnji,\n"
+"                                                                           "
+"zapošljavanje, itd.\n"
+"                                                                  </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -762,13 +817,15 @@ msgstr "Poslovni mobitel"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Zapošljavanje u tijeku"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Dopusti fakturiranje na osnovu kontrolnih kartica (aplikacija za prodaju će "
+"biti instalirana)"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -788,7 +845,7 @@ msgstr "Kućna adresa"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "Upravljaj kontrolnim karticama"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -819,12 +876,12 @@ msgstr "Na poziciji"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Ovo instalira modul hr_payroll."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "Zabilježi ugovore po radniku"
 
 #. module: hr
 #: view:hr.department:0
@@ -839,7 +896,7 @@ msgstr "Nacionalnost"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Dodatne opcije"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -892,23 +949,23 @@ msgstr "Naziv odjela"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Izvještaji"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Upravljaj plaćama"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Konfiguriraj ljudske resurse"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Nema zapošljavanja"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -923,12 +980,12 @@ msgstr "Kreiranje OpenERP korisnika"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Sveukupno predviđeni radnici"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -936,11 +993,13 @@ msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
 msgstr ""
+"Zadane postavke 'U poziciji', postavite 'U procesu zapošljavanja' ako je "
+"zapošljavanje u tijeku za to radno mjesto."
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -966,6 +1025,33 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                                                                             "
+"       <p>\n"
+"                                                                             "
+"               <b>Ploča ljudskih resursa je prazna.</b>\n"
+"                                                                             "
+"       </p><p>\n"
+"                                                                             "
+"                 Da bi dodali Vaš prvi izvještaj na ploču, idite na bilo "
+"koji meni, promijenite\n"
+"                                                                             "
+"                 pogled na listu ili graf, i kliknite <i>'Dodaj na "
+"ploču'</i> u proširenim\n"
+"                                                                             "
+"                 opcijama pretraživanja.\n"
+"                                                                             "
+"       </p><p>\n"
+"                                                                             "
+"                  Možete filtrirati i grupirati podatke prije nego ih "
+"ubacite u ploču koristeći\n"
+"                                                                             "
+"                  opcije za pretraživanje.\n"
+"                                                                             "
+"       </p>\n"
+"                                                                      "
+"</div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -981,7 +1067,7 @@ msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Ovo instalira modul hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
@@ -998,7 +1084,7 @@ msgstr "Voditelj"
 #. module: hr
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -1013,7 +1099,7 @@ msgstr "Podređeni djelatnici"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 939270dbaf6..919cbcc678e 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 04:57+0000\n"
+"PO-Revision-Date: 2012-11-27 15:32+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr
@@ -39,7 +39,7 @@ msgstr "员工信息链接"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "社保号"
+msgstr "社会保险号SIN"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
@@ -575,7 +575,7 @@ msgstr "消息和通信历史"
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "员工号"
+msgstr "社会保险号SSN"
 
 #. module: hr
 #: field:hr.job,message_is_follower:0
@@ -715,6 +715,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建部门.\n"
+"              </p><p>\n"
+"                OpenERP 的部门结构 用来管理所有跟部门员工相关\n"
+"                的单据：费用、计工单、请假、假期和招聘等等。\n"
+" \n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
@@ -740,6 +748,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建部门.\n"
+"              </p><p>\n"
+"                OpenERP 的部门结构 用来管理所有跟部门员工相关\n"
+"                的单据：费用、计工单、请假、假期和招聘等等。\n"
+" \n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -937,7 +953,7 @@ msgstr "预计员工数合计"
 msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
-msgstr ""
+msgstr "默认是'In position', 这个岗位的招聘进程开始后，设置为'In Recruitment'。"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
@@ -968,6 +984,18 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>人力资源的仪表板是空的.</b>\n"
+"                  </p><p>\n"
+"                    要增加第一个报表到仪表板。\n"
+"                    进入任意菜单，切换为列表视图或者图形视图，\n"
+"                   然后在扩展搜索选项里点击“添加到仪表板”\n"
+"                           </p><p>\n"
+"                   在插入到仪表板之前，你能过滤和分组这些数据.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 5f26a837eef..136facd67d6 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e0978847acb..de0a9714763 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -305,11 +305,9 @@
                                             'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
-                            <group col="3" colspan="1">
+                            <group>
                                 <field name="survey_id"/>
-                                <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
                                 <field name="user_to_review_id"/>
-                                <label string=""/>
                                 <field name="user_id" string="Interviewer"/>
                             </group>
                             <group>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0f117432528..09936d07767 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -143,7 +143,7 @@ class hr_holidays(osv.osv):
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 5abc6d371d5..423fb892636 100644
--- a/addons/hr_payroll_account/i18n/zh_CN.po
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index af5a755e81d..161ac761aec 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -207,7 +207,7 @@ class account_analytic_line(osv.osv):
                 partner = account.partner_id
                 if (not partner) or not (account.pricelist_id):
                     raise osv.except_osv(_('Analytic Account incomplete !'),
-                            _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
+                            _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
 
                 date_due = False
                 if partner.property_payment_term:
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index efff48d93b8..b5ba7f74101 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
                 date_to: false,
                 date_from: false,
             });
+            this.updating = true;
             this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
             this.field_manager.on("field_changed:date_from", this, function() {
                 this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8953beef987..32aedc3fa22 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -389,7 +389,7 @@
             <field name="name">cashmove tree</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <tree string="cashmove tree">
+                <tree string="cashmove tree" create="false">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="description"/>
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index b25ca22ef2d..0377a00a8cf 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-10-26 12:29+0000\n"
-"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
+"PO-Revision-Date: 2012-11-28 00:18+0000\n"
+"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -29,13 +29,13 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: mail
 #: field:mail.compose.message,author_id:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Szerző"
 
 #. module: mail
 #: view:mail.mail:0
@@ -45,12 +45,12 @@ msgstr "Üzenet részletei"
 #. module: mail
 #: help:mail.mail,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Üzenet címzettjei"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Megjegyzés"
 
 #. module: mail
 #: view:mail.alias:0
@@ -62,7 +62,7 @@ msgstr "Csoportosítás..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Automatikusan letisztított HTML tartalom"
 
 #. module: mail
 #. openerp-web
@@ -94,12 +94,12 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Csoportnév"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Nyilvános"
 
 #. module: mail
 #: view:mail.mail:0
@@ -130,14 +130,14 @@ msgstr ""
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:237
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "mutat"
 
 #. module: mail
 #: help:mail.message.subtype,default:0
@@ -154,14 +154,14 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
 msgid "Whole Company"
-msgstr ""
+msgstr "Teljes vállalat"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:786
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Valóban törölni kívánja ezt az üzenetet?"
 
 #. module: mail
 #: view:mail.message:0
@@ -185,7 +185,7 @@ msgstr ""
 #: code:addons/mail/mail_message.py:638
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Hozzáférés megtagadva"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -209,7 +209,7 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
-msgstr ""
+msgstr "Szál"
 
 #. module: mail
 #. openerp-web
@@ -251,7 +251,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:91
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "feltöltés"
 
 #. module: mail
 #. openerp-web
@@ -293,7 +293,7 @@ msgstr "Válaszcím"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email varázsló"
 
 #. module: mail
 #: help:mail.group,message_unread:0
@@ -386,7 +386,7 @@ msgstr ""
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Rendszerüzenet"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -408,7 +408,7 @@ msgstr "Tárgy"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
 
 #. module: mail
 #: view:mail.mail:0
@@ -437,7 +437,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #: field:mail.compose.message,to_read:0
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 09d7afe6d3d..a232aa12642 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -67,7 +67,7 @@
                 'read_action': 'read', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    <b>No todo!</b>
+                    <b>No todo.</b>
                 </p><p>
                     When you process messages in your inbox, you can mark some
                     as <i>todo</i>. From this menu, you can process all your todo.
diff --git a/addons/note/i18n/zh_CN.po b/addons/note/i18n/zh_CN.po
index af393cfa67b..06e15c0c3d4 100644
--- a/addons/note/i18n/zh_CN.po
+++ b/addons/note/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: note
diff --git a/addons/note_pad/i18n/zh_CN.po b/addons/note_pad/i18n/zh_CN.po
new file mode 100644
index 00000000000..d4c72370cab
--- /dev/null
+++ b/addons/note_pad/i18n/zh_CN.po
@@ -0,0 +1,28 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-27 16:45+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "便笺"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Pad Url"
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index f8ae9cdb56d..0df57759156 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -213,8 +213,10 @@ function openerp_pos_db(instance, module){
             var stored_products   = this.load('products',{});
             var product_ids  = stored_categories[category_id];
             var list = [];
-            for(var i = 0, len = Math.min(product_ids.length,this.limit); i < len; i++){
-                list.push(stored_products[product_ids[i]]);
+            if (product_ids) {
+                for (var i = 0, len = Math.min(product_ids.length, this.limit); i < len; i++) {
+                    list.push(stored_products[product_ids[i]]);
+                }
             }
             return list;
         },
diff --git a/addons/portal_claim/i18n/zh_CN.po b/addons/portal_claim/i18n/zh_CN.po
index f313dde96d1..d76276fad8d 100644
--- a/addons/portal_claim/i18n/zh_CN.po
+++ b/addons/portal_claim/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: portal_claim
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index c29f198992b..79917ef135e 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/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: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-27 04:56+0000\n"
+"PO-Revision-Date: 2012-11-27 09:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: product
@@ -1004,7 +1004,7 @@ msgstr "指定 使用这条规则的需要的买卖的最小数量"
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "First valid date for the version."
-msgstr ""
+msgstr "这个版本的第一个有效期"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1022,6 +1022,10 @@ msgid ""
 "512MB RAM\n"
 "HDD SH-1"
 msgstr ""
+"17”LCD 显示器\n"
+"AMD8核处理器\n"
+"512m 内存\n"
+"硬盘 SH-1"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1036,7 +1040,7 @@ msgstr "代码"
 #. module: product
 #: model:product.template,name:product.product_product_27_product_template
 msgid "Laptop Customized"
-msgstr ""
+msgstr "定制便携计算机"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1046,7 +1050,7 @@ msgstr "运输单位"
 #. module: product
 #: model:product.template,name:product.product_product_35_product_template
 msgid "Blank CD"
-msgstr ""
+msgstr "空白CD"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1070,6 +1074,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为销售的每一样都定义一个产品。可以是物理产品、消耗品、或者你提供给客户的服务。\n"
+"              </p><p>\n"
+"                产品表单包括下面的信息以简化销售处理：价格、报价事项，会计数据，供应方法等等。\n"
+"               </p>\n"
+"            "
 
 #. module: product
 #: view:product.price_list:0
@@ -1079,7 +1091,7 @@ msgstr "取消"
 #. module: product
 #: model:product.template,description:product.product_product_37_product_template
 msgid "All in one hi-speed printer with fax and scanner."
-msgstr ""
+msgstr "高速打印、传真、扫描一体机"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -1087,7 +1099,7 @@ msgid ""
 "The minimal quantity to purchase to this supplier, expressed in the supplier "
 "Product Unit of Measure if not empty, in the default unit of measure of the "
 "product otherwise."
-msgstr ""
+msgstr "从供应商采购的最小数量，如果不是空的，就按明示的供应商单位。否则就是默认的计量单位。"
 
 #. module: product
 #: view:product.product:0
@@ -1446,7 +1458,7 @@ msgstr "报价单说明"
 msgid ""
 "This price will be considered as a price for the supplier Unit of Measure if "
 "any or the default Unit of Measure of the product otherwise"
-msgstr ""
+msgstr "这个价格是 按照供应商单位考虑的，其他情况是默认单位"
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1568,12 +1580,12 @@ msgstr "这种服务类型包括基本的产品监测"
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Last valid date for the version."
-msgstr ""
+msgstr "版本的最后有效日期"
 
 #. module: product
 #: model:product.template,name:product.product_product_19_product_template
 msgid "HDD on Demand"
-msgstr ""
+msgstr "HDD on Demand"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1597,7 +1609,7 @@ msgstr "价格表名称"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13 Barcode"
-msgstr ""
+msgstr "EAN13 条码"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1607,7 +1619,7 @@ msgstr "计量单位的转换比率不能为 0！"
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Graphics Card"
-msgstr ""
+msgstr "显卡"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1627,7 +1639,7 @@ msgstr "空包装重量"
 #. module: product
 #: model:product.template,name:product.product_product_41_product_template
 msgid "Windows Home Server 2011"
-msgstr ""
+msgstr "Windows Home Server 2011"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1637,7 +1649,7 @@ msgstr "字段值"
 #. module: product
 #: model:product.template,description:product.product_product_5_product_template
 msgid "Custom computer assembled on order based on customer's requirement."
-msgstr ""
+msgstr "根据客户要求定制组装计算机"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1669,13 +1681,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击增加一个新的计量单位类别。\n"
+"              </p><p>\n"
+"                属于相同类别的计量单位能互相转换。例如，，在“时间”类别中，你有下列单位: 小时数、天数。\n"
+"\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
 msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier Unit of "
 "Measure if any or in the default Unit of Measure of the product otherrwise."
-msgstr ""
+msgstr "最小数量触发这个规则，如果指明了就是供应商单位，否则就是产品的默认计量单位"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1696,7 +1715,7 @@ msgstr "供应商产品代码"
 #: help:product.pricelist,active:0
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
-msgstr ""
+msgstr "如果不选中，允许你隐藏价格表而无需删除"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1723,7 +1742,7 @@ msgstr "产品"
 #. module: product
 #: view:product.product:0
 msgid "Price:"
-msgstr ""
+msgstr "价格:"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1749,12 +1768,12 @@ msgstr "产品类别"
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
 msgid "Computer Case"
-msgstr ""
+msgstr "机箱"
 
 #. module: product
 #: model:product.template,name:product.product_product_9_product_template
 msgid "USB Keyboard, AZERTY"
-msgstr ""
+msgstr "USB键盘， AZERTY"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1769,14 +1788,14 @@ msgstr "错误！最小利润要小于最大利润"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Manage Secondary Unit of Measure"
-msgstr ""
+msgstr "管理第二个计量单位"
 
 #. module: product
 #: help:product.uom,rounding:0
 msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a Unit "
 "of Measure that cannot be further split, such as a piece."
-msgstr ""
+msgstr "计算的数量将是这个值的倍数。  不能进一步分割的单位，比如 1 片，使用1.0 。"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1796,12 +1815,12 @@ msgstr "箱子 30x40x60"
 #. module: product
 #: model:product.template,name:product.product_product_47_product_template
 msgid "Switch, 24 ports"
-msgstr ""
+msgstr "24 口交换机"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference Unit of Measure"
-msgstr ""
+msgstr "大于参考单位"
 
 #. module: product
 #: model:product.template,name:product.product_product_consultant_product_template
@@ -1812,25 +1831,25 @@ msgstr "服务"
 #. module: product
 #: view:product.template:0
 msgid "Internal Description"
-msgstr ""
+msgstr "内部说明"
 
 #. module: product
 #: model:product.template,name:product.product_product_48_product_template
 msgid "USB Adapter"
-msgstr ""
+msgstr "USB 适配器"
 
 #. module: product
 #: help:product.template,uos_id:0
 msgid ""
 "Sepcify a unit of measure here if invoicing is made in another unit of "
 "measure than inventory. Keep empty to use the default unit of measure."
-msgstr ""
+msgstr "如果制作发票的单位跟库存不一致，指定一个计量单位，留空使用默认单位。"
 
 #. module: product
 #: code:addons/product/product.py:206
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
-msgstr ""
+msgstr "不能改变已有的计量单位'%s'的类别"
 
 #. module: product
 #: help:product.packaging,height:0
@@ -1855,7 +1874,7 @@ msgstr "公司"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Laptop S3450"
-msgstr ""
+msgstr "便携计算机 S3450"
 
 #. module: product
 #: view:product.product:0
@@ -1886,13 +1905,13 @@ msgstr "此产品已经配置为推/拉流程的例子。"
 #. module: product
 #: field:product.product,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: product
 #: code:addons/product/product.py:174
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1907,7 +1926,7 @@ msgstr "长度或距离"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Components"
-msgstr ""
+msgstr "部件"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -1918,7 +1937,7 @@ msgstr "价格表类型"
 #. module: product
 #: model:product.category,name:product.product_category_6
 msgid "External Devices"
-msgstr ""
+msgstr "外置设备"
 
 #. module: product
 #: field:product.product,color:0
@@ -1928,7 +1947,7 @@ msgstr "颜色索引"
 #. module: product
 #: help:product.template,sale_ok:0
 msgid "Specify if the product can be selected in a sales order line."
-msgstr ""
+msgstr "如果产品能在销售单明细在被选择，则指定。"
 
 #. module: product
 #: view:product.product:0
@@ -1959,12 +1978,12 @@ msgstr "原材料"
 #. module: product
 #: model:product.template,name:product.product_product_13_product_template
 msgid "RAM SR5"
-msgstr ""
+msgstr "内存SR5"
 
 #. module: product
 #: model:product.template,name:product.product_product_14_product_template
 msgid "RAM SR2"
-msgstr ""
+msgstr "内存SR2"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -1986,11 +2005,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"               单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为采购的每一样都定义一个产品。可以是物理产品、消耗品、或者你从分包商购买的服务。\n"
+"              </p><p>\n"
+"                产品表单包括下面的信息以简化采购处理：价格、采购物流，会计数据，可用的供应商等等。\n"
+"               </p>\n"
+"            "
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_44_product_template
 msgid "Full featured image editing software."
-msgstr ""
+msgstr "全功能图像编辑软件"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -2007,17 +2034,17 @@ msgstr "* ( 1 + "
 #. module: product
 #: model:product.template,name:product.product_product_31_product_template
 msgid "Multimedia Speakers"
-msgstr ""
+msgstr "多媒体喇叭"
 
 #. module: product
 #: field:product.product,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: product
 #: view:product.product:0
 msgid "Sale Conditions"
-msgstr ""
+msgstr "销售条件"
 
 #. module: product
 #: view:product.packaging:0
@@ -2033,7 +2060,7 @@ msgstr "价格表名称"
 #. module: product
 #: view:product.product:0
 msgid "Description for Suppliers"
-msgstr ""
+msgstr "供应商说明"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -2043,7 +2070,7 @@ msgstr "送货周期"
 #. module: product
 #: view:product.product:0
 msgid "months"
-msgstr ""
+msgstr "月"
 
 #. module: product
 #: help:product.uom,active:0
@@ -2060,7 +2087,7 @@ msgstr "供应商交货提前期"
 #. module: product
 #: model:ir.model,name:product.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2072,7 +2099,7 @@ msgstr "箱子"
 msgid ""
 "Specify the fixed amount to add or substract(if negative) to the amount "
 "calculated with the discount."
-msgstr ""
+msgstr "指定固定金额来添加或减去(如果负)，用作折扣来计算金额。"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -2099,6 +2126,8 @@ msgid ""
 "Consumable: Will not imply stock management for this product. \n"
 "Stockable product: Will imply stock management for this product."
 msgstr ""
+"消耗品：不会为该产品进行库存管理\n"
+"可库存产品：将为该产品进行库存管理"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -2118,6 +2147,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"               单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为买卖的的每一样都定义一个产品。可以是物理产品、消耗品、或者服务。\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: view:product.product:0
@@ -2134,7 +2169,7 @@ msgstr "包装类型"
 msgid ""
 "A category of the view type is a virtual category that can be used as the "
 "parent of another category to create a hierarchical structure."
-msgstr ""
+msgstr "视图类型的分类是一个可视分类，用来做其它分类的上级，以此建立一个分层结构。"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2146,14 +2181,14 @@ msgstr "包装"
 msgid ""
 "Specify a template if this rule only applies to one product template. Keep "
 "empty otherwise."
-msgstr ""
+msgstr "如果这条规则只能用于一个产品模版，则指定一个模版。否则留空。"
 
 #. module: product
 #: model:product.template,description:product.product_product_2_product_template
 msgid ""
 "This type of service include assistance for security questions, system "
 "configuration requirements, implementation or special needs."
-msgstr ""
+msgstr "服务类型包括安全问题的辅助，系统配置请求，实施或者特别的需求。"
 
 #. module: product
 #: field:product.product,image:0
@@ -2173,6 +2208,10 @@ msgid ""
 "2GB RAM\n"
 "HDD SH-1"
 msgstr ""
+"19“显示器\n"
+"2GB内存\n"
+"酷睿i5 2.7Ghz  处理器\n"
+"硬盘 SH-1"
 
 #. module: product
 #: view:product.template:0
@@ -2182,17 +2221,17 @@ msgstr "说明"
 #. module: product
 #: model:res.groups,name:product.group_stock_packaging
 msgid "Manage Product Packaging"
-msgstr ""
+msgstr "管理产品包装"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
 msgid "Internal"
-msgstr ""
+msgstr "内置"
 
 #. module: product
 #: model:product.template,name:product.product_product_45_product_template
 msgid "Router R430"
-msgstr ""
+msgstr "路由器R430"
 
 #. module: product
 #: help:product.packaging,sequence:0
@@ -2264,7 +2303,7 @@ msgstr "可变的"
 #: field:product.product,message_comment_ids:0
 #: help:product.product,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: product
 #: field:product.template,rental:0
@@ -2284,7 +2323,7 @@ msgstr "最小上浮金额"
 #. module: product
 #: model:res.groups,name:product.group_uom
 msgid "Manage Multiple Units of Measure"
-msgstr ""
+msgstr "管理多个计量单位"
 
 #. module: product
 #: help:product.packaging,weight:0
@@ -2294,7 +2333,7 @@ msgstr "完整包装的重量，指货板或者包装箱"
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "例如: 1 * (本单位t) = 比例 * (参考单位)"
 
 #. module: product
 #: model:product.template,description:product.product_product_25_product_template
@@ -2304,6 +2343,10 @@ msgid ""
 "Standard-1294P Processor\n"
 "QWERTY keyboard"
 msgstr ""
+"17“显示器\n"
+"4GB内存\n"
+"标准1294P处理器\n"
+"QWERTY键盘"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2345,7 +2388,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_11_product_template
 msgid "Mouse, Laser"
-msgstr ""
+msgstr "激光鼠标"
 
 #. module: product
 #: view:product.template:0
@@ -2393,22 +2436,22 @@ msgid ""
 "Small-sized image of the product. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
-msgstr ""
+msgstr "产品的小尺寸图片。保持纵横比，自动缩放为64x64px。用于任何需要小图片的场合"
 
 #. module: product
 #: model:product.template,name:product.product_product_40_product_template
 msgid "Windows 7 Professional"
-msgstr ""
+msgstr "Windows 7 专业版"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference Unit of Measure for this category"
-msgstr ""
+msgstr "这个类别的参考计量单位"
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier Unit of Measure"
-msgstr ""
+msgstr "供应商单位"
 
 #. module: product
 #: view:product.product:0
@@ -2419,7 +2462,7 @@ msgstr "产品系列"
 #. module: product
 #: model:product.template,name:product.product_product_6_product_template
 msgid "15” LCD Monitor"
-msgstr ""
+msgstr "15” LCD 显示器"
 
 #. module: product
 #: code:addons/product/pricelist.py:374
@@ -2472,7 +2515,7 @@ msgstr "产品类别"
 #. module: product
 #: model:product.template,description:product.product_product_19_product_template
 msgid "On demand hard-disk having capacity based on requirement."
-msgstr ""
+msgstr "基于需求的硬盘容量要求"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2487,7 +2530,7 @@ msgstr "生命周期结束"
 #. module: product
 #: model:product.template,name:product.product_product_15_product_template
 msgid "RAM SR3"
-msgstr ""
+msgstr "内存Sr3"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2528,7 +2571,7 @@ msgstr "标价"
 msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
-msgstr ""
+msgstr "计量单位转换只能在同一个类型之间进行。转换基于比例"
 
 #. module: product
 #: constraint:product.category:0
@@ -2541,22 +2584,22 @@ msgid ""
 "Medium-sized image of the product. It is automatically resized as a "
 "128x128px image, with aspect ratio preserved, only when the image exceeds "
 "one of those sizes. Use this field in form views or some kanban views."
-msgstr ""
+msgstr "产品的中等尺寸的图片。保持纵横比例，图像超出尺寸后，自动缩放为128x128px ，这字段通常用于看板视图。"
 
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "例如: 1*(参考单位) = 比例 * （本单位）"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Unit of Measure."
-msgstr ""
+msgstr "这是转换为默认计量单位的值"
 
 #. module: product
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "每个用途只能定义一个值"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index 144ee94149b..c0290a08601 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-03-20 09:13+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 11:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -36,7 +36,7 @@ msgstr "从"
 #: help:product.product,total_cost:0
 msgid ""
 "Sum of Multiplication of Invoice price and quantity of Supplier Invoices "
-msgstr ""
+msgstr "供应商发票的开票价格和数量相乘的合计 "
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -51,7 +51,7 @@ msgstr "日期到"
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
-msgstr ""
+msgstr "营业额-标准价格"
 
 #. module: product_margin
 #: field:product.product,date_from:0
@@ -78,7 +78,7 @@ msgstr "产品"
 #. module: product_margin
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: product_margin
 #: view:product.product:0
@@ -127,7 +127,7 @@ msgstr "已开票数量"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: product_margin
 #: view:product.product:0
@@ -138,7 +138,7 @@ msgstr "总成本"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multiplication of Cost price and quantity of Supplier Invoices"
-msgstr ""
+msgstr "供应商发票的成本价格和数量相乘的合计"
 
 #. module: product_margin
 #: field:product.product,expected_margin:0
@@ -158,13 +158,13 @@ msgstr "预计利润 / 预计销售 * 100"
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices."
-msgstr ""
+msgstr "客户发票中的平均价格"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
 msgid ""
 "Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+msgstr "客户发票的销售分类价格和数量相乘的汇总"
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -192,7 +192,7 @@ msgstr "销售差额"
 #: help:product.product,turnover:0
 msgid ""
 "Sum of Multiplication of Invoice price and quantity of Customer Invoices"
-msgstr ""
+msgstr "客户发票的开票价格和数量相乘的汇总"
 
 #. module: product_margin
 #: field:product.product,normal_cost:0
@@ -282,7 +282,7 @@ msgstr "客户发票数量合计"
 #. module: product_margin
 #: view:product.margin:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 4fc12ab0747..fb245a0510a 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -23,7 +23,7 @@
                             <tree editable="top" string="Timesheets">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)" groups="analytic.group_analytic_accounting"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
                                 <field invisible="1" name="journal_id"/>
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 85b8b7bbb5a..f05038ac05d 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 18:18+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14:57+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_long_term
 #: field:account.analytic.account,use_phases:0
@@ -162,7 +162,7 @@ msgstr "结束日期"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -205,7 +205,7 @@ msgstr "按相关任务计算"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
@@ -215,7 +215,7 @@ msgstr "最早开始时间"
 #. module: project_long_term
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能递归创建辅助核算项"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -226,6 +226,10 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"阶段被创建，状态是“草稿”，\n"
+"阶段开始，状态是“进行中”，\n"
+"此阶段需要复审，状态是\"待定\"，\n"
+"阶段结束，状态是“完成”。"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
@@ -266,13 +270,13 @@ msgstr "项目任务列表"
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
-msgstr ""
+msgstr "这个项目上的资源能被调度程序自动计算。"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -306,7 +310,7 @@ msgstr "开始日期"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -321,7 +325,7 @@ msgstr "草稿"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "持续时间单位"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -333,7 +337,7 @@ msgstr "等待中"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -345,7 +349,7 @@ msgstr "用户"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "单位（单位）是持续时间的单位"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
@@ -355,7 +359,7 @@ msgstr "计算任务计划"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "动作"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -436,7 +440,7 @@ msgstr "用户"
 #. module: project_long_term
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
-msgstr ""
+msgstr "如果你计划使用分阶段调度，选中这个字段。"
 
 #. module: project_long_term
 #: view:project.project:0
@@ -493,7 +497,7 @@ msgstr ""
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "开发阶段"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 4654e07817f..385b0db662f 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-11 13:58+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14:50+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
@@ -40,7 +40,7 @@ msgstr "错误！任务结束日期必须大于任务开始日期"
 #: code:addons/project_mrp/project_procurement.py:93
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -70,7 +70,7 @@ msgstr "错误！不能创建循环引用的任务"
 #. module: project_mrp
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -93,7 +93,7 @@ msgstr "任务"
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "当你卖 服务给客户时"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -114,7 +114,7 @@ msgstr "销售订单明细"
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: project_mrp
 #: view:product.product:0
@@ -125,19 +125,22 @@ msgid ""
 "                        in the project related to the contract of the sale "
 "order."
 msgstr ""
+"将被创建为\n"
+"                   以跟进要做的作业。此任务将显示\n"
+"                   在项目中销售订单有关的合同。"
 
 #. module: project_mrp
 #: code:addons/project_mrp/project_procurement.py:87
 #, python-format
 msgid "Task created."
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
@@ -162,7 +165,7 @@ msgstr "销售订单"
 #. module: project_mrp
 #: view:project.task:0
 msgid "Order Line"
-msgstr ""
+msgstr "订单明细"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
@@ -172,7 +175,7 @@ msgstr "在销售订单这事务是销售服务"
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
-msgstr ""
+msgstr "一个任务"
 
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr "如果采购方式是按单和供应方式是生产"
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index c9fb424b3dc..d344a9bd1df 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-03-20 09:53+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 15:29+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -24,7 +24,7 @@ msgstr "按用户打印任务"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "按年分组"
 
 #. module: project_timesheet
 #: constraint:project.task:0
@@ -42,7 +42,7 @@ msgstr "有关的时间ID"
 msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
-msgstr ""
+msgstr "你不能删除被指派给项目的合作伙伴，但你能不选中“可用”。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -54,7 +54,7 @@ msgstr "任务进度"
 #, python-format
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
-msgstr ""
+msgstr "你不能选择关闭或者取消状态的辅助核算项"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -76,7 +76,7 @@ msgstr "十月"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "计工单"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -87,7 +87,7 @@ msgstr "年"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "应记账"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -104,7 +104,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "辅助核算项/项目"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -119,7 +119,7 @@ msgstr "错误！项目的开始日期必须小于项目的结束日期"
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "客户项目"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:89
@@ -129,6 +129,8 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"请在相关的员工上面定义产品和产品分类属性科目。\n"
+"填在员工表单的人力资源标签。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -168,22 +170,22 @@ msgstr "项目的签入/签出"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "应记账的项目"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "要续签的合同"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "小时"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "按月分组"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -249,6 +251,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                你可以在这里找到为了合同而产生的计工单和采购，并可以由此重开发票给客人。\n"
+"                如果你要记录新的任务到发票，你必须使用计工单菜单替代。\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -309,7 +316,7 @@ msgstr "输入你在此任务上花费的工时"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "请为用户 \"%s\"定义员工。你必须创建一个。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -320,7 +327,7 @@ msgstr "业务伙伴"
 #: code:addons/project_timesheet/project_timesheet.py:294
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "无效的辅助核算项"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -349,6 +356,8 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"请在相关的员工上面定义产品和产品分类属性科目。\n"
+"填在员工表单的计工单标签。"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:60
@@ -356,12 +365,12 @@ msgstr ""
 msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
-msgstr ""
+msgstr "<p>根据合同的条款，项目的计工单可开票给 %s </p>"
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "错误，您不能创建循环引用的会员用户"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
@@ -394,7 +403,7 @@ msgstr "六月"
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -405,7 +414,7 @@ msgstr "月份"
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:57
@@ -413,7 +422,7 @@ msgstr ""
 msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\">记录你为项目所做的计工单 '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
@@ -426,7 +435,7 @@ msgstr "计工单工时"
 msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
-msgstr ""
+msgstr "请在相关的员工上定义账簿。填在员工表单的计工单标签。"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
@@ -436,7 +445,7 @@ msgstr "输入计工单"
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #~ msgid "Project Timesheet"
 #~ msgstr "项目时间表"
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 4190a625fdb..be35fb9d6bc 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -44,7 +44,7 @@
        % if object.partner_ref:
        &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
        % endif
-       % if object.user_id:
+       % if object.validator:
        &nbsp;&nbsp;Your contact: <a href="mailto:${object.validator.email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
        % endif
     </p>
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 31d364dc5b1..e21310eb3fb 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/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: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-26 14:14+0000\n"
+"PO-Revision-Date: 2012-11-27 12:03+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
 "X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase
@@ -708,12 +708,12 @@ msgstr "入库产品"
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "or"
-msgstr "或"
+msgstr "or"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr "采购提前时间"
+msgstr "采购提前期"
 
 #. module: purchase
 #: constraint:res.partner:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 97ef98bb8cd..684707ea258 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -189,7 +189,8 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]},
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
+            readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
@@ -414,6 +415,20 @@ class purchase_order(osv.osv):
             'context': ctx,
         }
 
+    def print_quotation(self, cr, uid, ids, context=None):
+        '''
+        This function prints the request for quotation and mark it as sent, so that we can see more easily the next step of the workflow
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order', ids[0], 'send_rfq', cr)
+        datas = {
+                 'model': 'purchase.order',
+                 'ids': ids,
+                 'form': self.read(cr, uid, ids[0], context=context),
+        }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'purchase.quotation', 'datas': datas, 'nodestroy': True}
+
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         todo = []
@@ -1169,4 +1184,13 @@ class product_template(osv.osv):
 
 product_template()
 
+class mail_compose_message(osv.osv):
+    _inherit = 'mail.compose.message'
+    def send_mail(self, cr, uid, ids, context=None):
+        context = context or {}
+        if context.get('default_model') == 'purchase.order' and context.get('default_res_id'):
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr)
+        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4f8fc34b038..9397a95c970 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -198,7 +198,10 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="wkf_send_rfq" states="draft" string="Send Request for Quotation" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="wkf_send_rfq" states="draft" string="Send by EMail" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="wkf_send_rfq" states="sent" string="Send by EMail" type="object" context="{'send_rfq':True}"/>
+                    <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                    <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
                     <button name="purchase_confirm" states="draft" string="Confirm Order"/>
                     <button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
@@ -653,7 +656,7 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
-                     <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                     <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
                 </xpath>
                 <xpath expr="//field[@name='supplier_taxes_id']" position="replace" >
                      <field name="supplier_taxes_id" colspan="2" widget="many2many_tags" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 9e781d661f2..13a54031254 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,9 +43,6 @@ class purchase_config_settings(osv.osv_memory):
         'group_costing_method':fields.boolean("Compute product cost price based on average cost",
             implied_group='product.group_costing_method',
             help="""Allows you to compute product cost price based on average cost."""),
-        'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
-            implied_group='purchase.group_delivery_invoice_address',
-            help="Allows you to specify different delivery and invoice addresses on a purchase order."),
         'module_warning': fields.boolean("Alerts by products or supplier",
             help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
 Example: Product: this product is deprecated, do not purchase more than 5.
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index f659d7b437f..7f1cfc64f39 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -54,10 +54,6 @@
                                 <field name="group_uom" class="oe_inline"/>
                                 <label for="group_uom"/>
                             </div>
-                            <div>
-                                <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                <label for="group_purchase_delivery_address"/>
-                            </div>
                             <div>
                                 <field name="group_costing_method" class="oe_inline"/>
                                 <label for="group_costing_method"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 637a1722c7e..f9a711c1c75 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -15,11 +15,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_delivery_invoice_address" model="res.groups">
-        <field name="name">Addresses in Purchase Orders</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 579e3b5ec62..24efff67fb9 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-03-20 09:56+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:35+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:36+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "分析控制台"
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 5624b39a064..81ebadcc9f8 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/i18n/zh_CN.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-10-25 17:31+0000\n"
+"PO-Revision-Date: 2012-11-27 14:37+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "尚未核准的采购单"
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "限制为需要二次核准"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "采购订单等待核准"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "待核准"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "采购核准后的金额"
 
 #~ msgid "Configure Limit Amount for Purchase"
 #~ msgstr "设置采购的限定金额"
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 9e8c0893d30..f5f0367ad4b 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <group>
-                        <field name="partner_id"/>
+                        <field name="partner_id" context="{'default_supplier': 1, 'default_customer': 0}"/>
                     </group>
                     <footer>
                         <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 3c944e6515b..d70700ec43d 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-08-03 07:31+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 13:39+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:02+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -106,7 +106,7 @@ msgstr "发票日期"
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index a9881e6e75b..34dbc037667 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-07-13 16:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 15:45+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -55,7 +55,7 @@ msgid ""
 "                    position as each object is printed on a separate HTML.   "
 "                                                         but memory and disk "
 "usage is wider"
-msgstr ""
+msgstr "这个模式允许 打印在独立的 HTML中每个对象 更精确的定位。但是内存和硬盘空间占用更多。"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -72,7 +72,7 @@ msgstr "公司"
 #: code:addons/report_webkit/webkit_report.py:235
 #, python-format
 msgid "Please set a header in company settings."
-msgstr ""
+msgstr "请在公司设置里设定页眉"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -98,7 +98,7 @@ msgstr "图片名"
 #: model:ir.actions.act_window,name:report_webkit.action_header_webkit
 #: model:ir.ui.menu,name:report_webkit.menu_header_webkit
 msgid "Webkit Headers/Footers"
-msgstr ""
+msgstr "Webkit 页眉/页脚"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -124,7 +124,7 @@ msgstr "B6 20 125 x 176 毫米"
 #: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "Webkit error"
-msgstr ""
+msgstr "Webkit 错误"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -139,7 +139,7 @@ msgstr "B2 17 500 x 707 毫米"
 #: code:addons/report_webkit/webkit_report.py:307
 #, python-format
 msgid "Webkit render!"
-msgstr ""
+msgstr "Webkit 渲染！"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
@@ -149,7 +149,7 @@ msgstr "ir.header_img"
 #. module: report_webkit
 #: field:ir.actions.report.xml,precise_mode:0
 msgid "Precise Mode"
-msgstr ""
+msgstr "精确模式"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:96
@@ -160,6 +160,10 @@ msgid ""
 "http://code.google.com/p/wkhtmltopdf/downloads/list and set the path in the "
 "ir.config_parameter with the webkit_path key.Minimal version is 0.9.9"
 msgstr ""
+"请安装执行文件在你的系统中（sudo apt-get install "
+"wkhtmltopd）或者从这里下载http://code.google.com/p/wkhtmltopdf/downloads/list 并且用 "
+"webkit_path 键值设置路径在  ir.config_parameter。\r\n"
+"最低版本是0.9.9."
 
 #. module: report_webkit
 #: constraint:res.company:0
@@ -216,7 +220,7 @@ msgstr "报表头"
 #: code:addons/report_webkit/webkit_report.py:95
 #, python-format
 msgid "Wkhtmltopdf library path is not set"
-msgstr ""
+msgstr "Wkhtmltopdf 库的路径没设置"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -279,7 +283,7 @@ msgstr "B3 18 353 x 500 毫米"
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
 msgid "Webkit Header"
-msgstr ""
+msgstr "Webkit 页眉"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_debug:0
@@ -294,7 +298,7 @@ msgstr "图片"
 #. module: report_webkit
 #: view:ir.header_img:0
 msgid "Header Image"
-msgstr ""
+msgstr "页眉图像"
 
 #. module: report_webkit
 #: field:res.company,header_webkit:0
@@ -321,7 +325,7 @@ msgstr "肖像"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,orientation:0
@@ -337,7 +341,7 @@ msgstr "B8 22 62 x 88 毫米"
 #: code:addons/report_webkit/webkit_report.py:178
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
-msgstr ""
+msgstr "命令'wkhtmltopdf'失败，错误代码=%s，  消息: %s"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -383,7 +387,7 @@ msgstr "右边距（毫米）"
 #: code:addons/report_webkit/webkit_report.py:229
 #, python-format
 msgid "Webkit report template not found!"
-msgstr ""
+msgstr "Webkit 报表模版没找到！"
 
 #. module: report_webkit
 #: field:ir.header_webkit,orientation:0
@@ -396,7 +400,7 @@ msgid ""
 "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
 "Install a static version of the library if you experience missing "
 "header/footers on Linux."
-msgstr ""
+msgstr "wkhtmltopdf 执行文件的全路径，要求版本 0.9.9  。如果你在Linux遇到找不到页眉/页脚，安装一个静态库版本，"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -416,7 +420,7 @@ msgstr ":B10 16 31 x 44 毫米"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
@@ -432,13 +436,13 @@ msgstr "B4 19 250 x 353 毫米"
 #: model:ir.actions.act_window,name:report_webkit.action_header_img
 #: model:ir.ui.menu,name:report_webkit.menu_header_img
 msgid "Webkit Logos"
-msgstr ""
+msgstr "Webkit 标志"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:173
 #, python-format
 msgid "No diagnosis message was provided"
-msgstr ""
+msgstr "没有诊断信息提供"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -473,7 +477,7 @@ msgstr "B0 14 1000 x 1414 毫米"
 #. module: report_webkit
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名必须唯一！"
 
 #. module: report_webkit
 #: field:ir.header_img,name:0
@@ -532,12 +536,12 @@ msgstr "ir.actions.report.xml"
 #: code:addons/report_webkit/webkit_report.py:175
 #, python-format
 msgid "The following diagnosis message was provided:\n"
-msgstr ""
+msgstr "下面的诊断信息被提供\n"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "HTML Header"
-msgstr ""
+msgstr "HTML 页眉"
 
 #, python-format
 #~ msgid "Webkit raise an error"
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 878c62d8b1c..4b826ef6f0d 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:33+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -97,7 +97,7 @@ msgstr "请确保已经配置好适当的工作日的工作时间！"
 #: code:addons/resource/resource.py:310
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -131,7 +131,7 @@ msgstr "周五"
 #. module: resource
 #: view:resource.calendar.attendance:0
 msgid "Hours"
-msgstr ""
+msgstr "小时"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -157,7 +157,7 @@ msgstr "搜索准假工作周期"
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -203,7 +203,7 @@ msgstr "工作时间"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Start and End time of working."
-msgstr ""
+msgstr "工作开始和结束时间。"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -298,6 +298,8 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficiency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"这个字段描述完成任务的资源的效率。比如：例如： 资源单独投入一个阶段， 5 天 5 个任务指派给他，这一阶段默认情况将显示 "
+"100%的负荷，下，但如果我们把效率设置为 200%，他的负荷将只是 50%。"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
@@ -338,7 +340,7 @@ msgstr "人"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index d1cb0286f2a..98afc7fe847 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:46+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 21:47+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:03+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -44,7 +44,7 @@ msgstr "Satış Birimi"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Satış Temsülcisi"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -66,28 +66,28 @@ msgstr "Siparişi İptal Et"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Hatalı Veri"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "Avans tutarı pozitif değer olmak zorunda."
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Eğer işaretlerseniz yeni mesajlar ilginizi gerektirir."
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Yanlış"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Vergi"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -141,17 +141,17 @@ msgstr "Varsayılan Ödeme Şartı"
 #: code:addons/sale/sale.py:696
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Fatura <b>ödendi</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Farklı ölçü birimleri kullanmaya izin ver"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Yüzde"
 
 #. module: sale
 #: report:sale.order:0
@@ -211,17 +211,17 @@ msgstr "Diğer Bilgiler"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Faturalama İşlemi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Satış siparişi tamamlandı"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -285,7 +285,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Teklif "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -355,12 +355,12 @@ msgstr "Ekim"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Fatura Görüntüle"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
@@ -443,7 +443,7 @@ msgstr "Şu anki sipariş için fatura adresi."
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -491,12 +491,12 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: sale
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN kodu"
 
 #. module: sale
 #: field:sale.order,invoice_exists:0
@@ -589,7 +589,7 @@ msgstr "Öğe #"
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(güncelle)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -604,7 +604,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: sale
 #: report:sale.order:0
@@ -690,12 +690,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Yapılandırma Hatası!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "E-posta ile Gönder"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -799,12 +799,12 @@ msgstr "Vergiler :"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "Talep Üzerine"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
@@ -940,7 +940,7 @@ msgstr "Fiyat"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "Teklif No"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1045,7 +1045,7 @@ msgstr "Bekleyen Planlama"
 #: view:sale.order.line:0
 #: field:sale.report,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Ölçü Birimi"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1204,7 +1204,7 @@ msgstr ""
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "Şözleşmelerin Yönetimi"
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index d7fca82fcd3..4032f45353b 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.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: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-10-25 17:36+0000\n"
+"PO-Revision-Date: 2012-11-27 13:35+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:04+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -42,7 +42,7 @@ msgstr "销售单位"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -64,28 +64,28 @@ msgstr "取消订单"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "错误的数据"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "定金必须是正的"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "税"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -110,7 +110,7 @@ msgstr "辅助核算项"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: sale
 #: view:sale.report:0
@@ -121,7 +121,7 @@ msgstr "数量#"
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "允许你为每个销售订单行应用折扣"
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -129,6 +129,8 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"允许基于每种客户类别的规则管理不同的价格。\n"
+"例如: 10%"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -139,17 +141,17 @@ msgstr "默认付款条件"
 #: code:addons/sale/sale.py:696
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "发票 <b>已经支付</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "允许使用不同的计量单位"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: sale
 #: report:sale.order:0
@@ -160,7 +162,7 @@ msgstr "折扣(%)"
 #: code:addons/sale/sale.py:807
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "请为这个产品定义收益科目: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -209,17 +211,17 @@ msgstr "其它信息"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "开发票过程"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "销售订单完成"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -231,7 +233,7 @@ msgstr "报价单或销售订单"
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "允许你选择和维护产品的不同计量单位"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -283,7 +285,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "报价单 "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -353,19 +355,19 @@ msgstr "10月"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "查看发票"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "预付款：%s %s"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_quotations
@@ -385,7 +387,7 @@ msgstr "数量"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "当前销售订单的发运地址"
 
 #. module: sale
 #: report:sale.order:0
@@ -411,7 +413,7 @@ msgstr "处理中"
 #: code:addons/sale/sale.py:701
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "发票草稿 %s %s <b>等待核准</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -424,7 +426,7 @@ msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或
 #: code:addons/sale/sale.py:864
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
+msgstr "你不能取消已经被开票的销售订单行。"
 
 #. module: sale
 #: report:sale.order:0
@@ -439,12 +441,12 @@ msgstr "当前销售订单的发票地址。"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "发运前"
 
 #. module: sale
 #: code:addons/sale/sale.py:824
@@ -452,22 +454,22 @@ msgstr ""
 msgid ""
 "There is no Fiscal Position defined or Income category account defined for "
 "default properties of Product categories."
-msgstr ""
+msgstr "产品类别的属性中，没有定义财务结构或者 收益类科目。"
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "销售订单中的地址"
 
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract / Analytic"
-msgstr ""
+msgstr "合同/分析"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "允许按销售订单行开票"
 
 #. module: sale
 #: view:sale.report:0
@@ -486,7 +488,7 @@ msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: sale
 #: constraint:res.partner:0
@@ -503,7 +505,7 @@ msgstr "已开票"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "销售辅助核算"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -518,7 +520,7 @@ msgstr "分配给业务伙伴"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 msgid "Invoice Order"
-msgstr ""
+msgstr "开票订单"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -543,7 +545,7 @@ msgstr "小计"
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "允许在销售订单行上设置折扣"
 
 #. module: sale
 #: report:sale.order:0
@@ -553,7 +555,7 @@ msgstr "发票地址:"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "计量单位 "
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
@@ -584,7 +586,7 @@ msgstr "明细#"
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "（更新）"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -594,7 +596,7 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "每个合同里，一个员工能有不同的角色"
 
 #. module: sale
 #: view:sale.order:0
@@ -635,7 +637,7 @@ msgstr "创建日期"
 #: code:addons/sale/sale.py:693
 #, python-format
 msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
+msgstr "销售订单 <em>%s</em> 设置为 <b>完成</b>"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -677,7 +679,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "没有收益科目定义为全局属性"
 
 #. module: sale
 #: code:addons/sale/sale.py:1005
@@ -685,12 +687,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "以邮件发送"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -794,17 +796,17 @@ msgstr "税:"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "需求"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -933,7 +935,7 @@ msgstr "价格"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "报价单编号"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -948,7 +950,7 @@ msgstr "运货地址:"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
+msgstr "允许在销售订单指定一个辅助核算科目"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
@@ -959,28 +961,28 @@ msgstr "销售订单草稿状态"
 #: code:addons/sale/sale.py:681
 #, python-format
 msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgstr "报价单 <em>%s</em> <b>已创建</b>."
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "新的报价单副本"
 
 #. module: sale
 #: code:addons/sale/sale.py:1028
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "不能删除 '%s'状态的销售订单行。"
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
 msgid "Properties on lines"
-msgstr ""
+msgstr "行上的属性"
 
 #. module: sale
 #: code:addons/sale/sale.py:909
@@ -988,7 +990,7 @@ msgstr ""
 msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
-msgstr ""
+msgstr "在挑选产品前，在 销售表单选择一个客户"
 
 #. module: sale
 #: view:sale.order:0
@@ -1009,7 +1011,7 @@ msgstr "确认报价单"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "订单行开票"
 
 #. module: sale
 #: view:sale.order:0
@@ -1021,7 +1023,7 @@ msgstr "分组..."
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "产品特性"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1054,7 +1056,7 @@ msgstr "为整个销售单开票"
 #: view:sale.order:0
 #: field:sale.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1106,7 +1108,7 @@ msgstr "创建发票"
 #: code:addons/sale/sale.py:1028
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: sale
 #: report:sale.order:0
@@ -1140,7 +1142,7 @@ msgstr "生成发票"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "销售订单的 #"
 
 #. module: sale
 #: view:sale.order:0
@@ -1163,12 +1165,12 @@ msgstr "7月"
 msgid ""
 "After clicking 'Show Lines to Invoice', select lines to invoice and create "
 "the invoice from the 'More' dropdown menu."
-msgstr ""
+msgstr "点击“显示要开票的行”"
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sale order has at least one invoice."
-msgstr ""
+msgstr "表明销售订单至少有一个发票"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1185,17 +1187,17 @@ msgstr "发票组"
 #: code:addons/sale/sale.py:685
 #, python-format
 msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
+msgstr "为 <em>%s</em>的报价单 <b>已经转化为</b>销售订单 %s %s."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sale Order"
-msgstr ""
+msgstr "开发票 销售订单"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "合同管理"
 
 #. module: sale
 #: view:sale.report:0
@@ -1362,7 +1364,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "为每个客户使用价格表来适配你的价格"
 
 #. module: sale
 #: view:sale.order.line:0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 98c810aac87..f248f4735e0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -465,8 +465,8 @@
             <field name="arch" type="xml">
                 <form string="Sales Order Lines" version="7.0">
                     <header>
-                        <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
                         <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight" groups="base.group_user"/>
+                        <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
                         <button name="button_done" string="Done" type="object"  attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 8458684cd72..360c42ceb51 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -109,9 +109,30 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
         if not invoices:
             raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
-
+        if context.get('open_invoices', False):
+            return self.open_invoices( cr, uid, ids, res, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
+    def open_invoices(self, cr, uid, ids, invoice_ids, context=None):
+        """ open a view on one of the given invoice_ids """
+        ir_model_data = self.pool.get('ir.model.data')
+        form_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_form')
+        form_id = form_res and form_res[1] or False
+        tree_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_tree')
+        tree_id = tree_res and tree_res[1] or False
+ 
+        return {
+            'name': _('Invoice'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'account.invoice',
+            'res_id': invoice_ids,
+            'view_id': False,
+            'views': [(form_id, 'form'), (tree_id, 'tree')],
+            'context': {'type': 'out_invoice'},
+            'type': 'ir.actions.act_window',
+        }
+
 sale_order_line_make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 2eb5d1ae47f..6144ff489f4 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -7,11 +7,19 @@
             <field name="arch" type="xml">
              <form string="Create invoices" version="7.0">
                 <header>
+                    <separator string="Do you want to invoice the selected sale order lines?" />
+                </header>
+                <p class="oe_grey">
+                    All items in these order lines will be invoiced. You can also invoice a percentage of the sale order 
+                    or a fixed price (for advances) directly from the sale order form if you prefer.
+                </p>
+                <footer>
+                    <button name="make_invoices" string="Create &amp; View Invoice" type="object"
+                        context="{'open_invoices': True}" class="oe_highlight"/>
                     <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <separator string="Do you really want to create the invoice(s)?" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index f9678050a1a..b7187894da0 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-03-20 10:14+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:25+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,12 +24,12 @@ msgstr "分析控制台"
 #. module: sale_analytic_plans
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index 4fc29c14698..4fbea108bd1 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"PO-Revision-Date: 2012-11-27 14:27+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -57,7 +57,7 @@ msgstr "商机： %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "这个客户没有定义地址"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -74,19 +74,19 @@ msgstr "销售团队"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "创建询价单"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "商机 <b>被转换</b> 报价单 <em>%s</em>."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "数据不足！"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -118,17 +118,17 @@ msgstr "报价"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "标记为已赢得"
 
 #~ msgid "Products"
 #~ msgstr "产品"
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 88045b73ddb..6fd99e6bae2 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 13:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:24+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid ""
 "This invoicing type will be used, by default, to invoice the current partner."
-msgstr ""
+msgstr "这种开票类型已经被使用，默认开票给当前的合作伙伴"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -69,12 +69,12 @@ msgstr "开发票"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: sale_journal
 #: help:sale.order,invoice_type_id:0
 msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "基于选择的选项生成发票。"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
@@ -116,17 +116,17 @@ msgstr "发票类型对业务伙伴，销售订单和发货订单是有用的。
 #: sql_constraint:stock.picking.in:0
 #: sql_constraint:stock.picking.out:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Type"
-msgstr ""
+msgstr "开票类型"
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "错误，您不能创建循环引用的会员用户"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
@@ -138,7 +138,7 @@ msgstr "发票类型"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
@@ -153,7 +153,7 @@ msgstr "销售单"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "送货单"
 
 #~ msgid "Set to Draft"
 #~ msgstr "设为草稿"
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 8b88dcfd3b6..4d08f59b636 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-06-28 05:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -32,7 +32,7 @@ msgstr "成本价"
 msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
-msgstr ""
+msgstr "给出在单价和成本价之间计算出来的利润率"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index bbf77983511..0c1d519114e 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"PO-Revision-Date: 2012-11-27 13:53+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -25,7 +25,7 @@ msgstr "在销售订单中标识出相关客户"
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "销售名称"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,7 +35,7 @@ msgstr "生产单"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "销售单号"
 
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
index c79939c5348..4b641453baa 100644
--- a/addons/sale_order_dates/i18n/zh_CN.po
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-06-28 05:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 14:05+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_order_dates
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -45,7 +45,7 @@ msgstr "创建装箱单日期"
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date requested by the customer for the sale."
-msgstr ""
+msgstr "客户要求的日期"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -60,7 +60,7 @@ msgstr "销售订单"
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Committed date for delivery."
-msgstr ""
+msgstr "承诺发运日期"
 
 #~ msgid "Sales Order Dates"
 #~ msgstr "销售订单日期"
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index 10773b44a3f..a849df295d4 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -52,6 +52,7 @@ You can choose flexible invoicing methods:
                    'company_view.xml',
                    'sale_stock_view.xml',
                    'sale_stock_workflow.xml',
+                   'stock_view.xml',
                    'res_config_view.xml',
                    'report/sale_report_view.xml',
                    'process/sale_stock_process.xml',
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index b569da9962b..cefef3bb4b4 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.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: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-08 03:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 12:39+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company the pickings and moves belong."
-msgstr ""
+msgstr "用来了解属于哪个公司的的分拣和移动"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -72,7 +72,7 @@ msgstr "库位用于提供目标的库位"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你必须为这个产品指定序列号"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -157,7 +157,7 @@ msgstr "拉式流"
 #. module: stock_location
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
@@ -188,7 +188,7 @@ msgstr "按库存生产"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr ""
+msgstr "从其它库位拉动"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -230,7 +230,7 @@ msgstr "这些规则确定了产品在整个库位树的正确路径。"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "你不能从视图类型的库位移动"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -267,7 +267,7 @@ msgstr "需要提供目标库位"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "您企图为不一样的产品创建批号"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -345,7 +345,7 @@ msgstr "收货"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: stock_location
 #: view:product.product:0
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 05c19c53718..39dd650e475 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-23 16:02+0000\n"
+"PO-Revision-Date: 2012-11-27 14:21+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -29,7 +29,7 @@ msgstr "生产单"
 #. module: stock_no_autopicking
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
@@ -56,7 +56,7 @@ msgstr "订单数量不能是负数或者0！"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件"
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
new file mode 100644
index 00000000000..2f27d66ad8a
--- /dev/null
+++ b/addons/stock_planning/i18n/zh_CN.po
@@ -0,0 +1,1664 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-11-27 16:40+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr "选定的周期没预计,选定的分类没产品!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr "如果没选定仓库的入仓,库存,出仓的计算方式,检查选定仓库的库位."
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr "最大库存规则"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr "估值将为价格乘于产品数量."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr "即将入库必须大于0!"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr "在计算周期前的计划出库,在本周期开始时间和计算周期前的某天."
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr "关注仓库的预计.如果在库存计划期间您需要在所有仓库中选择一个当前仓库做销售预计."
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr "预计出仓"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr "即将入库"
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr "创建预计明细"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr "确认所有计算周期内的出仓调拨数量."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr "创建周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr "在选定周期指定的仓库里其选择的产品的所有销售预计."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr "最小库存规则标识"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr "关注这周期的预计"
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr "只有库存库位"
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr "本期这仓库已派件出去的数量"
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr "已确认的入库"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr "本期状况"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
+msgid ""
+"This wizard helps with the creation of stock planning periods. These periods "
+"are independent of financial periods. If you need periods other than day-, "
+"week- or month-based, you may also add then manually."
+msgstr "这个向导帮助建立库存计划周期。这些周期独立于财务会计周期.如果你需要除了日、星期或者月份基础的周期，你可以手工添加."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "创建月度"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr "stock.period.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr "之前的计划出库"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr "所有产品的预计"
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr "为仓库在最小库存规则设置最大数量"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "周期:"
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Check to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr "为了 在选定仓库的库存库位生成需求，选中。如果不选择，需求将被产品到仓库的输入库位。"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr "本期这仓库已装箱的数量."
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "No products in selected category !"
+msgstr "在选定的分类没产品!"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr "库存和销售预计"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr "stock.sale.forecast"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr "计划入库"
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr "库存模拟"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr "stock.planning.createlines"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr "确认计算周期前即将入库(已包括入库).在本期开始日期和在计算周期开始前的某天."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr "搜索销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr "用户周期 5"
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr "需求日志或计划明细里的内部供求"
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr "公司在选定的周期其指定产品的所有的预计销售(所有仓库)."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr "用户周期 1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr "用户周期 3"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr "库存计划"
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr "最少库存规则"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr "接收(即将入库)入库"
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr "创建"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr "主需求日程表"
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr "过去/未来"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr "关注对这产品分类创建的产品预计"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr "库存周期"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr "stock.sale.forecast.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+"在选定周期结束时库存的模拟\n"
+"    对本期它是: 初始库存 - 已出库 + 已进库 - 预计出库 + 即将入库\n"
+"    对未来周期它是: 初始库存 - 之前的计划出库 +之前的即将入库 - 计划出库 + 计划入库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr "勾选,查看公司的销售"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "每个部门:"
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr "之前的入库"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#, python-format
+msgid ""
+" Procurement created by MPS for user: %s   Creation Date: %s                 "
+"                        \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+" MPS  创建的采购，用户: %s ， 创建日期 : %s .                                       \n"
+"周期: %s :      \n"
+"                                                                         \n"
+"根据状态：                                    \n"
+"仓库预计: %s                                     \n"
+"初始库存: %s\n"
+"计划出库: %s , 计划入库: %s .\n"
+"已出库: %s , 已入库: %s .\n"
+"确认出库: %s , 确认入库: %s .\n"
+"计划前出库: %s , 计划前入库: %s .\n"
+"预计出库: %s , 即将入库: %s .\n"
+"库存模拟: %s , 最少库存: %s ."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#: code:addons/stock_planning/stock_planning.py:672
+#: code:addons/stock_planning/stock_planning.py:674
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "Error !"
+msgstr "错误！"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr "该用户"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr "预计"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr "从其它仓库提供"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr "计算计划"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Invalid action !"
+msgstr "无效的动作！"
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr "在本期前一天的库存数量."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procurement history"
+msgstr "需求历史"
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units from default category or from second category (UoS category)."
+msgstr "用作显示库存数量的单位。你能从默认或者第二个类别（销售单位目录）使用单位。"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr "创建周周期"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
+msgid ""
+"Stock periods are used for stock planning. Stock periods are independent of "
+"account periods. You can use wizard for creating periods and review them "
+"here."
+msgstr "库存周期用在库存计划。库存周期独立于财务会计周期。你能用向导来创建周期，并且在这里 复审。"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr "计算出的周期模拟"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr "用户周期 4"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr "库存和销售周期"
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr "公司预计"
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr "为仓库在最小库存规则设置最小数量"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr "每个用户:"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr "关注的仓库计划."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr "创建/审核"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr "仓库预计"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:674
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr "您必须指定源仓库不同于计算的(目标)仓库!"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Cannot delete a validated sales forecast!"
+msgstr "不能删除已经核准的销售预测"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr "公司周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr "产品计量单位"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Company Period1"
+msgstr "公司的会计周期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr "公司周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr "公司周期 3"
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr "开始日期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr "用户周期 2"
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr "审核预计"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr "计划将在选定的产品分类里创建.当您勾选\"所有产品预计\"这字段将被忽略."
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr "计划出仓"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Forecast Quantity"
+msgstr "预测数量"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr "预计"
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr "已关闭"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr "仓库 "
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr "用作显示库存数量的单位。你能从默认或者第二个类别（销售单位目录）使用单位。"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr "计算周期的计划和状况"
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr "在选择的产品选定的周期内输入指定仓库的计划出库数量.计划值看作确认的出库或销售预计.该值应大于或等于确认的出库."
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current Periods"
+msgstr "当前周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr "内部提供"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:724
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr "%s 包装列表 %s (%s, %s) %s %s \n"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr "创建销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr "周期 4"
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr "周期名称"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr "周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr "周期 3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr "周期 1"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
+msgid ""
+"This wizard helps create MPS planning lines for a given selected period and "
+"warehouse, so you don't have to create them one by one. The wizard doesn't "
+"duplicate lines if they already exist for this selection."
+msgstr ""
+"MPS  创建的采购，用户: %s ， 创建日期 : %s .                                              "
+" \r\n"
+"周期: %s : \r\n"
+"根据状态：%s\r\n"
+"仓库预计: %s\r\n"
+"初始库存: %s\r\n"
+"计划出库: %s , 计划入库: %s .\r\n"
+"已出库: %s , 已入库: %s .\r\n"
+"确认出库: %s , 确认入库: %s .\r\n"
+"计划前出库: %s , 计划前入库: %s .\r\n"
+"预计出库: %s , 即将入库: %s .\r\n"
+"库存模拟: %s , 最少库存: %s ."
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr "已确认的出库"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr "创建库存计划明细"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr "一般信息"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr "销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr "仓库周期 1"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales History"
+msgstr "销售日志"
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr "源仓库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecast Product quantity."
+msgstr "预测产品数量"
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr "库存存货库位"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+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."
+msgstr "勾选这选项将为选定的仓库和周期计划所有产品的预计.产品分类字段将被忽略."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:632
+#: code:addons/stock_planning/stock_planning.py:678
+#: code:addons/stock_planning/stock_planning.py:702
+#, python-format
+msgid "MPS(%s) %s"
+msgstr "主生产计划(%s) %s"
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr "已入库"
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr "产品计量单位类别"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
+msgid ""
+"This quantity sales forecast is an indication for Stock Planner to make "
+"procurement manually or to complement automatic procurement. You can use "
+"manual procurement with this forecast when some periods are exceptional for "
+"usual minimum stock rules."
+msgstr "销售预测数量只是为了库存计划进行手工采购，或者完成自动采购。当有些周期使用最小库存规则发生意外时，你能用这些预测进行手工采购 。"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
+msgid ""
+"The Master Procurement Schedule can be the main driver for warehouse "
+"replenishment, or can complement the automatic MRP scheduling (minimum stock "
+"rules, etc.).\n"
+"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
+"quantities of a given product for a given Stock Period in a given Warehouse, "
+"based on the current and future stock levels,\n"
+"as well as the planned stock moves. The forecast quantities can be altered "
+"manually, and when satisfied with resulting (simulated) Stock quantity, you "
+"can trigger the procurement of what is missing to reach your desired "
+"quantities"
+msgstr ""
+"这MPS 主要驱动仓库的补给，或者完成自动MRP排程（最小库存规则等）\n"
+"基于当前和预测的库存水平，每个MPS 行给你一个预算 给定产品、给定库存周期在给定的仓库的入库和出库数量。\n"
+" 除了计划的库存调拨。\n"
+"预测数量能手工改变。并且 产生（模拟）满足库存数量，你能触发这个采购已达到你要的数量。"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+"用户: %s 主生产计划创建的包装 . 创建日期 : %s .\n"
+"周期: %s 的状态:\n"
+"仓库预计: %s\n"
+"初始库存: %s\n"
+"计划出库: %s , 计划入库: %s .\n"
+"已出库: %s , 已入库: %s .\n"
+"确认出库: %s , 确认入库: %s .\n"
+"计划前出库: %s , 计划前入库: %s .\n"
+"预计出库: %s , 即将入库: %s .\n"
+"库存模拟: %s , 最少库存: %s . "
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr "周期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr "产品销售单位类别"
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr "有效的计量单位"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr "查询库存计划"
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr "复制最近预计"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr "显示关注的哪个产品的预计"
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr "会计期间"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock Periods"
+msgstr "建立库存会计期间"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr "结束"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr "已审核"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr "开始"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr "复制最近库存和销售估计的数量."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr "部门周期 1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr "部门周期 3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr "部门周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "部门周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr "部门周期 4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr "仓库周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr "仓库周期 3"
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warehouse' with Supply Warehouse."
+msgstr "检查补给仓库库存库位的补给。如果没有选择，不给将从补给仓库出库库位产生。 随着供应仓库用在'从另一个仓库供应'。"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr "默认计量单位"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr "仓库周期 4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr "仓库周期 5"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warehouse'."
+msgstr "供应分拣移动的源仓库 通过 \"另一个仓库供应\"创建。"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr "stock.planning"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr "显示关注的仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:661
+#, python-format
+msgid "%s Procurement (%s,  %s) %s %s \n"
+msgstr "%s 需求(%s, %s) %s %s \n"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr "每个公司"
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr "输入数量(您的计划)入库.修改该值和观察库存模拟.该值将大于等于确认的入库."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr "公司周期 4"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr "关注周期的计划"
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr "已出库"
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr "创建产品的计划"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr "每个仓库:"
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr "需求日志"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr "计划周期的开始日期."
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock Periods"
+msgstr "库存周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr "库存"
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr "在计算周期里已确认入库的数量."
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr "结束日期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr "没请求"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr "显示关注周期的预计"
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr "计量单位"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed Periods"
+msgstr "关闭的会计期间"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr "销售预计"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr "产品分类"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:672
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr "您必须要指定源仓库"
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr "库存库位的产品"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr "审批"
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr "这计划的周期.在周期开始创建"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:631
+#, python-format
+msgid "MPS planning for %s"
+msgstr "%s的 MPS 计划"
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr "初始库存"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr "产品金额"
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr "选择要去审核的预计.如果不选定系统去审核和对预计做草稿"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr "周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr "仓库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr "显示谁创建这预计或谁去审核"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_team_id:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr "即将入库的数量是在计划入库和确认入库间的差,该值用于创建需求缺少的数量."
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period besides Confirmed Out. As a "
+"difference between Planned Out and Confirmed Out. For current period Already "
+"Out is also calculated"
+msgstr "选定周期内计划出库数量除了已经被确认的。作为计划出库和确认出库之间的区别。当前期间已经出库的另外计算。"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr "计算销售日志"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
+msgid ""
+"This wizard helps create many forecast lines at once. After creating them "
+"you only have to fill in the forecast quantities. The wizard doesn't "
+"duplicate the line when another one exist for the same selection."
+msgstr "这个向导帮你立即创建多个预测行。在创建后，你必须填充预测数量。这向导不会复制已经存在的相同选择。"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Initial Stock: "
+#~ msgstr ""
+#~ "\n"
+#~ " 初始仓库: "
+
+#~ msgid "Requisition history"
+#~ msgstr "请求日志"
+
+#~ msgid ""
+#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
+#~ "Warhouse'."
+#~ msgstr "仓库作为调拨的起点."
+
+#~ msgid "Create Stock and Sales Periods"
+#~ msgstr "创建库存和销售周期"
+
+#~ msgid "This Department"
+#~ msgstr "这部门"
+
+#, python-format
+#~ msgid "  Creation Date: "
+#~ msgstr "  创建日期: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Confirmed Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 确认出库: "
+
+#~ msgid "Creates planning lines for selected period and warehouse."
+#~ msgstr "选定周期和仓库创建计划明细."
+
+#~ msgid "Note: Doesn't duplicate existing lines created by you."
+#~ msgstr "注: 您不能重复现有的明细."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Already Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 已出库: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Expected Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 预计出仓 : "
+
+#, python-format
+#~ msgid "    Already In: "
+#~ msgstr "    已进库: "
+
+#, python-format
+#~ msgid "Requisition ("
+#~ msgstr "请求("
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Planned Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 计划出库: "
+
+#~ msgid "Creates forecast lines for selected warehouse and period."
+#~ msgstr "对选定的仓库和周期创建预计明细."
+
+#, python-format
+#~ msgid "    Minimum stock: "
+#~ msgstr "    最少库存: "
+
+#~ msgid "Sales history"
+#~ msgstr "销售日志"
+
+#~ msgid "Forecasted quantity."
+#~ msgstr "预计数量"
+
+#~ msgid "Product Quantity"
+#~ msgstr "产品数量"
+
+#, python-format
+#~ msgid " according to state:"
+#~ msgstr " 根据状态:"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Warehouse Forecast: "
+#~ msgstr ""
+#~ "\n"
+#~ " 仓库预计: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Stock Simulation: "
+#~ msgstr ""
+#~ "\n"
+#~ " 仓库模拟: "
+
+#, python-format
+#~ msgid "    Planned In: "
+#~ msgstr "    计划入库 "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "For period: "
+#~ msgstr ""
+#~ "\n"
+#~ "周期: "
+
+#, python-format
+#~ msgid "MPS("
+#~ msgstr "主生产计划("
+
+#~ msgid "Stock and Sales Planning Periods"
+#~ msgstr "库存和销售计划周期"
+
+#~ msgid "Stock and Sales Periods"
+#~ msgstr "库存和销售周期"
+
+#~ msgid "This Copmany Period1"
+#~ msgstr "公司周期 1"
+
+#, python-format
+#~ msgid "    Incoming Left: "
+#~ msgstr "    即将入库 "
+
+#, python-format
+#~ msgid "Manual planning for "
+#~ msgstr "手动计划 "
+
+#, python-format
+#~ msgid "Procurement created in MPS by user: "
+#~ msgstr "在MPS(主生产计划)由用户创建需求： "
+
+#, python-format
+#~ msgid "Pick created from MPS by user: "
+#~ msgstr "在MPS(主生产计划)由用户创建的装箱单： "
+
+#~ msgid ""
+#~ "\n"
+#~ "This module is based on original OpenERP SA module stock_planning version "
+#~ "1.0 of the same name Master Procurement Schedule.\n"
+#~ "\n"
+#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
+#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
+#~ "\n"
+#~ "Terms used in the module:\n"
+#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
+#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+#~ "the Period.\n"
+#~ "- Stock Planning - is the quantity of products you plan to purchase or "
+#~ "produce for the Period.\n"
+#~ "\n"
+#~ "Because we have another module sale_forecast which uses terms \"Sales "
+#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+#~ "values. \n"
+#~ "\n"
+#~ "Activity with this module is divided to three steps:\n"
+#~ "- Creating Periods. Mandatory step.\n"
+#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
+#~ "useful for further planning.\n"
+#~ "- Creating Planning lines, entering quantities to them and making "
+#~ "Procurement. Making procurement is the final step for the Period.\n"
+#~ "\n"
+#~ "Periods\n"
+#~ "=======\n"
+#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
+#~ "There are:\n"
+#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+#~ "monthly periods.\n"
+#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+#~ "change the dates and change the State of period.\n"
+#~ "\n"
+#~ "Creating periods is the first step you have to do to use modules features. "
+#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
+#~ "Periods\" form or view but it is recommended to use automating tool.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- These periods (officially Stock and Sales Periods) are separated of "
+#~ "Financial or other periods in the system.\n"
+#~ "- Periods are not assigned to companies (when you use multicompany feature "
+#~ "at all). Module suppose that you use the same periods across companies. If "
+#~ "you wish to use different periods for different companies define them as you "
+#~ "wish (they can overlap). Later on in this text will be indications how to "
+#~ "use such periods.\n"
+#~ "- When periods are created automatically their start and finish dates are "
+#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
+#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+#~ "you create periods manually you have to take care about hours because you "
+#~ "can have incorrect values form sales or stock. \n"
+#~ "- If you use overlapping periods for the same product, warehouse and company "
+#~ "results can be unpredictable.\n"
+#~ "- If current date doesn't belong to any period or you have holes between "
+#~ "periods results can be unpredictable.\n"
+#~ "\n"
+#~ "Sales Forecasts\n"
+#~ "===============\n"
+#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
+#~ "Forecasts\".\n"
+#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+#~ "forecasts lines according to some parameters.\n"
+#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+#~ "forms.\n"
+#~ "\n"
+#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+#~ "products from selected Category, for selected Period and for selected "
+#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+#~ "settings of period before this one to created one.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
+#~ "Period, Warehouse and validated or created by you) already exists. If you "
+#~ "wish to create another forecast, if relevant lines exists you have to do it "
+#~ "manually using menus described bellow.\n"
+#~ "- When created lines are validated by someone else you can use this tool to "
+#~ "create another lines for the same Period, Product and Warehouse. \n"
+#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
+#~ "some settings from your (validated by you or created by you if not validated "
+#~ "yet) forecast which is for last period before period of created forecast. If "
+#~ "there are few your forecasts for period before this one (it is possible) "
+#~ "system takes one of them (no rule which of them).\n"
+#~ "\n"
+#~ "\n"
+#~ "Menus \"Sales Forecasts\"\n"
+#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
+#~ "validation can save your data against any accidental changes. You can click "
+#~ "\"Validate\" button but it is not mandatory.\n"
+#~ "\n"
+#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
+#~ "\"Product Amount\". System will count quantity from amount according to Sale "
+#~ "price of the Product.\n"
+#~ "\n"
+#~ "All values on the form are expressed in unit of measure selected on form. "
+#~ "You can select one of unit of measure from default category or from second "
+#~ "category. When you change unit of measure the quanities will be recalculated "
+#~ "according to new UoM: editable values (blue fields) immediately, non edited "
+#~ "fields after clicking of \"Calculate Planning\" button.\n"
+#~ "\n"
+#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
+#~ "for this product. You have to enter parameters to the top and left of this "
+#~ "table and system will count sale quantities according to these parameters. "
+#~ "So you can select fe. your department (at the top) then (to the left): last "
+#~ "period, period before last and period year ago.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "\n"
+#~ "\n"
+#~ "Procurement Planning\n"
+#~ "====================\n"
+#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+#~ "lines according to some parameters.\n"
+#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
+#~ "module which allows to create procurement.\n"
+#~ "\n"
+#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
+#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
+#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
+#~ "Planning Lines\", then you can review created planning and make procurement "
+#~ "using menu \"Master Procurement Schedule\".\n"
+#~ "\n"
+#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+#~ "lines for products from selected Category, for selected Period, and for "
+#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
+#~ "system creates lines for all products having forecast for selected Period "
+#~ "and Warehouse. Selected Category will be ignored in this case.\n"
+#~ "\n"
+#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
+#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+#~ "Simulation\" and decide if this value would be accurate for end of the "
+#~ "Period. \n"
+#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+#~ "all forecasts for Period and Warehouse. But your planning can be based on "
+#~ "any other information you have. It is not necessary to have any forecast. \n"
+#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+#~ "is the quantity to be procured to make stock as indicated in \"Stock "
+#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+#~ "quantity to minimum stock rules visible on the form. But you can plan "
+#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
+#~ "whole Warehouse by default. But if you want to see values for Stock location "
+#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
+#~ "\n"
+#~ "If after few tries you decide that you found correct quantities for "
+#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
+#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
+#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
+#~ "\n"
+#~ "\n"
+#~ "If you don't want to Produce or Buy the product but just pick calculated "
+#~ "quantity from another warehouse you can click \"Supply from Another "
+#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+#~ "with move from selected source Warehouse to calculated Warehouse (as "
+#~ "destination). You can also decide if this pick should be done from Stock or "
+#~ "Output location of source warehouse. Destination location (Stock or Input) "
+#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
+#~ "\n"
+#~ "\n"
+#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+#~ "have to click button \"Calculate Planning\".\n"
+#~ "\n"
+#~ "All values on the form are expressed in unit of measure selected on form. "
+#~ "You can select one of unit of measure from default category or from second "
+#~ "category. When you change unit of measure the quanities will be recalculated "
+#~ "according to new UoM: editable values (blue fields) immediately, non edited "
+#~ "fields after clicking of \"Calculate Planning\" button.\n"
+#~ "\n"
+#~ "How Stock Simulation field is calculated:\n"
+#~ "Generally Stock Simulation shows the stock for end of the calculated period "
+#~ "according to some planned or confirmed stock moves. Calculation always "
+#~ "starts with quantity of real stock of beginning of current period. Then "
+#~ "calculation adds or subtracts quantities of calculated period or periods "
+#~ "before calculated.\n"
+#~ "When you are in the same period (current period is the same as calculated) "
+#~ "Stock Simulation is calculated as follows:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period\n"
+#~ "\t- Planned Out \n"
+#~ "\t+ Planned In\n"
+#~ "\n"
+#~ "When you calculate period next to current:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period\n"
+#~ "\t- Planned Out of current Period \n"
+#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
+#~ "\t- Planned Out of calculated Period \n"
+#~ "\t+ Planned In of calculated Period .\n"
+#~ "\n"
+#~ "As you see calculated Period is taken the same way like in case above. But "
+#~ "calculation of current Period are made a little bit different. First you "
+#~ "should note that system takes for current Period only Confirmed In moves. It "
+#~ "means that you have to make planning and procurement for current Period "
+#~ "before this calculation (for Period next to current). \n"
+#~ "\n"
+#~ "When you calculate Period ahead:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period \n"
+#~ "\t- Sum of Planned Out of Periods before calculated \n"
+#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+#~ "\t- Planned Out of calculated Period \n"
+#~ "\t+ Planned In of calculated Period.\n"
+#~ "\n"
+#~ "Periods before calculated means periods starting from current till period "
+#~ "before calculated.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- Remember to make planning for all periods before calculated because "
+#~ "omitting these quantities and procurements can cause wrong suggestions for "
+#~ "procurements few periods ahead.\n"
+#~ "- If you made planning few periods ahead and you find that real Confirmed "
+#~ "Out is bigger than Planned Out in some periods before you can repeat "
+#~ "Planning and make another procurement. You should do it in the same planning "
+#~ "line. If you create another planning line the suggestions can be wrong.\n"
+#~ "- When you wish to work with different periods for some part of products "
+#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
+#~ "different products. Example: If you use always Weekly periods for Products "
+#~ "A, and Monthly periods for Products B your all calculations will work "
+#~ "correctly. You can also use different kind of periods for the same products "
+#~ "from different warehouse or companies. But you cannot use overlapping "
+#~ "periods for the same product, warehouse and company because results can be "
+#~ "unpredictable. The same apply to Forecasts lines.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "这模块的主要目标：在MPS(主生产计划)外能手动生成采购(正规请求)，MPS是根据最少库存规则来自动工作。\n"
+#~ "模块里的术语：\n"
+#~ "    仓库和销售周期：您库存计划，销售预测和制造需求计划(MRP)的开始日期与结束日期之间时间。\n"
+#~ "    仓库和销售预测：是在周期内您计划销售产品的数量。\n"
+#~ "    仓库计划：在周期内您计划采购产品的数量。\n"
+#~ "\n"
+#~ "因为在销售预测模块也使用术语“销售预测”和“计划”但它们是金额值。所以在这模块使用“仓库和销售预测”和“仓库计划”来强调这是一个数量值。\n"
+#~ "\n"
+#~ "本模块的三个操作步骤：\n"
+#~ "    1.创建周期，必须步骤。\n"
+#~ "    2.建立销售预测并输入数量，可选步骤，但它是下一步所必须的。\n"
+#~ "    3.建立计划的明细并输入数量，这是在周期内采购或生产的数量。\n"
+
+#~ msgid ""
+#~ "Chect to make procurement to stock location of selected warehouse. If not "
+#~ "selected procurement will be made into input location of warehouse."
+#~ msgstr "选择指定仓库需求的库位,如果不选择需求将用这仓库的入库库位."
+
+#, python-format
+#~ msgid "    Confirmed In Before: "
+#~ msgstr "    之前的确认入库: "
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "装箱单 "
+
+#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+#~ msgstr "这仓库最小库存规则设置里的最大数量"
+
+#~ msgid ""
+#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
+#~ "units form default category or from second category (UoS category)."
+#~ msgstr "计量单位用于显示库存数量,单位您可以使用默认分类或者第二分类(销售单位分类)."
+
+#~ msgid "Create periods for Stock and Sales Planning"
+#~ msgstr "创建库存和销售计划周期"
+
+#~ msgid ""
+#~ "Quantity expected to go out in selected period. As a difference between "
+#~ "Planned Out and Confirmed Out. For current period Already Out is also "
+#~ "calculated"
+#~ msgstr "在选定周期的出库预计数量.作为计划出库和确认出库的差,对本期已出库的已经计算进去."
+
+#, python-format
+#~ msgid "Cannot delete Validated Sale Forecasts !"
+#~ msgstr "不能删除已审核的销售预计!"
+
+#, python-format
+#~ msgid "    Confirmed In: "
+#~ msgstr "    已确认的入库: "
+
+#~ msgid ""
+#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
+#~ "supply will be made from Output location of Supply Warehouse. Used in "
+#~ "'Supply from Another Warhouse' with Supply Warehouse."
+#~ msgstr "选择供货仓库的的库存库位.如果不选择将使用供应商仓库的出库库位作为供货地点.用在\"从其它仓库供货\"的那个供应商仓库."
+
+#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+#~ msgstr "这仓库最低库存量规则的数量"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Planned Out Before: "
+#~ msgstr ""
+#~ "\n"
+#~ " 之前的计划出库 "
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index ece4f0b560b..9aaeeb5ebb3 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-03-20 10:31+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:20+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -145,7 +145,7 @@ msgstr "名称"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "你不能删除一个活动的订阅"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -173,7 +173,7 @@ msgstr "日"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index a3247df7f3c..5a7c2693929 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-11 14:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14:17+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -31,7 +31,7 @@ msgstr "采购订单明细"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
@@ -72,7 +72,7 @@ msgstr "警告"
 #. module: warning
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -109,7 +109,7 @@ msgstr "发票警告"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -262,7 +262,7 @@ msgstr "销售订单"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "送货单"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
diff --git a/addons/web_linkedin/i18n/nl.po b/addons/web_linkedin/i18n/nl.po
new file mode 100644
index 00000000000..3afe1a8e726
--- /dev/null
+++ b/addons/web_linkedin/i18n/nl.po
@@ -0,0 +1,137 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-27 19:33+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr "hier:"
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "API Sleutel"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:249
+#, python-format
+msgid "No results found"
+msgstr "Geen resultaten gevonden"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:84
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr "Login in LinkedIn"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "Personen"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "API sleutel"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "Kopieer de"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:181
+#, python-format
+msgid "LinkedIn search"
+msgstr "LinkedIn search"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:82
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn is niet geactiveerd"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "Voeg een nieuwe applicatie toe en vul het formulier in:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "Ga naar deze URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "De programmeertaal is Javascript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript API Domain:"
diff --git a/addons/web_shortcuts/i18n/nl.po b/addons/web_shortcuts/i18n/nl.po
new file mode 100644
index 00000000000..1d5d9802f60
--- /dev/null
+++ b/addons/web_shortcuts/i18n/nl.po
@@ -0,0 +1,25 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-27 19:29+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Toevoegen/verwijderen snelkoppeling"
diff --git a/addons/web_shortcuts/i18n/zh_CN.po b/addons/web_shortcuts/i18n/zh_CN.po
new file mode 100644
index 00000000000..614bb9fc0ff
--- /dev/null
+++ b/addons/web_shortcuts/i18n/zh_CN.po
@@ -0,0 +1,25 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-27 14:18+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "添加/删除快捷方式"