diff --git a/addons/account/account.py b/addons/account/account.py
index 971bcec5bb0..98e51d0cf4f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2304,8 +2304,13 @@ class account_model(osv.osv):
                     if not line.partner_id:
                         raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
                                                                 "\nPlease define partner on it!")%(line.name, model.name))
-                    if line.partner_id.property_payment_term:
+
+                    payment_term_id = False
+                    if model.journal_id.type in ('purchase', 'purchase_refund') and line.partner_id.property_supplier_payment_term:
+                        payment_term_id = line.partner_id.property_supplier_payment_term.id
+                    elif line.partner_id.property_payment_term:
                         payment_term_id = line.partner_id.property_payment_term.id
+                    if payment_term_id:
                         pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
                         if pterm_list:
                             pterm_list = [l[0] for l in pterm_list]
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 15a663f801f..4ba4f1f6642 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -217,7 +217,7 @@ class account_invoice(osv.osv):
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
-                "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
+                "of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
             help="If you use payment terms, the due date will be computed automatically at the generation "\
@@ -294,6 +294,18 @@ class account_invoice(osv.osv):
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
     ]
 
+    def _find_partner(self, inv):
+        '''
+        Find the partner for which the accounting entries will be created
+        '''
+        #if the chosen partner is not a company and has a parent company, use the parent for the journal entries 
+        #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
+        part = inv.partner_id
+        if part.parent_id and not part.is_company:
+            part = part.parent_id
+        return part
+
+
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')
         if context is None:
@@ -478,10 +490,11 @@ class account_invoice(osv.osv):
 
             if type in ('out_invoice', 'out_refund'):
                 acc_id = p.property_account_receivable.id
+                partner_payment_term = p.property_payment_term and p.property_payment_term.id or False
             else:
                 acc_id = p.property_account_payable.id
+                partner_payment_term = p.property_supplier_payment_term and p.property_supplier_payment_term.id or False
             fiscal_position = p.property_account_position and p.property_account_position.id or False
-            partner_payment_term = p.property_payment_term and p.property_payment_term.id or False
             if p.bank_ids:
                 bank_id = p.bank_ids[0].id
 
@@ -957,11 +970,7 @@ class account_invoice(osv.osv):
 
             date = inv.date_invoice or time.strftime('%Y-%m-%d')
 
-            #if the chosen partner is not a company and has a parent company, use the parent for the journal entries 
-            #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
-            part = inv.partner_id
-            if part.parent_id and not part.is_company:
-                part = part.parent_id
+            part = self._find_partner(inv)
 
             line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml)
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 698b1bcf00c..2c6e651b14b 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -672,17 +672,24 @@ class account_move_line(osv.osv):
             return {'value':val}
         if not date:
             date = datetime.now().strftime('%Y-%m-%d')
+        jt = False
+        if journal:
+            jt = journal_obj.browse(cr, uid, journal).type
         part = partner_obj.browse(cr, uid, partner_id)
 
-        if part.property_payment_term:
-            res = payment_term_obj.compute(cr, uid, part.property_payment_term.id, 100, date)
+        payment_term_id = False
+        if jt and jt in ('purchase', 'purchase_refund') and part.property_supplier_payment_term:
+            payment_term_id = part.property_supplier_payment_term.id
+        elif jt and part.property_payment_term:
+            payment_term_id = part.property_payment_term.id
+        if payment_term_id:
+            res = payment_term_obj.compute(cr, uid, payment_term_id, 100, date)
             if res:
                 val['date_maturity'] = res[0][0]
         if not account_id:
             id1 = part.property_account_payable.id
             id2 =  part.property_account_receivable.id
-            if journal:
-                jt = journal_obj.browse(cr, uid, journal).type
+            if jt:
                 if jt in ('sale', 'purchase_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
                 elif jt in ('purchase', 'sale_refund'):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e2c45af8cba..6d3519cc461 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1105,7 +1105,7 @@
                     <field name="invoice" invisible="1"/>
                     <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
                     <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
-                    <field name="state" />
+                    <field name="state" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                 </tree>
             </field>
@@ -1207,12 +1207,6 @@
                 </p>
             </field>
         </record>
-        <menuitem
-             name="Journal Items to Reconcile"
-             action="action_account_manual_reconcile"
-             id="menu_manual_reconcile_bank"
-             sequence="20"
-             parent="account.menu_finance_bank_and_cash"/>
         <menuitem
              name="Manual Reconciliation"
              action="action_account_manual_reconcile"
@@ -1428,6 +1422,7 @@
             context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
+
         <act_window
             domain="[('reconcile_id', '=', active_id)]"
             id="act_account_acount_move_line_reconcile_open"
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 0dff40ca19f..8b0f026c9f0 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -131,5 +131,21 @@
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/> 
         </record>
+
+        <!-- Add payment term on some demo partners -->
+        <record id="base.res_partner_2" model="res.partner">
+            <field name="property_payment_term" ref="account_payment_term_net"/>
+        </record>
+        <record id="base.res_partner_12" model="res.partner">
+            <field name="property_payment_term" ref="account_payment_term"/>
+            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+        </record>
+        <record id="base.res_partner_4" model="res.partner">
+            <field name="property_supplier_payment_term" ref="account_payment_term_net"/>
+        </record>
+        <record id="base.res_partner_1" model="res.partner">
+            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 11688732fdb..61f701026c2 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 21:51+0000\n"
+"PO-Revision-Date: 2012-12-04 23:19+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:22+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account
@@ -204,6 +204,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie, um eine Periode hinzuzufügen.\n"
+"              </p><p>\n"
+"                Üblicherweise entspricht eine Periode einem Monat oder einem "
+"Quartal. \n"
+"                Im Normalfall sollte es eine Übereinstimmung mit den "
+"Steuerperioden geben.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -475,6 +484,13 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Verwalten und buchen Sie Ihre betrieblichen oder persönlichen "
+"Vermögenswerte.\n"
+"                Verfolgen Sie die Wertentwicklung Ihres Vermögens und buchen "
+"Sie die nutzungsbedingte Abschreibung auf Ihr Anlagevermögen. Es erfolgt "
+"eine Installation des Moduls account_asset. Sie können auch einfach nur "
+"abrechnen und  die Zahlungen managen, und somit keine vollständige "
+"Buchhaltung installieren (Buchungssätze im Journal, Kontenpläne, etc.)"
 
 #. module: account
 #. openerp-web
@@ -1386,6 +1402,8 @@ msgid ""
 "The amount expressed in the secondary currency must be positif when journal "
 "item are debit and negatif when journal item are credit."
 msgstr ""
+"Der Wert, der in der zweiten Währung des Unternehmens dargestellt wird, muß "
+"bei Soll-Buchungen positiv sein und negativ bei Buchungen im Haben."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -2446,6 +2464,8 @@ msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Sie können den Kontotyp nicht einfach auf %s abändern, da es abhängige "
+"Buchungszeilen gibt."
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2462,7 +2482,7 @@ msgstr "Geschäftsjahr abschließen"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Journal:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -5262,7 +5282,7 @@ msgstr "Wiederkehrende Modelle"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Steuerverbindung"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -6037,6 +6057,11 @@ msgid ""
 "entry was reconciled, either the user pressed the button \"Fully "
 "Reconciled\" in the manual reconciliation process"
 msgstr ""
+"Datum zu dem alle Buchungen beim Partner letztmalig automatisch ausgebucht "
+"wurden. Dieses Datum unterscheidet sich zum Datum der letzten Zahlung "
+"dadurch, daß danach keine offenen Positionen mehr auszugleichen sind. Dieses "
+"ist auf zwei Wegen möglich: Entweder wird durch eine Zahlungseingabe oder "
+"durch Klick auf  \"Ausgleich von Offenen Posten\" das Konto ausgeglichen."
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -6090,6 +6115,8 @@ msgstr "Steuern und Gesamtbeträge neu berechnen"
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"Sie können kein Journal löschen oder ändern, wenn bereits Buchungen in "
+"dieser Periode existieren."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -6099,7 +6126,7 @@ msgstr "In Grundbetrag einbeziehen"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Eingangsrechnung Nummer"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -6123,6 +6150,8 @@ msgstr "Betragsberechnung"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Sie können nicht in eine abgeschlossenen Periode %s des Journals %s buchen "
+"oder ändern."
 
 #. module: account
 #: view:account.journal:0
@@ -6147,7 +6176,7 @@ msgstr "Start Periode"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Anlagevermögen Ansicht"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6173,6 +6202,10 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Wählen Sie die Berechnungsform der Position einer Zahlungsbedingung. "
+"Berücksichtigen Sie dabei, dass in der letzten Zeile der Typ \"Saldo\" "
+"hinterlegt werden muss, damit der komplette Rechnungsbetrag Berücksichtigung "
+"findet."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -6220,12 +6253,12 @@ msgstr "Journal Eröffnungsbuchungen"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Entwurf Gutschrift "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Füllen Sie dieses Formular aus, wenn Sie Geld in die Kasse einlegen"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -7228,7 +7261,7 @@ msgstr "Benutzerfehler !"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Abbrechen"
 
 #. module: account
 #: selection:account.account,type:0
@@ -7393,6 +7426,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"Die Prozenteinstellung einer Zahlungsbedingung  sollte zwischen 0 und 1 "
+"sein, z.B. 0,02 für 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7542,13 +7577,14 @@ msgstr "Gewinn & Verlust ( Aufwandskonto )"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Gesamtbetrag Transaktionen"
 
 #. module: account
 #: code:addons/account/account.py:635
 #, python-format
 msgid "You cannot remove an account that contains journal items."
 msgstr ""
+"Sie können nicht einfach ein Konto mit existierenden Buchungen löschen"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1095
@@ -7592,7 +7628,7 @@ msgstr "Manuell"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Definieren Sie ein Startdatum"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7641,7 +7677,7 @@ msgstr "Buchungssätze"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Keine Periode für diese Rechnung gefunden"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7686,7 +7722,7 @@ msgstr "Alle erstellten Buchungen"
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "Sie können lediglich Buchungssätze des selben Partners ausgleichen"
 
 #. module: account
 #: view:account.journal.select:0
@@ -7746,7 +7782,7 @@ msgstr "Vollständige Liste der Steuern"
 #, python-format
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
-msgstr ""
+msgstr "Die ausgewählten Buchungen haben keine Buchungszeilen im Entwurf"
 
 #. module: account
 #: view:account.chart.template:0
@@ -7776,6 +7812,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Konfigurationsfehler !\n"
+"Die Währung  sollte auch durch die Standard Konten freigegeben werden."
 
 #. module: account
 #: code:addons/account/account.py:2251
@@ -7802,7 +7840,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Management Kundenzahlungen"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7821,6 +7859,9 @@ msgid ""
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Fehler !\n"
+"Das Startdatum sollte nach dem Ende Datum des laufenden Geschäftsjahres "
+"enden."
 
 #. module: account
 #: view:account.tax.template:0
@@ -7836,7 +7877,7 @@ msgstr "Ausgangsrechnungen"
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Verschiedenes"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7859,6 +7900,10 @@ msgid ""
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Sie können keine nicht ausgeglichenen Positionen buchen.\n"
+"Stellen Sie eine vollständige Konfiguration der Zahlungsbedingungen sicher.\n"
+"Die letzte Zeile einer Zahlungsbedingung sollte zwingend vom Typ \"Saldo\" "
+"sein."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7895,7 +7940,7 @@ msgstr "Herkunftsdokument"
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Es gibt kein Aufwandskonto für dieses Produkt: \"%s (id:%d)."
 
 #. module: account
 #: constraint:account.account:0
@@ -7904,6 +7949,9 @@ msgid ""
 "You cannot define children to an account with internal type different of "
 "\"View\"."
 msgstr ""
+"Konfigurationsfehler !\n"
+"Sie können kein Sub Konto zu einem Konto mit dem internen Typ \"Ansicht\" "
+"zuordnen."
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -7913,7 +7961,7 @@ msgstr "Finanzbericht"
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Währung der Fibu"
 
 #. module: account
 #: report:account.invoice:0
@@ -7927,6 +7975,10 @@ msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
 msgstr ""
+"Sie können keine Rechnung löschen, die noch nicht abgebrochen wurde. Anstatt "
+"dessen, \r\n"
+"können Sie auch einfach eine Gutschrift erstellen und die offenen Positionen "
+"ausgleichen."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7980,7 +8032,7 @@ msgstr "Eröffnungsbuchungen des Aufwandskontos"
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Kundenreferenz"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7996,7 +8048,7 @@ msgstr "Preis"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Abschluss Kassenzeilen"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8037,7 +8089,7 @@ msgstr "Gruppiere nach Rechnungsjahr"
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Vorsteuer (xy%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -8052,7 +8104,7 @@ msgstr "Unausgeglichene Buchungen"
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Buchungsvorlagen"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -8102,7 +8154,7 @@ msgstr "Eröffnungsbilanz Erlöskonto"
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Ermöglicht Pro-Form Rechnung"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8137,7 +8189,7 @@ msgstr ""
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Hauptwährung des Unternehmens"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8165,7 +8217,7 @@ msgstr "Konto-Journal"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Rundung für Steuerberechnung"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -8182,6 +8234,10 @@ msgid ""
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Verwenden Sie diese Option, wenn Sie eine Rechnung stornieren wollen, die "
+"Sie ursprünglich so nicht erstellen wollten. Es wird eine Gutschrift "
+"erstellt, gebucht und unmittelbar zusammen mit der falschen Rechnung "
+"ausgeglichen. Sie können diese Gutschrift dann nicht mehr modifizieren."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -8217,6 +8273,8 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Es wurde noch kein Standard Habenkonto für das Journal\n"
+"%s erstellt."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -8255,6 +8313,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Klicken Sie zur Erstellung einer Kostenstelle.\n"
+"              </p><p>\n"
+"                Im Normalfall wird ein Standard Kontenplan durch die "
+"Finanzbehörden\n"
+"                eines Landes empfohlen oder vorgegeben. Der "
+"Kostenstellenplan sollte \n"
+"                ergänzend den Bedarf Ihres Unternehmens für Kosten- und "
+"Erlöse \n"
+"                Auswertungen reflektieren.\n"
+"              </p><p>\n"
+"                Üblicherweise erfolgt eine Strukturierung nach Verträgen, "
+"Projekten, Produkten\n"
+"                oder Abteilungen. Die meisten OpenERP Geschäftsprozesse "
+"(Rechnungen, \n"
+"                Zeiterfassung, Spesen etc.) generieren "
+"Kostenstellenbuchungen auf den \n"
+"                korrespondierenden Finanzkonten.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -8380,6 +8458,8 @@ msgid ""
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Dieses Datum wird als Buchungsdatum für eine Gutschrift verwendet, die "
+"Periode wird demgemäß gleichlautend gebucht."
 
 #. module: account
 #: view:product.template:0
@@ -8393,6 +8473,8 @@ msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Sie sollten ein Kürzel für ein Bankkonto hinterlegen, möglichst auf Basis "
+"eines hinterlegten Kontenplans."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8474,7 +8556,7 @@ msgstr "Steuercode Nummer"
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Gutschrift Belegfolge"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8488,7 +8570,7 @@ msgstr "Quittiere Buchungen"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised Counterpart"
-msgstr ""
+msgstr "Zentralisiertes Gegenkonto"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8544,7 +8626,7 @@ msgstr "Sequenz"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal Konto"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8563,6 +8645,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Fehler !\n"
+"Sie können keine Konten anlegen, die auf sich selbst referenzieren."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
@@ -8612,7 +8696,7 @@ msgstr "Oberkonto"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Gewinn"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8660,7 +8744,7 @@ msgstr "Barkassenbuchung"
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Finanzbuchhaltung"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8675,7 +8759,7 @@ msgstr "Partner Kontoauszug"
 #: code:addons/account/account_invoice.py:1340
 #, python-format
 msgid "%s <b>cancelled</b>."
-msgstr ""
+msgstr "%s <b>abgebrochen</b>."
 
 #. module: account
 #: code:addons/account/account.py:652
@@ -8689,12 +8773,12 @@ msgstr "Warnung!"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Benachrichtigung erfordert handeln"
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Runden von Steuern"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8813,7 +8897,7 @@ msgstr "Umgekehrter Saldo (Anal.)"
 #: help:account.move.reconcile,opening_reconciliation:0
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Wurde dieser Ausgleich durch eine Jahreseröffnung erzeugt ?"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8847,7 +8931,7 @@ msgstr "Restbetrag"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Cash Control"
-msgstr ""
+msgstr "Öffne Kassenprotokoll"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -8887,7 +8971,7 @@ msgstr "Auszug Aufwandsbuchungen"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Es ist noch kein Geschäftsjahr für das Unternehmen angelegt"
 
 #. module: account
 #: view:account.invoice:0
@@ -8918,7 +9002,7 @@ msgstr "Journal zu Gutschriften aus Eingangsrechnungen"
 #: code:addons/account/account.py:1292
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Bitte definieren Sie eine Nummernfolge für das Journal."
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8949,6 +9033,9 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Diese Anwendung ermöglicht den automatischen elektronischen Versand von "
+"mehrstufigen Zahlungserinnerungen.\n"
+"                   Es wird das Modul account_followup installiert."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8993,12 +9080,12 @@ msgstr "Nettosumme:"
 #: code:addons/account/wizard/account_report_common.py:153
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Wählen Sie eine Start- und Endeperiode."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Nächste Rechnungsnummer"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -9055,6 +9142,9 @@ msgid ""
 "This wizard will remove the end of year journal entries of selected fiscal "
 "year. Note that you can run this wizard many times for the same fiscal year."
 msgstr ""
+"Dieser Assistent entfernt die Jahresabschlußbuchungen für das ausgewählte "
+"Geschäftsjahr. Beachten Sie dass der Assistent für den Jahresabschluß "
+"beliebig oft wiederholt werden kann."
 
 #. module: account
 #: report:account.invoice:0
@@ -9137,6 +9227,10 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Verwenden Sie diese Option wenn Sie eine Rechnung stornieren und eine Neue "
+"erstellen wollen. Die Gutschrift wird erstellt, gebucht und zusammen mit der "
+"korrespondierenden Rechnung ausgeglichen. Eine neue Rechnung wurde erstellt "
+"und steht zu Ihrer weiteren Bearbeitung bereit."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -9147,7 +9241,7 @@ msgstr "Auto Import Bankauszug"
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "Unknown Error!"
-msgstr ""
+msgstr "Unbekannter Fehler !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -9157,7 +9251,7 @@ msgstr "Abstimmung Bankbuchungen"
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 4ba5d3b3976..a42cede8e38 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-21 18:46+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
+"PO-Revision-Date: 2012-12-04 19:34+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\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-12-04 05:26+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account
@@ -26,6 +26,7 @@ msgstr "Sistema de pagos"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"Una posición fiscal solo puede estar definida una vez en las mismas cuentas."
 
 #. module: account
 #: view:account.unreconcile:0
@@ -85,7 +86,7 @@ msgstr "Importar desde factura o pago"
 #: code:addons/account/account_move_line.py:1198
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Cuenta erronea."
 
 #. module: account
 #: view:account.move:0
@@ -109,6 +110,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"¡Error!\n"
+"No puede crear plantillas de cuentas recursivas."
 
 #. module: account
 #. openerp-web
@@ -199,6 +202,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Haga clic para añadir un período fiscal.\n"
+"              </p><p>\n"
+"                Un período fiscal es habitualmente un mes o un trimestre. \n"
+"                Normalmente se corresponde con los períodos de presentación "
+"de impuestos\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -213,7 +224,7 @@ msgstr "Etiqueta de columna"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Cantidad de dígitos a usar para el código de la cuenta"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -233,6 +244,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Introduzca la cuenta analítica a usar por defecto en las líneas de impuestos "
+"de las facturas. Déjelo vacío si no quiere utilizar cuantas analíticas por "
+"defecto en las líneas de impuestos."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -263,7 +277,7 @@ msgstr "Informes Belgas"
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "Vista de ingresos"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -288,6 +302,9 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Incluye todos los requisitos básicos para la anotación de comprobantes de "
+"banco, efectivo, ventas, compras, gastos, etc.. \n"
+"                Instala el módulo account_voucher"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -337,7 +354,7 @@ msgstr "Desconciliar cuenta"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Gestión de presupuestos"
 
 #. module: account
 #: view:product.template:0
@@ -358,7 +375,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Permitir multi divisa"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -379,12 +396,12 @@ msgstr "Junio"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Debe seleccionar las cuentas a reconciliar"
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Le permite usar la contabilidad analítica"
 
 #. module: account
 #: view:account.invoice:0
@@ -392,7 +409,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Comercial"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -458,7 +475,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Período :"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -494,7 +511,7 @@ msgstr "El importe expresado en otra divisa opcional."
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "Monedas disponibles"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -547,7 +564,7 @@ msgstr "Destino padre"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Presenta la secuencia de esta línea cuando muestra la factura"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -616,12 +633,12 @@ msgstr "El contable confirma el extracto."
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Nada que reconciliar"
 
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Precisión decimal en movimientos contables"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -657,6 +674,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"El diario especificado no tiene movimientos en estado borrador en este "
+"período"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -679,12 +698,12 @@ msgstr "¡La secuencia principal debe ser diferente de la actual!"
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "La divisa actual no está configurada correctamente"
 
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "Cuenta de ganancias"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1144
@@ -708,7 +727,7 @@ msgstr "VEN"
 #: code:addons/account/account.py:1546
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "No se puede crear un movimiento con divisa distinta de .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -743,6 +762,7 @@ msgstr "Periodo diario"
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"No puede crear más de un movimiento por periodo en un diario centralizado."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index ea622788171..2fea6a66631 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-17 00:11+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-04 13:40+0000\n"
+"Last-Translator: Luis Felipe Miléo - http://www.akretion.com <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-12-04 05:27+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr "Reconciliar a Entrada de Diário"
 #: view:account.bank.statement:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Estatísticas da Conta"
+msgstr "Estatisticas da conta"
 
 #. module: account
 #: view:account.invoice:0
@@ -85,7 +85,7 @@ msgstr "Importar da fatura ou do pagamento"
 #: code:addons/account/account_move_line.py:1198
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Conta Inválida"
 
 #. module: account
 #: view:account.move:0
@@ -108,6 +108,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Erro!\n"
+"Não é permitido criar modelos recursivos de contas"
 
 #. module: account
 #. openerp-web
@@ -198,6 +200,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click para adicionar um período fiscal.\n"
+"              </p><p>\n"
+"                Um período fiscal geralmente é de um mês ou de um trimestre. "
+"Correspondendo a data de pagamento dos impostos\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index a1da0632462..77efde5acd5 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-30 17:32+0000\n"
+"PO-Revision-Date: 2012-12-04 16: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-12-04 05:29+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account
@@ -10443,7 +10443,7 @@ msgstr "发票的状态已完成"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "管理客户付款 催款"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 3355363308b..b5e0a9538ef 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -215,9 +215,16 @@ class res_partner(osv.osv):
             'account.payment.term',
             type='many2one',
             relation='account.payment.term',
-            string ='Payment Term',
+            string ='Customer Payment Term',
             view_load=True,
-            help="This payment term will be used instead of the default one for the current partner"),
+            help="This payment term will be used instead of the default one for sale orders and customer invoices"),
+        'property_supplier_payment_term': fields.property(
+            'account.payment.term',
+             type='many2one',
+             relation='account.payment.term',
+             string ='Supplier Payment Term',
+             view_load=True,
+             help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
         'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process')
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d17f8c18eee..8623bd03922 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -89,6 +89,7 @@
                         </group>
                         <group>
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
+                            <field name="property_supplier_payment_term" widget="selection"/>
                             <field name="debit"/>
                         </group>
                     </group>
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index 9b612d5c6ac..83d63025bd2 100644
--- a/addons/account_accountant/i18n/de.po
+++ b/addons/account_accountant/i18n/de.po
@@ -8,20 +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-25 19:02+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2012-12-04 07:23+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Öffne Finanz Menü"
 
 #~ msgid "Accountant"
 #~ msgstr "Finanzbuchhaltung Administrator"
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index 451f5b9a4f0..0c7bc17d5dd 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-27 23:22+0000\n"
+"PO-Revision-Date: 2012-12-04 05:45+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-12-04 05:34+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_analytic_analysis
@@ -218,6 +218,8 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -253,7 +255,7 @@ msgstr "Plantilla de contrato"
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Uso obligatorio de plantillas en contratos"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
@@ -437,6 +439,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Le permite configurar el campo plantilla como se requiera cuando se crea una "
+"cuenta analítica o contrato."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -608,12 +612,12 @@ msgstr "Fecha del último trabajo realizado en esta cuenta."
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "Configuración de venta"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Uso obligatorio de plantillas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -659,6 +663,7 @@ msgstr "Tiempo Total"
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
 msgstr ""
+"El campo plantilla de las cuentas analíticas y contratos será requerido"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
diff --git a/addons/account_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po
index 9f09d68e30a..1c5249de89b 100644
--- a/addons/account_asset/i18n/nl.po
+++ b/addons/account_asset/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-01 16:19+0000\n"
+"PO-Revision-Date: 2012-12-04 17:19+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-12-04 05:53+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_asset
@@ -448,6 +448,12 @@ 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 ""
+"Wanneer een activa is aangemaakt is de status 'Concept'.\n"
+"Als de activa is bevestigd, wordt de status gezet op 'In bewerking' en "
+"kunnen de afschrijvingsregels  wporden geboekt in de boekhouding.\n"
+"Het is mogelijk een activa handmatig af te sluiten als de afschrijving is "
+"voltooid. Als de laatste afschrijvingsregels is geboekt, wordt deze status "
+"automatisch ingesteld"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po
index 113052428cd..9d288c778f8 100644
--- a/addons/account_bank_statement_extensions/i18n/nl.po
+++ b/addons/account_bank_statement_extensions/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-24 22:05+0000\n"
+"PO-Revision-Date: 2012-12-04 17:22+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-12-04 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_bank_statement_extensions
@@ -59,7 +59,7 @@ msgstr "Geselecteerde bankafschriftregels annuleren"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Betaaldatum"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -113,6 +113,8 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"Verwijderen is niet mogelijk. Ga naar het betreffende bankafschrift om een "
+"bankafschrift te bewerken of te verwijderen."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -220,7 +222,7 @@ msgstr "Handmatig"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Bank transactie"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 978211d4636..47d67284dd2 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:46+0000\n"
+"PO-Revision-Date: 2012-12-04 07:23+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_budget
@@ -234,7 +234,7 @@ msgstr "Budgets genehmigen"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Dauer"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -332,7 +332,7 @@ msgstr "Sollwert"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index 4d54d42af10..6da2f411163 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-29 13:37+0000\n"
+"PO-Revision-Date: 2012-12-04 10:32+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-12-04 05:19+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Manuell handling."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -31,7 +31,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Group by"
-msgstr ""
+msgstr "Grupper etter."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -47,27 +47,27 @@ msgstr "Oppfølging"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(Dato)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Neste handling dato."
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Trenger utskrift."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "Merk som ferdig."
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Handling å gjøre."
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -149,7 +149,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Follow-ups to do"
-msgstr ""
+msgstr "Oppfølginger å gjøre."
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -208,12 +208,12 @@ msgstr "E-post kropp."
 #. module: account_followup
 #: help:res.partner,payment_responsible_id:0
 msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "Ansvarlig for å sørge for at handlingen skjer."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Overdue amount"
-msgstr ""
+msgstr "Forfalte beløpet."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -228,7 +228,7 @@ msgstr "Beløp"
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Ingen ansvarlige."
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -243,12 +243,12 @@ msgstr "Total debet"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Neste handling."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr ": Partner navn."
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -283,12 +283,12 @@ msgstr "Dato :"
 #. module: account_followup
 #: view:res.partner:0
 msgid "I am responsible"
-msgstr ""
+msgstr "Jeg er ansvarlig."
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
 msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "Bare en oppfølgning per. firma er lov."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line4
@@ -325,22 +325,22 @@ msgstr "Ikke Prosedyre"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Without responsible"
-msgstr ""
+msgstr "Uten ansvar."
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Send e-poster og lage brever."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_customer_followup
 msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "Manuelle oppfølgninger."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_navn)s"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -355,7 +355,7 @@ msgstr "Oppfølging statistikk."
 #. module: account_followup
 #: view:res.partner:0
 msgid "Send Overdue Email"
-msgstr ""
+msgstr "Send forfalte e-poster."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -371,23 +371,23 @@ msgstr "Gir rekkefølgen av når du viser en liste over oppfølging linjer."
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " Vil bli sendt."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User's Company Name"
-msgstr ""
+msgstr ": Brukerens firma navn."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Send et brev."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 msgid "Payment Follow-ups"
-msgstr ""
+msgstr "Betaling oppfølgninger."
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -398,7 +398,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Nobody"
-msgstr ""
+msgstr "Ingen."
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -420,7 +420,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
 msgid "Do Manual Follow-Ups"
-msgstr ""
+msgstr "Gjøre manuell oppfølging."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -451,7 +451,7 @@ msgstr "Send E-post på Partnerens språk"
 #: code:addons/account_followup/wizard/account_followup_print.py:169
 #, python-format
 msgid " email(s) sent"
-msgstr ""
+msgstr " E-post(er) sendt."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
@@ -501,12 +501,12 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Credits"
-msgstr ""
+msgstr "Partnere med kreditter."
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
 msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Ved behandling, vil den sende en e-post."
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -528,7 +528,7 @@ msgstr "Oppfølginger"
 #: code:addons/account_followup/account_followup.py:227
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
-msgstr ""
+msgstr "E-posten er ikke send fordi e-postadressen partner ikke er fylt ut."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -561,12 +561,12 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " Manuell handling(er) tilordnet:"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Søk partner."
 
 #. module: account_followup
 #: view:res.partner:0
@@ -581,7 +581,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Send brever og e-poster."
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -597,7 +597,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:240
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Send brever og e-poster: Handling oppsummering."
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -612,17 +612,17 @@ msgstr "Blokkert"
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
 msgid "Days of the follow-up levels must be different"
-msgstr ""
+msgstr "Dagene for oppfølgnings nivåene må være annerledes."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Klikk for å markere handling som ferdig."
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-Ups Analysis"
-msgstr ""
+msgstr "Oppfølgnings analyse."
 
 #. module: account_followup
 #: help:account_followup.print,date:0
@@ -640,7 +640,7 @@ msgstr "Oppfølgings sendedato"
 #. module: account_followup
 #: field:res.partner,payment_responsible_id:0
 msgid "Follow-up Responsible"
-msgstr ""
+msgstr "Oppfølgning ansvarlig."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -656,12 +656,12 @@ msgstr "Faktura påminnelse"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
-msgstr ""
+msgstr "Oppfølgnings nivåer."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Future Follow-ups"
-msgstr ""
+msgstr "Fremtidige Oppfølgninger."
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -689,13 +689,13 @@ msgstr "Siste Oppfølging"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Download Letters"
-msgstr ""
+msgstr "Last ned brevene."
 
 #. module: account_followup
 #: field:account_followup.print,company_id:0
 #: field:res.partner,unreconciled_aml_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "Ukjent."
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:245
@@ -706,7 +706,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "E-post maler."
 
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
@@ -719,7 +719,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " email(s) should have been sent, but "
-msgstr ""
+msgstr " e-post (e) skal ha blitt sendt, men. "
 
 #. module: account_followup
 #: help:account_followup.print,test_print:0
@@ -740,12 +740,12 @@ msgstr "Totalt:"
 #. module: account_followup
 #: field:account_followup.followup.line,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "E-post mal."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(Bruker_signatur)s"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -761,7 +761,7 @@ msgstr "Oppsummering"
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_email:0
 msgid "Send an Email"
-msgstr ""
+msgstr "Send en e-post."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -979,17 +979,17 @@ msgstr "Balanse"
 #. module: account_followup
 #: help:res.partner,payment_note:0
 msgid "Payment Note"
-msgstr ""
+msgstr "Betalings notat."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "My Follow-ups"
-msgstr ""
+msgstr "Mine oppfølgninger."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s"
-msgstr ""
+msgstr "%(Firma_navn)s"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -1011,7 +1011,7 @@ msgstr "Periode"
 #: code:addons/account_followup/wizard/account_followup_print.py:231
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
-msgstr ""
+msgstr "% s partnere har ingen kreditter og slik at handlingen er fjernet."
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
@@ -1024,6 +1024,8 @@ msgid ""
 ", the latest payment follow-up\n"
 "                            was:"
 msgstr ""
+"Den siste betalingen oppfølging\n"
+"var."
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -1033,7 +1035,7 @@ msgstr "Avbryt"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Close"
-msgstr ""
+msgstr "Lukk."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1050,33 +1052,33 @@ msgstr "Maks Oppfølgings Nivå"
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " hadde ukjente e-postadresse(r)"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig."
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_finance_followup
 #: view:res.partner:0
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Betaling oppfølgning."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Current Date"
-msgstr ""
+msgstr ": Nåværende dato."
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
 msgid "Total amount due"
-msgstr ""
+msgstr "Totalbeløpet."
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
 msgid "Follow-Up Action"
-msgstr ""
+msgstr "Oppfølgning handling."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1100,7 +1102,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
-msgstr ""
+msgstr "Oppsummering av handlinger."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1110,7 +1112,7 @@ msgstr "Ref"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "After"
-msgstr ""
+msgstr "Etter."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1132,6 +1134,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"Ingen tidsskriftet elementer funnet.\n"
+"</ p>\n"
+"            "
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -1190,7 +1196,7 @@ msgstr "Navn"
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id:0
 msgid "Latest Follow-up Level"
-msgstr ""
+msgstr "Siste Oppfølging nivå."
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
@@ -1207,12 +1213,12 @@ msgstr "Oppfølging statistikk av partner."
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " letter(s) in report"
-msgstr ""
+msgstr " Brev(er) i rapport."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
-msgstr ""
+msgstr "Kundens oppfølgning."
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -1321,12 +1327,12 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid "Follow-up letter of "
-msgstr ""
+msgstr "Oppfølgning brev av. "
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "The"
-msgstr ""
+msgstr "Den."
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -1346,7 +1352,7 @@ msgstr "Kredit"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Follow-ups To Do"
-msgstr ""
+msgstr "Oppfølgninger å gjøre."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1364,7 +1370,7 @@ msgstr ""
 #. module: account_followup
 #: help:res.partner,latest_followup_date:0
 msgid "Latest date that the follow-up level of the partner was changed"
-msgstr ""
+msgstr "Siste dato som oppfølging nivå av partner ble endret."
 
 #. module: account_followup
 #: field:account_followup.print,test_print:0
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 7eee8406237..c4a52167a46 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-01 16:25+0000\n"
+"PO-Revision-Date: 2012-12-04 17:33+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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-12-04 05:19+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Handmatige actie"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Het maximale herinneringsniveau"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Group by"
-msgstr ""
+msgstr "Groeperen op"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -46,27 +46,27 @@ msgstr "Betalingsherinnering"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Volgende actiedatum"
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Moet worden afgedrukt"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "⇾ Markeer als gereed"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Actie Te doen"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -148,7 +148,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Follow-ups to do"
-msgstr ""
+msgstr "Betalingsherinneringen nog te doen"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -192,7 +192,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "days overdue, do the following actions:"
-msgstr ""
+msgstr "dagen verlopen, doe de navolgende acties:"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -207,12 +207,12 @@ msgstr "Email bericht"
 #. module: account_followup
 #: help:res.partner,payment_responsible_id:0
 msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "Verantwoordelijke die ervoor zorgt dat de actie gebeurt."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Overdue amount"
-msgstr ""
+msgstr "Vervallen bedrag"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -242,12 +242,12 @@ msgstr "Totaal debet"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr ": Relatie naam"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -282,7 +282,7 @@ msgstr "Datum :"
 #. module: account_followup
 #: view:res.partner:0
 msgid "I am responsible"
-msgstr ""
+msgstr "Ik ben verantwoordelijk"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
@@ -314,7 +314,7 @@ msgstr ""
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
-msgstr ""
+msgstr "Bij verwerken wordt een brieg gemaakt"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -324,22 +324,22 @@ msgstr "Geen geschil"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Without responsible"
-msgstr ""
+msgstr "Zonder verantwoordelijke"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Verstuur e-mails en genereer brieven"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_customer_followup
 msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "Handmatige herinnneringen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -354,7 +354,7 @@ msgstr "Betalingsherinneringen analyses"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Send Overdue Email"
-msgstr ""
+msgstr "Stuur betalingsherinnnering e-mail"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -371,34 +371,34 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " wordt verstuurt"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User's Company Name"
-msgstr ""
+msgstr ": Bedrijfsnaam van gebruiker"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Stuur een brief"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 msgid "Payment Follow-ups"
-msgstr ""
+msgstr "Betalingsherinnneringen"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Due Days"
-msgstr ""
+msgstr "Vervallen dagen"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Nobody"
-msgstr ""
+msgstr "Niemand"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -415,12 +415,12 @@ msgstr "Laatste betalingsherinnering"
 #: model:ir.actions.act_window,name:account_followup.action_account_manual_reconcile_receivable
 #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
 msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Afletteren van facturen en betalingen"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
 msgid "Do Manual Follow-Ups"
-msgstr ""
+msgstr "Maak handmatige betalingsherinneringen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -435,7 +435,7 @@ msgstr "Stuur e-mail bevestiging"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Print Overdue Payments"
-msgstr ""
+msgstr "Vervallen betalingen afdrukken"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
@@ -451,7 +451,7 @@ msgstr "Stuur e-mail in de taal van de relatie"
 #: code:addons/account_followup/wizard/account_followup_print.py:169
 #, python-format
 msgid " email(s) sent"
-msgstr ""
+msgstr " e-mail(s) verstuurd"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
@@ -529,6 +529,8 @@ msgstr "Betalingsherinneringen"
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
+"E-mail is niet verstuurd omdat het e-mail adres van de relatie niet is "
+"ingevuld."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -566,7 +568,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Zoek relatie"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -581,7 +583,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Stuur brieven en e-mails"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -591,7 +593,7 @@ msgstr "Zoek betalingsherinnering"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Account Move line"
-msgstr ""
+msgstr "Journaalpostregel"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:240
@@ -617,12 +619,12 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Klik om de actie als gereed te kenmerken"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-Ups Analysis"
-msgstr ""
+msgstr "Betalingsherinneringanalyse"
 
 #. module: account_followup
 #: help:account_followup.print,date:0
@@ -640,7 +642,7 @@ msgstr "Verzenddatum betalingsherinnering"
 #. module: account_followup
 #: field:res.partner,payment_responsible_id:0
 msgid "Follow-up Responsible"
-msgstr ""
+msgstr "Betalingsherinnering verantwoordelijke"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -656,12 +658,12 @@ msgstr "Betalingsherinnering"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
-msgstr ""
+msgstr "Betalingsherinnering niveau's"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Future Follow-ups"
-msgstr ""
+msgstr "Toekomstige betalingsherinneringen"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -689,13 +691,13 @@ msgstr "Laatste betalingsherinnering"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Download Letters"
-msgstr ""
+msgstr "Download brieven"
 
 #. module: account_followup
 #: field:account_followup.print,company_id:0
 #: field:res.partner,unreconciled_aml_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "onbekend"
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:245
@@ -706,7 +708,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Email-sjablonen"
 
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
@@ -742,12 +744,12 @@ msgstr "Totaal:"
 #. module: account_followup
 #: field:account_followup.followup.line,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Email sjabloon"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -763,7 +765,7 @@ msgstr "Samenvatting"
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_email:0
 msgid "Send an Email"
-msgstr ""
+msgstr "Verstuur een e-mail"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -981,17 +983,17 @@ msgstr "Saldo"
 #. module: account_followup
 #: help:res.partner,payment_note:0
 msgid "Payment Note"
-msgstr ""
+msgstr "Betalingsbewijs"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "My Follow-ups"
-msgstr ""
+msgstr "Mijn betalingsherinneringen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s"
-msgstr ""
+msgstr "%(company_name)s"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -1035,7 +1037,7 @@ msgstr "Annuleren"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1052,12 +1054,12 @@ msgstr "Max. betalingsherinnering niveau"
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " had een onbekend e-mail adres"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_finance_followup
@@ -1068,17 +1070,17 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Current Date"
-msgstr ""
+msgstr ": Huidige datum"
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
 msgid "Total amount due"
-msgstr ""
+msgstr "Totaal vervallen bedrag"
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
 msgid "Follow-Up Action"
-msgstr ""
+msgstr "Betalingsherinnering actie"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1102,7 +1104,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
-msgstr ""
+msgstr "Samenvatting van acties"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1112,7 +1114,7 @@ msgstr "Factuur"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "After"
-msgstr ""
+msgstr "Erna"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1134,6 +1136,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Geen journaalposten gevonden.\n"
+"                </p>\n"
+"            "
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -1148,7 +1154,7 @@ msgstr "Betalingsherinneringregels"
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Wijs een verantwoordelijke toe"
 
 #. module: account_followup
 #: view:account_followup.print:0
diff --git a/addons/account_voucher/i18n/nb.po b/addons/account_voucher/i18n/nb.po
index f326d258e47..bffa649ab3a 100644
--- a/addons/account_voucher/i18n/nb.po
+++ b/addons/account_voucher/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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-29 20:14+0000\n"
+"PO-Revision-Date: 2012-12-04 10:00+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-12-04 05:41+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: account_voucher
@@ -36,7 +36,7 @@ msgstr "Nedskrivning."
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Betaling referanse."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -89,7 +89,7 @@ msgstr "Import"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "Kupong inngang."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -148,7 +148,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Valider."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -170,7 +170,7 @@ msgstr "Søk kuponger."
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Motparts konto."
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -257,6 +257,7 @@ msgstr "Kansellert."
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Du må konfigurere kontoens basiskode og kontoens skatteklasse på '% s' skatt!"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -342,7 +343,7 @@ msgstr "Importer fakturaer."
 #: selection:account.voucher,pay_now:0
 #: selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Betal senere eller gruppe fondene."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -379,7 +380,7 @@ msgstr "Leverandør"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
-msgstr ""
+msgstr "Leverandør kupong."
 
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
@@ -395,13 +396,13 @@ msgstr "Debet."
 #: code:addons/account_voucher/account_voucher.py:1558
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Kan ikke endre journal!"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "# av kupong linjer."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -423,7 +424,7 @@ msgstr "Kupong oppføringer."
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Åpen leverandør journal inngang."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
@@ -450,7 +451,7 @@ msgstr "Salgs kvittering."
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "Fler valuta kupong."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -478,7 +479,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Forskjellig beløp."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -506,7 +507,7 @@ msgstr "Skatt beløp."
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "Validert kupong."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -538,13 +539,13 @@ msgstr "Betalt beløp."
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Betaling forskjell."
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,audit:0
 msgid "To Review"
-msgstr ""
+msgstr "Til gjennomgang."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1008
@@ -598,7 +599,7 @@ msgstr "Desember."
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Grupper etter måned fra fakturadato."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -616,7 +617,7 @@ msgstr "Valuta."
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Betalbar og Fordringer."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1019,7 +1020,7 @@ msgstr "Lagt ut kuponger."
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Vekslings vurdering."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1064,7 +1065,7 @@ msgstr "Interne notater."
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Kreditter."
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
@@ -1142,7 +1143,7 @@ msgstr "April."
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "Bare for skatt ekskludert fra pris"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
@@ -1157,7 +1158,7 @@ msgstr "Meldinger og kommunikasjon historie."
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "Påmeldingene med erklæringen fra fakturaer."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1233,7 +1234,7 @@ msgstr "Partner."
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Åpen balanse."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:997
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 91ba438756e..426027f984c 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -40,7 +40,7 @@ class invoice(osv.osv):
             'target': 'new',
             'domain': '[]',
             'context': {
-                'default_partner_id': inv.partner_id.id,
+                'default_partner_id': self._find_partner(inv),
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_number':inv.name,
                 'close_after_process': True,
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index dc294fbf19b..964edd077cb 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -120,7 +120,7 @@ class account_analytic_account(osv.osv):
     def _get_one_full_name(self, elmt, level=6):
         if level<=0:
             return '...'
-        if elmt.parent_id:
+        if elmt.parent_id and not elmt.type == 'template':
             parent_path = self._get_one_full_name(elmt.parent_id, level-1) + "/"
         else:
             parent_path = ''
diff --git a/addons/auth_openid/i18n/de.po b/addons/auth_openid/i18n/de.po
index a1cefc7e855..10330c21691 100644
--- a/addons/auth_openid/i18n/de.po
+++ b/addons/auth_openid/i18n/de.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-15 22:54+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2012-12-04 07:24+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-12-04 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_openid
@@ -97,7 +96,7 @@ msgstr "Google Apps"
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Benutzer"
 
 #~ msgid "res.users"
 #~ msgstr "res.users"
diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po
index 7ebad3542d1..700cecf965b 100644
--- a/addons/auth_openid/i18n/fr.po
+++ b/addons/auth_openid/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-22 10:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-04 10:02+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_openid
@@ -94,7 +94,7 @@ msgstr "Google Apps"
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #~ msgid "OpenID URL:"
 #~ msgstr "Adresse URL OpenID :"
diff --git a/addons/auth_reset_password/__init__.py b/addons/auth_reset_password/__init__.py
deleted file mode 100644
index 8341ccd60c7..00000000000
--- a/addons/auth_reset_password/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- 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 controllers
-import res_users
diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py
deleted file mode 100644
index 2c5b61bf378..00000000000
--- a/addons/auth_reset_password/__openerp__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- 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/>
-#
-##############################################################################
-
-{
-    'name': 'Reset Password',
-    'description': """
-Reset Password
-==============
-
-Allow users to reset their password from the login page.
-Allow administrator to click a button to send a "Reset Password" request to a user.
-""",
-    'author': 'OpenERP SA',
-    'version': '1.0',
-    'category': 'Authentication',
-    'website': 'http://www.openerp.com',
-    'installable': True,
-    'depends': ['auth_signup', 'email_template'],
-    'data': [
-        'auth_reset_password.xml',
-        'res_users_view.xml',
-    ],
-    'js': ['static/src/js/reset_password.js'],
-    'qweb': ['static/src/xml/reset_password.xml'],
-}
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
deleted file mode 100644
index 90f08a25899..00000000000
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <!-- Email template for reset password -->
-        <record id="reset_password_email" model="email.template">
-            <field name="name">Reset Password</field>
-            <field name="model_id" ref="base.model_res_users"/>
-            <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
-            <field name="email_to">${object.email}</field>
-            <field name="subject">Password reset</field>
-            <field name="body_html"><![CDATA[
-<p>A password reset was requested for the OpenERP account linked to this email.</p>
-
-<p>You may change your password following <a href="${object.signup_url}">this link</a>.</p>
-
-<p>Note: If you did not ask for a password reset, you can safely ignore this email.</p>]]></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/auth_reset_password/controllers/__init__.py b/addons/auth_reset_password/controllers/__init__.py
deleted file mode 100644
index f40f0ee976e..00000000000
--- a/addons/auth_reset_password/controllers/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- 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 main
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_reset_password/controllers/main.py b/addons/auth_reset_password/controllers/main.py
deleted file mode 100644
index 639945cfc09..00000000000
--- a/addons/auth_reset_password/controllers/main.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- 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 logging
-
-import werkzeug
-
-import openerp
-from openerp import SUPERUSER_ID
-from openerp.modules.registry import RegistryManager
-
-_logger = logging.getLogger(__name__)
-
-class Controller(openerp.addons.web.http.Controller):
-    _cp_path = '/auth_reset_password'
-
-    @openerp.addons.web.http.httprequest
-    def reset_password(self, req, dbname, login):
-        """ retrieve user, and perform reset password """
-        url = '/'
-        registry = RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            try:
-                res_users = registry.get('res.users')
-                res_users.reset_password(cr, SUPERUSER_ID, login)
-                cr.commit()
-                message = 'An email has been sent with credentials to reset your password'
-            except Exception as e:
-                # signup error
-                _logger.exception('error when resetting password')
-                message = e.message
-        url = "/#action=login&error_message=%s" % werkzeug.urls.url_quote(message)
-        return werkzeug.utils.redirect(url)
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_reset_password/i18n/ar.po b/addons/auth_reset_password/i18n/ar.po
deleted file mode 100644
index 7d39cee63e4..00000000000
--- a/addons/auth_reset_password/i18n/ar.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Arabic 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-01 10:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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 ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr ""
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr ""
diff --git a/addons/auth_reset_password/i18n/auth_reset_password.pot b/addons/auth_reset_password/i18n/auth_reset_password.pot
deleted file mode 100644
index aa1c2b2eaf0..00000000000
--- a/addons/auth_reset_password/i18n/auth_reset_password.pot
+++ /dev/null
@@ -1,65 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* auth_reset_password
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: 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 ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr ""
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr ""
-
diff --git a/addons/auth_reset_password/i18n/it.po b/addons/auth_reset_password/i18n/it.po
deleted file mode 100644
index 571e6af83cc..00000000000
--- a/addons/auth_reset_password/i18n/it.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Italian 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-28 19:58+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
-"Language-Team: Italian <it@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-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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 ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr "Utenti"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr "Reimposta password"
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr "Ripristino password"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr "Reimposta Password"
diff --git a/addons/auth_reset_password/i18n/nl.po b/addons/auth_reset_password/i18n/nl.po
deleted file mode 100644
index 3b88d2fcd64..00000000000
--- a/addons/auth_reset_password/i18n/nl.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 15:12+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-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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 ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr "Gebruikers"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr "Reset wachtwoord"
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr "Reset wachtwoord"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr "Stel wachtwoord opnieuw in"
diff --git a/addons/auth_reset_password/i18n/ru.po b/addons/auth_reset_password/i18n/ru.po
deleted file mode 100644
index e5134f2e89b..00000000000
--- a/addons/auth_reset_password/i18n/ru.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Russian 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-30 19:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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 ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr ""
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr ""
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr ""
diff --git a/addons/auth_reset_password/i18n/tr.po b/addons/auth_reset_password/i18n/tr.po
deleted file mode 100644
index abd4d74b01f..00000000000
--- a/addons/auth_reset_password/i18n/tr.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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-12-03 16:03+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-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr "Kullanıcılar"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. 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"
-
-#. 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
-#: view:res.users:0
-msgid "Reset Password"
-msgstr "Parolayı Sıfırla"
diff --git a/addons/auth_reset_password/i18n/zh_CN.po b/addons/auth_reset_password/i18n/zh_CN.po
deleted file mode 100644
index f021be3af60..00000000000
--- a/addons/auth_reset_password/i18n/zh_CN.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-28 07:14+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-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\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"
-"一个关联到这个Email地址的Openerp帐号请求复位密码。\n"
-"你可以修改你的密码通过下面这个链接  <a href=\"${object.signup_url}\">。\n"
-"提醒：如果你没请求复位密码，请忽略这封邮件。"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Send a special url by email to make the user (re)set their password."
-msgstr ""
-
-#. module: auth_reset_password
-#: code:addons/auth_reset_password/res_users.py:59
-#, python-format
-msgid "Cannot send email: user has no email address."
-msgstr ""
-
-#. module: auth_reset_password
-#: model:ir.model,name:auth_reset_password.model_res_users
-msgid "Users"
-msgstr "用户"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "{}"
-msgstr ""
-
-#. module: auth_reset_password
-#. openerp-web
-#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
-#, python-format
-msgid "Reset password"
-msgstr "重设密码"
-
-#. module: auth_reset_password
-#: model:email.template,subject:auth_reset_password.reset_password_email
-msgid "Password reset"
-msgstr "重置密码"
-
-#. module: auth_reset_password
-#: view:res.users:0
-msgid "Reset Password"
-msgstr "重置密码"
diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
deleted file mode 100644
index cfac20c76f9..00000000000
--- a/addons/auth_reset_password/res_users.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- 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/>
-#
-##############################################################################
-
-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
-
-def now(**kwargs):
-    dt = datetime.now() + timedelta(**kwargs)
-    return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-
-    def reset_password(self, cr, uid, login, context=None):
-        """ retrieve the user corresponding to login (login or email),
-            and reset their password
-        """
-        user_ids = self.search(cr, uid, [('login', '=', login)], context=context)
-        if not user_ids:
-            user_ids = self.search(cr, uid, [('email', '=', login)], context=context)
-        if len(user_ids) != 1:
-            raise Exception('Reset password: invalid username or email')
-        return self.action_reset_password(cr, uid, user_ids, context=context)
-
-    def action_reset_password(self, cr, uid, ids, context=None):
-        """ create signup token for each user, and send their signup url by email """
-        # prepare reset password signup
-        res_partner = self.pool.get('res.partner')
-        partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)]
-        res_partner.signup_prepare(cr, uid, partner_ids, expiration=now(days=+1), context=context)
-
-        # send email to users with their signup url
-        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
deleted file mode 100644
index 628e95b6ff9..00000000000
--- a/addons/auth_reset_password/res_users_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record id="res_users_form_view" model="ir.ui.view">
-            <field name="name">user.form.reset_password</field>
-            <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"
-                            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>
-
-    </data>
-</openerp>
diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js
deleted file mode 100644
index 13fe2a39ce5..00000000000
--- a/addons/auth_reset_password/static/src/js/reset_password.js
+++ /dev/null
@@ -1,30 +0,0 @@
-openerp.auth_reset_password = function(instance) {
-    var _t = instance.web._t;
-
-    instance.web.Login.include({
-        start: function() {
-            this.$('a.oe_reset_password').click(this.do_reset_password);
-            return this._super();
-        },
-        do_reset_password: function(ev) {
-            if (ev) {
-                ev.preventDefault();
-            }
-            var db = this.$("form [name=db]").val();
-            var login = this.$("form input[name=login]").val();
-            if (!db) {
-                this.do_warn("Login", "No database selected !");
-                return false;
-            } else if (!login) {
-                this.do_warn("Login", "Please enter a username or email address.")
-                return false;
-            }
-            var params = {
-                dbname : db,
-                login: login,
-            };
-            var url = "/auth_reset_password/reset_password?" + $.param(params);
-            window.location = url;
-        }
-    });
-};
diff --git a/addons/auth_reset_password/static/src/xml/reset_password.xml b/addons/auth_reset_password/static/src/xml/reset_password.xml
deleted file mode 100644
index 841f3906622..00000000000
--- a/addons/auth_reset_password/static/src/xml/reset_password.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1: -->
-<templates id="template" xml:space="preserve">
-
-<t t-extend="Login">
-    <t t-jquery="form ul:first li:last" t-operation="after">
-        <li><a class="oe_reset_password" href="#">Reset password</a></li>
-    </t>
-</t>
-
-</templates>
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 235ac047346..5fe705a4440 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -22,15 +22,18 @@
 {
     'name': 'Signup',
     'description': """
-Allow users to sign up.
-=======================
+Allow users to sign up and reset their password
+===============================================
     """,
     'author': 'OpenERP SA',
     'version': '1.0',
     'category': 'Authentication',
     'website': 'http://www.openerp.com',
     'installable': True,
-    'depends': ['base_setup'],
+    'depends': [
+        'base_setup',
+        'email_template',
+    ],
     'data': [
         'auth_signup_data.xml',
         'res_config.xml',
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 39b62148494..32e397b1ba6 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -18,5 +18,20 @@
             <field name="value" ref="default_template_user"/>
         </record>
 
+        <!-- Email template for reset password -->
+        <record id="reset_password_email" model="email.template">
+            <field name="name">Reset Password</field>
+            <field name="model_id" ref="base.model_res_users"/>
+            <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
+            <field name="email_to">${object.email}</field>
+            <field name="subject">Password reset</field>
+            <field name="body_html"><![CDATA[
+<p>A password reset was requested for the OpenERP account linked to this email.</p>
+
+<p>You may change your password by following <a href="${object.signup_url}">this link</a>.</p>
+
+<p>Note: If you do not expect this, you can safely ignore this email.</p>]]></field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 888d2131f42..d2429e8dfd2 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -19,10 +19,12 @@
 #
 ##############################################################################
 import logging
+import urllib
+
+import werkzeug
 
 import openerp
 from openerp.modules.registry import RegistryManager
-
 from ..res_users import SignupError
 
 _logger = logging.getLogger(__name__)
@@ -30,6 +32,18 @@ _logger = logging.getLogger(__name__)
 class Controller(openerp.addons.web.http.Controller):
     _cp_path = '/auth_signup'
 
+    @openerp.addons.web.http.jsonrequest
+    def get_config(self, req, dbname):
+        """ retrieve the module config (which features are enabled) for the login page """
+        registry = RegistryManager.get(dbname)
+        with registry.cursor() as cr:
+            icp = registry.get('ir.config_parameter')
+            config = {
+                'signup': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True',
+                'reset_password': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True',
+            }
+        return config
+
     @openerp.addons.web.http.jsonrequest
     def retrieve(self, req, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
@@ -56,4 +70,21 @@ class Controller(openerp.addons.web.http.Controller):
             cr.commit()
         return {}
 
+    @openerp.addons.web.http.httprequest
+    def reset_password(self, req, dbname, login):
+        """ retrieve user, and perform reset password """
+        registry = RegistryManager.get(dbname)
+        with registry.cursor() as cr:
+            try:
+                res_users = registry.get('res.users')
+                res_users.reset_password(cr, openerp.SUPERUSER_ID, login)
+                cr.commit()
+                message = 'An email has been sent with credentials to reset your password'
+            except Exception as e:
+                # signup error
+                _logger.exception('error when resetting password')
+                message = e.message
+        params = [('action', 'login'), ('error_message', message)]
+        return werkzeug.utils.redirect("/#" + urllib.urlencode(params))
+
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_signup/i18n/ar.po b/addons/auth_signup/i18n/ar.po
index 6f3c45fecf1..90814343ae6 100644
--- a/addons/auth_signup/i18n/ar.po
+++ b/addons/auth_signup/i18n/ar.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
 "PO-Revision-Date: 2012-12-01 11:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_signup
@@ -29,16 +29,51 @@ msgstr ""
 msgid "Confirm Password"
 msgstr ""
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr ""
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
@@ -56,6 +91,26 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
@@ -67,13 +122,15 @@ msgid "Signup URL"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Active"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
 msgstr ""
 
 #. module: auth_signup
-#: help:base.config.settings,auth_signup_uninvited:0
-msgid "If unchecked, only invited users may sign up"
+#: selection:res.users,state:0
+msgid "Active"
 msgstr ""
 
 #. module: auth_signup
@@ -90,6 +147,18 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
@@ -102,6 +171,11 @@ msgstr ""
 msgid "Signup Expiration"
 msgstr ""
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
@@ -115,8 +189,48 @@ msgid "Signup Token is Valid"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Resetting Password"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
 msgstr ""
 
 #. module: auth_signup
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index 478a4a25e16..bde3b33684e 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 14:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,16 +27,51 @@ msgstr ""
 msgid "Confirm Password"
 msgstr ""
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr ""
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
@@ -54,6 +89,23 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
@@ -65,13 +117,15 @@ msgid "Signup URL"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Active"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
 msgstr ""
 
 #. module: auth_signup
-#: help:base.config.settings,auth_signup_uninvited:0
-msgid "If unchecked, only invited users may sign up"
+#: selection:res.users,state:0
+msgid "Active"
 msgstr ""
 
 #. module: auth_signup
@@ -88,6 +142,18 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
@@ -100,6 +166,11 @@ msgstr ""
 msgid "Signup Expiration"
 msgstr ""
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
@@ -113,8 +184,48 @@ msgid "Signup Token is Valid"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Resetting Password"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
 msgstr ""
 
 #. module: auth_signup
diff --git a/addons/auth_signup/i18n/it.po b/addons/auth_signup/i18n/it.po
new file mode 100644
index 00000000000..854bdd34185
--- /dev/null
+++ b/addons/auth_signup/i18n/it.po
@@ -0,0 +1,258 @@
+# Italian 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: \n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 20:16+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "Reimposta password"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Ripristino password"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Utenti"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Reimposta Password"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po
index 531bbb16418..be66d178c58 100644
--- a/addons/auth_signup/i18n/nb.po
+++ b/addons/auth_signup/i18n/nb.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
 "PO-Revision-Date: 2012-12-02 20:32+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-12-04 05:55+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_signup
@@ -29,16 +29,51 @@ msgstr "Tillate eksterne brukere å registrere seg."
 msgid "Confirm Password"
 msgstr "Bekreft passord."
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
 msgstr "Base.Konfigurasjon.Innstillinger."
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr ""
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
@@ -56,6 +91,26 @@ msgstr "Ny."
 msgid "Status"
 msgstr "Status."
 
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
@@ -66,16 +121,18 @@ msgstr "Brukere"
 msgid "Signup URL"
 msgstr "Regitrer deg URL."
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
 msgstr "Aktiv."
 
-#. module: auth_signup
-#: help:base.config.settings,auth_signup_uninvited:0
-msgid "If unchecked, only invited users may sign up"
-msgstr ""
-
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -90,6 +147,18 @@ msgstr "Brukernavn."
 msgid "Name"
 msgstr "Navn."
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "Tilbakestill Passord."
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
@@ -102,6 +171,11 @@ msgstr "Brukernavn (E-post)"
 msgid "Signup Expiration"
 msgstr "Registrerings utløpsdato."
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
@@ -115,9 +189,49 @@ msgid "Signup Token is Valid"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Resetting Password"
-msgstr "Tilbakestill Passord."
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
 
 #. module: auth_signup
 #. openerp-web
diff --git a/addons/auth_signup/i18n/nl.po b/addons/auth_signup/i18n/nl.po
index b986f545710..96bbebd9134 100644
--- a/addons/auth_signup/i18n/nl.po
+++ b/addons/auth_signup/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 15:29+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 20:16+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-12-04 05:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_signup
@@ -29,16 +29,51 @@ msgstr "Toestaan dat externe gebruikers inloggen"
 msgid "Confirm Password"
 msgstr "Bevestig wachtwoord"
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "Reset wachtwoord"
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr ""
 
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Reset wachtwoord"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
@@ -56,6 +91,26 @@ msgstr "Nieuw"
 msgid "Status"
 msgstr "Status"
 
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
@@ -66,16 +121,18 @@ msgstr "Gebruikers"
 msgid "Signup URL"
 msgstr "URL voor aanmelden"
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
 msgstr "Actief"
 
-#. module: auth_signup
-#: help:base.config.settings,auth_signup_uninvited:0
-msgid "If unchecked, only invited users may sign up"
-msgstr ""
-
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -90,6 +147,18 @@ msgstr "Gebruikersnaam"
 msgid "Name"
 msgstr "Naam"
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
@@ -102,6 +171,11 @@ msgstr ""
 msgid "Signup Expiration"
 msgstr ""
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
@@ -115,8 +189,48 @@ msgid "Signup Token is Valid"
 msgstr ""
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Resetting Password"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Stel wachtwoord opnieuw in"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
 msgstr ""
 
 #. module: auth_signup
diff --git a/addons/auth_signup/i18n/pt_BR.po b/addons/auth_signup/i18n/pt_BR.po
new file mode 100644
index 00000000000..4fa96cf0535
--- /dev/null
+++ b/addons/auth_signup/i18n/pt_BR.po
@@ -0,0 +1,270 @@
+# Brazilian Portuguese 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-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 18:30+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "Permitir inscrição de usuários externos"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr "Confirmar Senha"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr "Se não marcado, somente usuários convidados poderão inscrever-se"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "Configurações"
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+"Não foi possível enviar e-mail: o usuário não tem um endereço de e-mail"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "Redefinir Senha"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr "Modelo de usuário para novos usuários criados através de inscrição"
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Redefinir Senha"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr "Por favor digite uma senha e sua confirmação."
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr "Enviar um e-mail para o usuário para (re)definir sua senha."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr "Inscreva-se"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr "Novo"
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "Situação"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+"\n"
+"<p>Uma redefinição de senha foi solicitada para a conta OpenERP associada a "
+"este e-mail.</p>\n"
+"\n"
+"<p>Você pode mudar sua senha acessando <a href=\"${object.signup_url}\">este "
+"endereço</a>.</p>\n"
+"\n"
+"<p>Nota: Se esta ação não era esperada, você pode seguramente ignorar este e-"
+"mail.</p>"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr "Por favor informe um nome."
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Usuários"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr "URL de inscrição"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr "Por favor informe um nome de usuário"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr "Nome do Usuário"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr "Nome"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr "Por favor informe um nome de usuário ou endereço de e-mail."
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "Redefinindo a Senha"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr "Nome de Usuário (E-mail)"
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr "Expiração de Inscrição"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+"Permite aos usuários disparar a redefinição de senha a partir da página de "
+"autenticação."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
+#, python-format
+msgid "Log in"
+msgstr "Acessar"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr "Token de Inscrição é Válido"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr "Autenticação"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr "Token de inscrição inválido"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr "As senhas não combinam; por favor redigite-as."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr "Nenhuma base de dados selecionada !"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Redefinir Senha"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr "Habilitar redefinição de senha a partir da página de autenticação"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr "Voltar para a Página de Autenticação"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr "Inscreva-se"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr "Token de Inscrição"
diff --git a/addons/auth_signup/i18n/tr.po b/addons/auth_signup/i18n/tr.po
new file mode 100644
index 00000000000..b5b0822191e
--- /dev/null
+++ b/addons/auth_signup/i18n/tr.po
@@ -0,0 +1,258 @@
+# 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: \n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 20:16+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Parola sıfırlandı"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Parolayı Sıfırla"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 562ea9e53cf..813db8acad6 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-28 16:52+0000\n"
+"POT-Creation-Date: 2012-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-04 20:16+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-12-04 05:55+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: auth_signup
@@ -29,16 +29,51 @@ msgstr "允许外部用户登录"
 msgid "Confirm Password"
 msgstr "确认密码"
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
 
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "重设密码"
+
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
 msgstr "用作通过注册创建的新用户的模版"
 
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "重置密码"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
@@ -56,6 +91,26 @@ msgstr "新建"
 msgid "Status"
 msgstr "状态"
 
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.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 by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
@@ -66,16 +121,18 @@ msgstr "用户"
 msgid "Signup URL"
 msgstr "注册 URL"
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
 msgstr "启用"
 
-#. module: auth_signup
-#: help:base.config.settings,auth_signup_uninvited:0
-msgid "If unchecked, only invited users may sign up"
-msgstr "如果不选中，只有被邀请用户方可注册。"
-
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -90,6 +147,18 @@ msgstr "用户名"
 msgid "Name"
 msgstr "姓名"
 
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "复位密码"
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
@@ -102,6 +171,11 @@ msgstr "用户名(Email)"
 msgid "Signup Expiration"
 msgstr "注册过期"
 
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
@@ -115,9 +189,49 @@ msgid "Signup Token is Valid"
 msgstr "注册令牌（ Token  ）是有效的"
 
 #. module: auth_signup
-#: selection:res.users,state:0
-msgid "Resetting Password"
-msgstr "复位密码"
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "重置密码"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
 
 #. module: auth_signup
 #. openerp-web
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 21fce19745c..9cdb41568ff 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -26,14 +26,19 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_uninvited': fields.boolean('Allow external users to sign up', help="If unchecked, only invited users may sign up"),
-        'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
+        'auth_signup_reset_password': fields.boolean('Enable password reset from Login page',
+            help="This allows users to trigger a password reset from the Login page."),
+        'auth_signup_uninvited': fields.boolean('Allow external users to sign up',
+            help="If unchecked, only invited users may sign up."),
+        'auth_signup_template_user_id': fields.many2one('res.users',
+            string='Template user for new users created through signup'),
     }
 
     def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
         # we use safe_eval on the result, since the value of the parameter is a nonempty string
         return {
+            'auth_signup_reset_password': safe_eval(icp.get_param(cr, uid, 'auth_signup.reset_password', 'False')),
             'auth_signup_uninvited': safe_eval(icp.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')),
             'auth_signup_template_user_id': safe_eval(icp.get_param(cr, uid, 'auth_signup.template_user_id', 'False')),
         }
@@ -42,5 +47,6 @@ class base_config_settings(osv.TransientModel):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
         # we store the repr of the values, since the value of the parameter is a required string
+        icp.set_param(cr, uid, 'auth_signup.reset_password', repr(config.auth_signup_reset_password))
         icp.set_param(cr, uid, 'auth_signup.allow_uninvited', repr(config.auth_signup_uninvited))
         icp.set_param(cr, uid, 'auth_signup.template_user_id', repr(config.auth_signup_template_user_id.id))
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 9d3eb4eaa5a..86c56a065a7 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -8,6 +8,10 @@
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='module_auth_anonymous']/.." position="after">
+                    <div>
+                        <field name="auth_signup_reset_password" class="oe_inline"/>
+                        <label for="auth_signup_reset_password"/>
+                    </div>
                     <div>
                         <field name="auth_signup_uninvited" class="oe_inline"/>
                         <label for="auth_signup_uninvited"/>
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 7dbb19853a2..8380cd8b23f 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -18,14 +18,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
+from datetime import datetime, timedelta
 import random
-import time
 import urllib
 import urlparse
 
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval
+from openerp.tools.translate import _
 
 class SignupError(Exception):
     pass
@@ -33,10 +34,12 @@ class SignupError(Exception):
 def random_token():
     # the token has an entropy of about 120 bits (6 bits/char * 20 chars)
     chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-    return ''.join(random.choice(chars) for _ in xrange(20))
+    return ''.join(random.choice(chars) for i in xrange(20))
+
+def now(**kwargs):
+    dt = datetime.now() + timedelta(**kwargs)
+    return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
-def now():
-    return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
 
 class res_partner(osv.Model):
     _inherit = 'res.partner'
@@ -58,7 +61,7 @@ class res_partner(osv.Model):
             # when required, make sure the partner has a valid signup token
             if context and context.get('signup_valid') and not partner.user_ids:
                 self.signup_prepare(cr, uid, [partner.id], context=context)
-    
+
             action_template = None
             params = {
                 'action': urllib.quote(action),
@@ -218,3 +221,39 @@ class res_users(osv.Model):
         # create a copy of the template user (attached to a specific partner_id if given)
         values['active'] = True
         return self.copy(cr, uid, template_user_id, values, context=context)
+
+    def reset_password(self, cr, uid, login, context=None):
+        """ retrieve the user corresponding to login (login or email),
+            and reset their password
+        """
+        user_ids = self.search(cr, uid, [('login', '=', login)], context=context)
+        if not user_ids:
+            user_ids = self.search(cr, uid, [('email', '=', login)], context=context)
+        if len(user_ids) != 1:
+            raise Exception('Reset password: invalid username or email')
+        return self.action_reset_password(cr, uid, user_ids, context=context)
+
+    def action_reset_password(self, cr, uid, ids, context=None):
+        """ create signup token for each user, and send their signup url by email """
+        # prepare reset password signup
+        res_partner = self.pool.get('res.partner')
+        partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)]
+        res_partner.signup_prepare(cr, uid, partner_ids, expiration=now(days=+1), context=context)
+
+        # send email to users with their signup url
+        template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_signup', '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
+
+    def create(self, cr, uid, values, context=None):
+        # overridden to automatically invite user to sign up
+        user_id = super(res_users, self).create(cr, uid, values, context=context)
+        user = self.browse(cr, uid, user_id, context=context)
+        if user.email:
+            user.action_reset_password()
+        return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index c42e1ab5f41..90729c54285 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -7,11 +7,23 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
+                <!-- add state field in header -->
                 <xpath expr="//sheet" position="before">
                     <header>
                         <field name="state" widget="statusbar"/>
                     </header>
                 </xpath>
+                <!-- add 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"
+                            help="Send an email to the user to (re)set their password."/>
+                    </div>
+                </xpath>
+                <!-- hide field set_password -->
+                <field name="new_password" position="replace">
+                    <field name="new_password" groups="base.group_no_one"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 241c2406d56..1dfcf5fd8f9 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -43,8 +43,28 @@ openerp.auth_signup = function(instance) {
                         .fail(self.on_token_failed)
                 });
             }
+
+            // bind reset password link
+            this.$('a.oe_signup_reset_password').click(this.do_reset_password);
+
+            // make signup link and reset password link visible only when enabled
+            this.$('a.oe_signup_signup').hide();
+            this.$('a.oe_signup_reset_password').hide();
+            if (this.params.db) {
+                this.rpc("/auth_signup/get_config", {dbname: self.params.db})
+                    .done(function(result) {
+                        if (result.signup) {
+                            self.$('a.oe_signup_signup').show();
+                        }
+                        if (result.reset_password) {
+                            self.$('a.oe_signup_reset_password').show();
+                        }
+                    });
+            }
+
             return d;
         },
+
         on_token_loaded: function(result) {
             // select the right the database
             this.selected_db = result.db;
@@ -66,14 +86,16 @@ openerp.auth_signup = function(instance) {
                 this.$("form input[name=login]").val(result.login || "");
             }
         },
+
         on_token_failed: function(result, ev) {
             if (ev) {
                 ev.preventDefault();
             }
-            this.show_error("Invalid signup token");
+            this.show_error(_t("Invalid signup token"));
             delete this.params.db;
             delete this.params.token;
         },
+
         on_submit: function(ev) {
             if (ev) {
                 ev.preventDefault();
@@ -86,19 +108,19 @@ openerp.auth_signup = function(instance) {
                 var password = this.$("form input[name=password]").val();
                 var confirm_password = this.$("form input[name=confirm_password]").val();
                 if (!db) {
-                    this.do_warn("Login", "No database selected !");
+                    this.do_warn(_t("Login"), _t("No database selected !"));
                     return false;
                 } else if (!name) {
-                    this.do_warn("Login", "Please enter a name.");
+                    this.do_warn(_t("Login"), _t("Please enter a name."));
                     return false;
                 } else if (!login) {
-                    this.do_warn("Login", "Please enter a username.");
+                    this.do_warn(_t("Login"), _t("Please enter a username."));
                     return false;
                 } else if (!password || !confirm_password) {
-                    this.do_warn("Login", "Please enter a password and confirm it.");
+                    this.do_warn(_t("Login"), _t("Please enter a password and confirm it."));
                     return false;
                 } else if (password !== confirm_password) {
-                    this.do_warn("Login", "Passwords do not match; please retype them.");
+                    this.do_warn(_t("Login"), _t("Passwords do not match; please retype them."));
                     return false;
                 }
                 var params = {
@@ -124,6 +146,26 @@ openerp.auth_signup = function(instance) {
                 this._super(ev);
             }
         },
-    });
 
+        do_reset_password: function(ev) {
+            if (ev) {
+                ev.preventDefault();
+            }
+            var db = this.$("form [name=db]").val();
+            var login = this.$("form input[name=login]").val();
+            if (!db) {
+                this.do_warn(_t("Login"), _t("No database selected !"));
+                return false;
+            } else if (!login) {
+                this.do_warn(_t("Login"), _t("Please enter a username or email address."))
+                return false;
+            }
+            var params = {
+                dbname : db,
+                login: login,
+            };
+            var url = "/auth_signup/reset_password?" + $.param(params);
+            window.location = url;
+        },
+    });
 };
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index a51ced3778d..d1c04cb6807 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -22,6 +22,7 @@
                 <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>
+                <a class="oe_signup_reset_password" href="#">Reset password</a>
             </li>
         </t>
     </t>
diff --git a/addons/base_crypt/i18n/nb.po b/addons/base_crypt/i18n/nb.po
index 8e7de1fbc87..c9e2d8709d1 100644
--- a/addons/base_crypt/i18n/nb.po
+++ b/addons/base_crypt/i18n/nb.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-06-09 11:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-04 20:38+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-12-04 05:53+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Brukere."
 
 #, python-format
 #~ msgid "Error"
diff --git a/addons/base_gengo/i18n/zh_CN.po b/addons/base_gengo/i18n/zh_CN.po
new file mode 100644
index 00000000000..e53a023c8a1
--- /dev/null
+++ b/addons/base_gengo/i18n/zh_CN.po
@@ -0,0 +1,249 @@
+# 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-04 16:26+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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "评论"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "语言"
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr ""
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index a4b542d4294..08e355ad5d7 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-16 14:59+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:02+0000\n"
+"Last-Translator: Quentin THEURET <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-12-04 05:09+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: base_iban
@@ -85,7 +85,7 @@ msgstr "L'IBAN est incorrect, il doit commencer par le code pays"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "No IBAN du compte"
+msgstr "Compte IBAN"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index c807e1dd6e0..bbfaae1ef10 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-21 14:02+0000\n"
-"Last-Translator: GaCriv <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:03+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.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:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -29,7 +29,7 @@ msgstr "Invité"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
@@ -73,7 +73,7 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Devis et bons de commande"
 
 #. module: base_setup
 #: view:base.config.settings:0
diff --git a/addons/contacts/i18n/pt_BR.po b/addons/contacts/i18n/pt_BR.po
new file mode 100644
index 00000000000..07a59fe2e4b
--- /dev/null
+++ b/addons/contacts/i18n/pt_BR.po
@@ -0,0 +1,47 @@
+# Brazilian Portuguese 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-12-04 12:32+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\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"
+"            Clique para adicionar um contato no seu Livro de Endereços.\n"
+"          </p><p>\n"
+"            O OpenERP o auxilia a facilmente acompanhar todas as atividades "
+"relacionadas\n"
+"            a um cliente; discussões, histórico de oportunidades de "
+"negócio,\n"
+"            documentos, etc.\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 "Contatos"
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 7e83b8318e2..6b32be8d46d 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-29 15:18+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:31+0000\n"
+"Last-Translator: Fabrice (OpenERP) <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-12-04 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: crm
@@ -27,6 +27,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Permet de configurer votre serveur de courriels entrant, et de créer des "
+"pistes à partir de courriels entrant."
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -57,12 +59,14 @@ msgid ""
 "Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"L'appel téléphonique lié à l'opportunité <em>%s</em> a été créé et planifié "
+"à <em>%s</em>."
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Gérer les levées de fonds"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -79,7 +83,7 @@ msgstr "Délai pour clôturer"
 #: code:addons/crm/crm_lead.py:888
 #, python-format
 msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+msgstr "La piste a été <b>convertie en opportunité</b>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -87,7 +91,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -114,7 +118,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Formation"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -435,12 +439,13 @@ msgstr "Nb. d'opportunités"
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Pistes qui sont assignées à l'une des équipes de vente que je gère, ou à moi"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Action de conversion"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -580,6 +585,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Rappel sur piste: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -723,7 +730,7 @@ msgstr "Opportunité"
 #: code:addons/crm/crm_meeting.py:62
 #, python-format
 msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
+msgstr "Un rendez-vous a été <b>planifié</b> à <em>%s</em>."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -733,12 +740,12 @@ msgstr "Télévision"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Convertir en opportunités"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -760,6 +767,8 @@ msgstr "Rechercher les appels téléphoniques"
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Pistes/opportunités qui sont assignées à l'une des équipes de vente que je "
+"gère"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index abae9105d65..d59a83d5c2e 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 21:08+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-12-04 05:17+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: crm
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Her kan du konfigurere dine innkommende e-postserver, og opprette ledelse "
+"fra innkommende e-poster."
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -41,7 +43,7 @@ msgstr "Lead"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Tittel"
+msgstr "Tittel."
 
 #. module: crm
 #: field:crm.lead2partner,action:0
@@ -49,7 +51,7 @@ msgstr "Tittel"
 #: field:crm.phonecall2partner,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr "Handling"
+msgstr "Handling."
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:282
@@ -63,24 +65,24 @@ msgstr ""
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Administrere fondet øker."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Konverter til muligheter."
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Forsinket mht lukking"
+msgstr "Forsinket til lukking."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:888
 #, python-format
 msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+msgstr "Ledelse har blitt </b>konvertert til en mulighet </ b>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -88,57 +90,57 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Salgsman."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr "CRM lead-analyse"
+msgstr "CRM Ledelse Analyse."
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
 msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
+msgstr "Påminnelse på Ledelse: [[objekt.id]]"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr "Dag"
+msgstr "Dag."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Firmanavn."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Trening."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Salg lapper."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr "Forv. lukket"
+msgstr "Forv. lukket."
 
 #. module: crm
 #: help:crm.case.section,message_unread:0
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Hvis det er merket nye meldinger så krever dette din oppmerksomhet."
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr "Opprettelsesdato"
+msgstr "Opprettelses dag."
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -222,7 +224,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Påminnelse til bruker."
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -250,7 +252,7 @@ msgstr "Leads analyse"
 #: code:addons/crm/crm_lead.py:878
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s En samtale</b> for <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -378,7 +380,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 msgid "Dead"
-msgstr ""
+msgstr "Død."
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -386,7 +388,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -394,7 +396,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Koble til en eksisterende kunde."
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -435,12 +437,14 @@ msgstr "#Salgsmuligheter"
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Kundene som er tilordnet ett av salgs lagene jeg administrerer, eller til "
+"meg."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Konvertering handling."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -467,7 +471,7 @@ msgstr "Normalt møte eller telefonmøte for anledningen"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -523,7 +527,7 @@ msgstr "Planlagt omsetning"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
 msgid "CRM Phonecall: Mark read"
-msgstr ""
+msgstr "CRM Telefonsamtale: Merk lest."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -557,7 +561,7 @@ msgstr "Sammendrag"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Slå sammen."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -572,7 +576,7 @@ msgstr "Partner kontaktnavn"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
 msgid "CRM Phonecall: Mark unread"
-msgstr ""
+msgstr "CRM Telefonsamtale: Merk som ulest."
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -615,6 +619,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p Klasse=\"oe_vis_nocontent_opprett\">\n"
+"Klikk for å legge til en ny kategori.\n"
+"</p><p>\n"
+"Oppretter bestemte telefonsamtale kategorier for å definere type av\n"
+"samtaler spores i systemet.\n"
+"</p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -681,7 +692,7 @@ msgstr "Navn på segmentering"
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Ledelse fra USA."
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -702,7 +713,7 @@ msgstr "Statistikk konsoll"
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Stadiet endret til <b>%s</b>."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:755
@@ -722,7 +733,7 @@ msgstr "Salgsmulighet"
 #: code:addons/crm/crm_meeting.py:62
 #, python-format
 msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
+msgstr "En møte har vært<b>planlagt<b>på <em>%s</em>."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -732,12 +743,12 @@ msgstr "Fjernsyn"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Konverter til muligheter."
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "Salg.konfigurasjon.innstilling."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -747,7 +758,7 @@ msgstr "Stopp prosess"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Kallenavn."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -803,7 +814,7 @@ msgstr "Laget år"
 #: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "Eller."
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -837,6 +848,13 @@ msgid ""
 "Thanks,\n"
 "            "
 msgstr ""
+"Hallo [[objekt.bruker_ID.navn]],\n"
+"Kan du sjekke følgende ledelse, er det ikke åpne siden 5 dager?\n"
+"Ledelse:  [[Objekt.ID ]]\n"
+"Beskrivelse: \n"
+"[[objeckt.beskrivelse]]\n"
+"Takk,\n"
+"            "
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -874,7 +892,7 @@ msgstr "Gullpartner"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Suksess vurdering(%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -904,7 +922,7 @@ msgstr "Marker som tapt"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Kladd ledelse."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -916,7 +934,7 @@ msgstr "Mars"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Send e-post."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
@@ -944,7 +962,7 @@ msgstr "Mobil"
 #: code:addons/crm/crm_phonecall.py:270
 #, python-format
 msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
+msgstr "Telefonsamtalen har blitt <b>tilbakestilt og satt til åpen <b>."
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -1071,7 +1089,7 @@ msgstr "Opprettet dato"
 #: code:addons/crm/crm_lead.py:862
 #, python-format
 msgid "%s has been <b>created</b>."
-msgstr ""
+msgstr "%s har vært<b>opprettet</b>."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1127,7 +1145,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Slett."
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1139,7 +1157,7 @@ msgstr "Forventet omsetning"
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "Jeg."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:867
@@ -1157,7 +1175,7 @@ msgstr "September"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "Epost adressen til kontakten."
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1191,7 +1209,7 @@ msgstr "Åpningsdato"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta."
 
 #. module: crm
 #: field:crm.case.channel,name:0
@@ -1296,12 +1314,12 @@ msgstr "Dato"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Er en følger."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Pålogget støtte."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1353,7 +1371,7 @@ msgstr "Segmenteringsbeskrivelse"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Description"
-msgstr ""
+msgstr "Ledelse beskrivelse."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -1374,7 +1392,7 @@ msgstr "Kode"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Funksjoner."
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1389,7 +1407,7 @@ msgstr "Telefonsamtaler som har status utkast eller åpne"
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Salgsman."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1414,12 +1432,12 @@ msgstr "Avbryt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Muligheter tilordnet til meg eller mitt team (s)"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Informasjon."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1451,12 +1469,12 @@ msgstr "Lead/Salgsmulighet"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Slå sammen fører / muligheter."
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Brukes til å bestille stadier. Lavere er bedre."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1471,7 +1489,7 @@ msgstr "Leads/muligheter som har en åpen status"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Brukere."
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1532,12 +1550,12 @@ msgstr "Min(e) sak(er)"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Vis land."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1562,7 +1580,7 @@ msgstr "Konverter til prospekt til en partner"
 #: code:addons/crm/crm_lead.py:871
 #, python-format
 msgid "Opportunity has been <b>won</b>."
-msgstr ""
+msgstr "Mulighetene har blitt <b>vunnet</b>."
 
 #. module: crm
 #: view:crm.phonecall:0
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index 7b63e2282fb..c5a9dd4c6e2 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-04 10:30+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.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-12-04 05:49+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: crm_claim
@@ -64,7 +64,7 @@ msgstr "Délai pour fermer"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messages non lus"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -167,7 +167,7 @@ msgstr "Date de fermeture"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Faux"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -253,7 +253,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Abonnés"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -611,7 +611,7 @@ msgstr "Filtres étendus..."
 #: field:crm.claim,message_comment_ids:0
 #: help:crm.claim,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Commentaires et courriels"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -872,7 +872,7 @@ msgstr ""
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 4b8284e6933..610b738a649 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -7,15 +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-07-28 18:51+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-04 16:03+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -41,7 +40,7 @@ msgstr "Nó do processo"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "O diretório deve possuir um pai ou um local de armazenamento"
 
 #. module: document
 #: view:document.directory:0
@@ -55,7 +54,7 @@ msgid ""
 "will be used."
 msgstr ""
 "Campo para ser usado como o nome dos diretórios dos recursos. Se vazio, o "
-"\"nome\" Será usado."
+"\"nome\" será usado."
 
 #. module: document
 #: view:document.directory:0
@@ -108,7 +107,7 @@ msgstr "Conteúdo do Diretório"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr "Contexo dinâmico"
+msgstr "Contexto dinâmico"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -155,8 +154,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
-"Se verdadeiro, todos os anexos que correspondem com este recurso serão "
-"localizados. Se falso, somente os únicos que tem isso como pai."
+"Se verdadeiro, todos os anexos que correspondam a este recurso serão "
+"localizados. Se falso, somente os que o tiverem como pai."
 
 #. module: document
 #: view:document.directory:0
@@ -213,7 +212,7 @@ msgstr "Parceiro"
 #: model:ir.actions.act_window,name:document.act_res_partner_document
 #: model:ir.actions.act_window,name:document.zoom_directory
 msgid "Related Documents"
-msgstr "Documentos relacionados"
+msgstr "Documentos Relacionados"
 
 #. module: document
 #: model:ir.actions.act_window,help:document.action_document_file_form
@@ -227,6 +226,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para criar um novo documento. \n"
+"          </p><p>\n"
+"            O repositório de documentos fornece acesso a todos os anexos,\n"
+"            como e-mails, documentos de projeto, faturas etc.\n"
+"          </p>\n"
+"        "
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -262,7 +268,7 @@ msgstr "Armazenamento"
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Resource model"
-msgstr "Modelo de Recurso"
+msgstr "Modelo de recurso"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -280,7 +286,7 @@ msgstr "Tipo de Conteúdo"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Modificação"
 
 #. module: document
 #: view:document.directory:0
@@ -295,7 +301,7 @@ msgstr "Tipo"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -316,7 +322,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "Erro! Não é possível criar diretórios recursivos."
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -326,12 +332,12 @@ msgstr "Nome do Campo"
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr "Contexo de Campos"
+msgstr "Campos de Contexto"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr "Nome de arquivos armazenados"
+msgstr "Nome do Arquivo Armazenado"
 
 #. module: document
 #: view:document.directory:0
@@ -363,7 +369,7 @@ msgstr "Arquivos Virtuais"
 #: code:addons/document/document_storage.py:635
 #, python-format
 msgid "Error at doc write!"
-msgstr "Erro na gravação documento!"
+msgstr "Erro na gravação do documento!"
 
 #. module: document
 #: view:document.directory:0
@@ -400,18 +406,18 @@ msgstr "Segurança"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "Última Modificação do Usuário"
+msgstr "Usuário da Última Modificação"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
 #: view:report.document.user:0
 msgid "Files by User"
-msgstr ""
+msgstr "Arquivos Por Usuário"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "em"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -433,7 +439,7 @@ msgstr "Detalhes de Arquivos por Diretório"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "Todos arquivos de usuários"
+msgstr "Todos os arquivos de usuários"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_size_month
@@ -473,7 +479,7 @@ msgstr ""
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: document
 #: view:document.directory:0
@@ -493,7 +499,7 @@ msgstr "Relatório PDF"
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
-msgstr "Conteúdos"
+msgstr "Conteúdo"
 
 #. module: document
 #: field:document.directory,create_date:0
@@ -522,12 +528,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Conhecimento"
 
 #. module: document
 #: view:document.storage:0
 msgid "Document Storage"
-msgstr ""
+msgstr "Armazenamento dos Documentos"
 
 #. module: document
 #: view:document.configuration:0
@@ -573,7 +579,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Anexo(s)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -583,7 +589,7 @@ msgstr "Agosto"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Meus Documentos"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -673,7 +679,7 @@ msgstr "O nome do diretório deve ser único !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -720,7 +726,7 @@ msgstr "Subdiretório"
 #. module: document
 #: view:board.board:0
 msgid "Files by user"
-msgstr ""
+msgstr "Arquivos por usuário"
 
 #. module: document
 #: selection:document.storage,type:0
@@ -740,7 +746,7 @@ msgstr "Campo"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr "Diretório Dinâmico"
+msgstr "Contexto de Diretório Dinâmico"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -769,7 +775,7 @@ msgstr "Maio"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "Todos Arquivos do Usuário"
+msgstr "Todos os Arquivos do Usuário"
 
 #. module: document
 #: view:document.directory:0
@@ -779,12 +785,12 @@ msgstr "Para cada entrada aqui, arquivos virtuais irão aparecer nesta pasta"
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr "ir.attachment"
+msgstr "Anexo"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Users File"
-msgstr ""
+msgstr "Arquivo do Usuário"
 
 #. module: document
 #: view:document.directory:0
@@ -855,12 +861,12 @@ msgstr "Abril"
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 msgid "# of Files"
-msgstr "# de Arquivos"
+msgstr "Nº de Arquivos"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document Storage"
-msgstr ""
+msgstr "Pesquisar Armazenamento de Documentos"
 
 #. module: document
 #: view:document.directory:0
@@ -868,14 +874,15 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
-"Somente membros destes grupos terá accesso a este diretório e seus arquivos."
+"Somente os membros destes grupos terão acesso a este diretório e seus "
+"arquivos."
 
 #. module: document
 #. openerp-web
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -906,7 +913,7 @@ msgstr "res_config_contents"
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr "Estrutura de Diretórios"
+msgstr "Estrutura do Diretório"
 
 #. module: document
 #: field:report.document.user,name:0
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 85dc75b19f7..a454479fe68 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
@@ -8,15 +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: 2011-01-17 06:34+0000\n"
-"Last-Translator: Renato Lima - http://www.akretion.com "
-"<renatonlima@gmail.com>\n"
+"PO-Revision-Date: 2012-12-04 15:20+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -55,7 +54,7 @@ msgstr "Navegar pelos Arquivos"
 #. module: document_ftp
 #: help:knowledge.config.settings,document_ftp_url:0
 msgid "Click the url to browse the documents"
-msgstr ""
+msgstr "Clique na url para navegar pelos documentos"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -70,7 +69,7 @@ msgstr "Configuração do Servidor FTP"
 #. module: document_ftp
 #: field:knowledge.config.settings,document_ftp_url:0
 msgid "Browse Documents"
-msgstr ""
+msgstr "Navegar pelos Documentos"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -98,12 +97,12 @@ msgstr "Endereço"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
 msgid "Document FTP Browse"
-msgstr "Navegador FTP de documentos"
+msgstr "Navegador FTP de Documentos"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -113,12 +112,12 @@ msgstr "Configuração da Aplicação de Conhecimento"
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
 msgid "Document Browse"
-msgstr "Navegar por Documentos"
+msgstr "Navegador de Documentos"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
diff --git a/addons/document_page/i18n/pt_BR.po b/addons/document_page/i18n/pt_BR.po
index f43efbb5de7..9a236d9504d 100644
--- a/addons/document_page/i18n/pt_BR.po
+++ b/addons/document_page/i18n/pt_BR.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-17 00:06+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-04 15:32+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -22,13 +22,13 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: document_page
 #: view:document.page:0
 #: field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr "Último contribuidor(a)"
+msgstr "Último Contribuidor(a)"
 
 #. module: document_page
 #: view:document.page:0
@@ -45,12 +45,12 @@ msgstr "Menu"
 #: view:document.page:0
 #: model:ir.model,name:document_page.model_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Página do Documento"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_related_page_history
 msgid "Page History"
-msgstr "Página do Histórico"
+msgstr "Histórico da Página"
 
 #. module: document_page
 #: view:document.page:0
@@ -68,13 +68,15 @@ msgstr "Agrupar Por..."
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: document_page
 #: view:document.page:0
 msgid ""
 "that will be used as a content template for all new page of this category."
 msgstr ""
+"isto será utilizado como um modelo de conteúdo para todas as páginas desta "
+"categoria."
 
 #. module: document_page
 #: field:document.page,name:0
@@ -99,39 +101,39 @@ msgstr "wizard.document.page.history.show_diff"
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Modificado Por"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Tipo de página"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "Menu Information"
-msgstr "Menu de Informação"
+msgstr "Informação do Menu"
 
 #. module: document_page
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Histórico da Página de Documento"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
 msgid "Pages history"
-msgstr ""
+msgstr "Histórico das páginas"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #, python-format
 msgid "There are no changes in revisions."
-msgstr ""
+msgstr "Não há mudanças nas revisões."
 
 #. module: document_page
 #: field:document.page.history,create_date:0
@@ -150,17 +152,17 @@ msgstr "Diferença"
 #: model:ir.ui.menu,name:document_page.menu_page
 #: model:ir.ui.menu,name:document_page.menu_wiki
 msgid "Pages"
-msgstr "P&aacute;ginas"
+msgstr "Páginas"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Categorias"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Menu Superior(pai)"
+msgstr "Menu Superior"
 
 #. module: document_page
 #: field:document.page,create_date:0
@@ -171,27 +173,27 @@ msgstr "Criado em"
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
+msgstr "Você deve selecionar de uma a duas revisões de histórico!"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "Page history"
-msgstr ""
+msgstr "Histórico da página"
 
 #. module: document_page
 #: field:document.page.history,summary:0
 msgid "Summary"
-msgstr "Sumário"
+msgstr "Resumo"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
 msgid "Create web pages"
-msgstr ""
+msgstr "Criar páginas web"
 
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Histórico de Documentos"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -201,12 +203,12 @@ msgstr "Nome do Menu"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Página"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: document_page
 #: field:document.page,write_date:0
@@ -223,14 +225,14 @@ msgstr "Criar Menu"
 #. module: document_page
 #: field:document.page,display_content:0
 msgid "Displayed Content"
-msgstr ""
+msgstr "Conteúdo Exibido"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -246,9 +248,9 @@ msgstr "Diferença"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Tipo de Documento"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Filhos"
diff --git a/addons/fleet/i18n/nl.po b/addons/fleet/i18n/nl.po
index 4efa035a8b1..cc4b1b029b8 100644
--- a/addons/fleet/i18n/nl.po
+++ b/addons/fleet/i18n/nl.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-12-01 16:02+0000\n"
+"PO-Revision-Date: 2012-12-04 07:46+0000\n"
 "Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\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-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -25,7 +25,7 @@ msgstr "Hybride"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
 msgid "Compact"
-msgstr ""
+msgstr "Compacte"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_1
@@ -35,7 +35,7 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
 msgid "Unique number written on the vehicle motor (VIN/SN number)"
-msgstr ""
+msgstr "Uniek motor nummer (serienummer)"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
@@ -58,7 +58,7 @@ msgstr "Onbekend"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_20
 msgid "Engine/Drive Belt(s) Replacement"
-msgstr ""
+msgstr "Motor/aandrijfriem vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -183,7 +183,7 @@ msgstr "Geschatte kosten"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_16
 msgid "Charging System Diagnosis"
-msgstr ""
+msgstr "Oplaadsysteem diagnose"
 
 #. module: fleet
 #: help:fleet.vehicle,car_value:0
@@ -198,7 +198,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_24
 msgid "Head Gasket(s) Replacement"
-msgstr ""
+msgstr "Koppakking(en) vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -211,18 +211,18 @@ msgstr ""
 #: help:fleet.vehicle.cost,odometer:0
 #: help:fleet.vehicle.cost,odometer_id:0
 msgid "Odometer measure of the vehicle at the moment of this log"
-msgstr ""
+msgstr "Kilometerstand van het voertuig op het ogenblik van deze log"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Voorwaarden"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
 msgid "Vehicles with alerts"
-msgstr ""
+msgstr "Voertuig met waarschuwingen"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
@@ -233,12 +233,12 @@ msgstr "Voertuig kosten"
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Totale kosten"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
 msgid "Both"
-msgstr ""
+msgstr "Beide"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_id:0
@@ -250,7 +250,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Terminate Contract"
-msgstr ""
+msgstr "Beëindigen contract"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,parent_id:0
@@ -260,7 +260,7 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Frequency of the recuring cost"
-msgstr ""
+msgstr "Frequentie van de terugkerende kosten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_1
@@ -273,6 +273,8 @@ msgid ""
 "Date when the coverage of the contract expirates (by default, one year after "
 "begin date)"
 msgstr ""
+"Datum waarop de dekking van het contract vervalt (standaard, een jaar na "
+"begindatum)"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -286,17 +288,17 @@ msgstr ""
 #: code:addons/fleet/fleet.py:47
 #, python-format
 msgid "Operation not allowed!"
-msgstr ""
+msgstr "Handeling niet toegestaan!"
 
 #. module: fleet
 #: field:fleet.vehicle,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
-msgstr ""
+msgstr "Voertuig waar deze log betrekking op heeft"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_amount:0
@@ -308,42 +310,42 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_6
 msgid "Air Filter Replacement"
-msgstr ""
+msgstr "Luchtfilter vervanging"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_tag
 msgid "fleet.vehicle.tag"
-msgstr ""
+msgstr "fleet.vehicle.tag"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the services logs for this vehicle"
-msgstr ""
+msgstr "Toon de service log van dit voertuig"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_name:0
 msgid "Name of contract to renew soon"
-msgstr ""
+msgstr "Naam van het contract dat binnenkort vernieuwd moet worden"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
 msgid "Senior"
-msgstr ""
+msgstr "Senior"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,state:0
 msgid "Choose wheter the contract is still valid or not"
-msgstr ""
+msgstr "Kies of het contract nog geldig is of niet"
 
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Automatic"
-msgstr ""
+msgstr "Automatisch"
 
 #. module: fleet
 #: help:fleet.vehicle,message_unread:0
@@ -354,32 +356,32 @@ msgstr ""
 #: code:addons/fleet/fleet.py:414
 #, python-format
 msgid "Driver: from '%s' to '%s'"
-msgstr ""
+msgstr "Bestuurder: van '%s' tot '%s'"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "and"
-msgstr ""
+msgstr "en"
 
 #. module: fleet
 #: field:fleet.vehicle.model.brand,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Foto van gemiddelde grootte"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_34
 msgid "Oxygen Sensor Replacement"
-msgstr ""
+msgstr "Zuurstof sensor vervanging"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Service Type"
-msgstr ""
+msgstr "Servicetype"
 
 #. module: fleet
 #: help:fleet.vehicle,transmission:0
 msgid "Transmission Used by the vehicle"
-msgstr ""
+msgstr "Transmissie van het voertuig"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:726
@@ -387,37 +389,37 @@ msgstr ""
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
 msgid "Renew Contract"
-msgstr ""
+msgstr "Vernieuw Contract"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the odometer logs for this vehicle"
-msgstr ""
+msgstr "Toon de kilometerteller logs van dit voertuig"
 
 #. module: fleet
 #: help:fleet.vehicle,odometer_unit:0
 msgid "Unit of the odometer "
-msgstr ""
+msgstr "Eenheid van de kilometerteller "
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Services Costs Per Month"
-msgstr ""
+msgstr "Service kosten per maand"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Effective Costs"
-msgstr ""
+msgstr "Werkelijke kosten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_8
 msgid "Repair and maintenance"
-msgstr ""
+msgstr "Herstel en onderhoud"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,purchaser_id:0
 msgid "Person to which the contract is signed for"
-msgstr ""
+msgstr "Persoon voor wie het contract wordt getekend"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
@@ -450,19 +452,19 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Contracts Costs"
-msgstr ""
+msgstr "Contract kosten"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
 msgid "Vehicles Services Logs"
-msgstr ""
+msgstr "Voertuig service logs"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
 msgid "Vehicles Fuel Logs"
-msgstr ""
+msgstr "Voertuig brandstof logs"
 
 #. module: fleet
 #: view:fleet.vehicle.model.brand:0
@@ -474,7 +476,7 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Vehicles With Alerts"
-msgstr ""
+msgstr "Voertuigen met waarschuwingen"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
@@ -492,7 +494,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the fuel logs for this vehicle"
-msgstr ""
+msgstr "toon de brandstof log van dit voertuig"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,purchaser_id:0
@@ -502,12 +504,12 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,license_plate:0
 msgid "License Plate"
-msgstr ""
+msgstr "Kentekenplaat"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
-msgstr ""
+msgstr "Terugkerende kosten frequentie"
 
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,inv_ref:0
@@ -518,22 +520,22 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Volgers"
 
 #. module: fleet
 #: field:fleet.vehicle,location:0
 msgid "Location"
-msgstr ""
+msgstr "Locatie"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Costs Per Month"
-msgstr ""
+msgstr "Kosten per maand"
 
 #. module: fleet
 #: field:fleet.contract.state,name:0
 msgid "Contract Status"
-msgstr ""
+msgstr "Status contract"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_total:0
@@ -595,53 +597,53 @@ msgstr ""
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
 msgid "Fuel log for vehicles"
-msgstr ""
+msgstr "Brandstoflog voor voertuigen"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Engine Options"
-msgstr ""
+msgstr "Motor opties"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 msgid "Fuel Costs Per Month"
-msgstr ""
+msgstr "Brandstofkosten per maand"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
 msgid "Sedan"
-msgstr ""
+msgstr "Sedan"
 
 #. module: fleet
 #: field:fleet.vehicle,seats:0
 msgid "Seats Number"
-msgstr ""
+msgstr "Aantal zitplaatsen"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
 msgid "Convertible"
-msgstr ""
+msgstr "Carbriolet"
 
 #. module: fleet
 #: model:ir.ui.menu,name:fleet.fleet_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,sum_cost:0
 msgid "Indicative Costs Total"
-msgstr ""
+msgstr "Totaal indicatieve kosten"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
 msgid "Junior"
-msgstr ""
+msgstr "Junior"
 
 #. module: fleet
 #: help:fleet.vehicle,model_id:0
 msgid "Model of the vehicle"
-msgstr ""
+msgstr "Voertuigmodel"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
@@ -655,13 +657,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier om een voertuig status te maken.\n"
+"              </p><p>\n"
+"                U kunt de mogelijke statussen aanpassen om de status van "
+"ieder voertuig te volgen. Bijvoorbeeld: Actief, In reparatie, Verkocht.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:fleet.vehicle:0
 #: field:fleet.vehicle,log_fuel:0
 #: view:fleet.vehicle.log.fuel:0
 msgid "Fuel Logs"
-msgstr ""
+msgstr "Brandstof logs"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:409
@@ -670,23 +679,23 @@ msgstr ""
 #: code:addons/fleet/fleet.py:420
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
 msgid "Indicative Costs Analysis"
-msgstr ""
+msgstr "Indicatieve kosten analyse"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_12
 msgid "Brake Inspection"
-msgstr ""
+msgstr "Reminspectie"
 
 #. module: fleet
 #: help:fleet.vehicle,state:0
 msgid "Current state of the vehicle"
-msgstr ""
+msgstr "Huidige staat van het voertuig"
 
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
@@ -696,7 +705,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
 msgid "Wheel Bearing Replacement"
-msgstr ""
+msgstr "Wiellager vervangen"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,cost_subtype:0
@@ -706,7 +715,7 @@ msgstr ""
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Gasoline"
-msgstr ""
+msgstr "Benzine"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
@@ -716,36 +725,40 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier om een nieuw merk te maken.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,start_date:0
 msgid "Contract Start Date"
-msgstr ""
+msgstr "Startdatum contract"
 
 #. module: fleet
 #: field:fleet.vehicle,odometer_unit:0
 msgid "Odometer Unit"
-msgstr ""
+msgstr "Kilometerteller"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_30
 msgid "Intake Manifold Gasket Replacement"
-msgstr ""
+msgstr "Pakking inlaatspruitstuk vervangen"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Daily"
-msgstr ""
+msgstr "Dagelijks"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_6
 msgid "Snow tires"
-msgstr ""
+msgstr "Winterbanden"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,date:0
 msgid "Date when the cost has been executed"
-msgstr ""
+msgstr "Datum waarop de kosten zijn gemaakt"
 
 #. module: fleet
 #: field:fleet.vehicle.state,sequence:0
@@ -755,7 +768,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Vehicles costs"
-msgstr ""
+msgstr "Voertuig kosten"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_services
@@ -765,7 +778,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Indicative Cost"
-msgstr ""
+msgstr "Indicatieve kosten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_26
@@ -778,48 +791,50 @@ msgid ""
 "Create a new contract automatically with all the same informations except "
 "for the date that will start at the end of current contract"
 msgstr ""
+"Maak een nieuw contract aan met de dezelfde informatie, met uitzondering van "
+"het de startdatum die begint aan het einde van het lopende contract"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Beëindigd"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_cost
 msgid "Cost related to a vehicle"
-msgstr ""
+msgstr "Kosten gerelateerd aan het voertuig"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_33
 msgid "Other Maintenance"
-msgstr ""
+msgstr "Overig onderhoud"
 
 #. module: fleet
 #: field:fleet.vehicle.model,brand:0
 #: view:fleet.vehicle.model.brand:0
 msgid "Model Brand"
-msgstr ""
+msgstr "Model merk"
 
 #. module: fleet
 #: field:fleet.vehicle.model.brand,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Kleine foto"
 
 #. module: fleet
 #: field:fleet.vehicle,state:0
 #: view:fleet.vehicle.state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_generated:0
 msgid "Recurring Cost Amount"
-msgstr ""
+msgstr "Terugkerende kosten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_49
 msgid "Transmission Replacement"
-msgstr ""
+msgstr "Transmissie vervangen"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
@@ -838,7 +853,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_11
 msgid "Brake Caliper Replacement"
-msgstr ""
+msgstr "Remklauw vervangen"
 
 #. module: fleet
 #: field:fleet.vehicle,odometer:0
@@ -849,22 +864,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
 msgid "Vehicle Model"
-msgstr ""
+msgstr "Voertuig model"
 
 #. module: fleet
 #: field:fleet.vehicle,doors:0
 msgid "Doors Number"
-msgstr ""
+msgstr "Aantal deuren"
 
 #. module: fleet
 #: help:fleet.vehicle,acquisition_date:0
 msgid "Date when the vehicle has been bought"
-msgstr ""
+msgstr "Datum waarop het voertuig is gekocht"
 
 #. module: fleet
 #: view:fleet.vehicle.model:0
 msgid "Models"
-msgstr ""
+msgstr "Modellen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -874,7 +889,7 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,fuel_type:0
 msgid "Fuel Used by the vehicle"
-msgstr ""
+msgstr "Brandstof voor het voertuig"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -890,12 +905,12 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
 
 #. module: fleet
 #: field:fleet.vehicle,horsepower:0
 msgid "Horsepower"
-msgstr ""
+msgstr "Paardenkracht"
 
 #. module: fleet
 #: field:fleet.vehicle,image:0
@@ -906,7 +921,7 @@ msgstr ""
 #: field:fleet.vehicle.model,image_small:0
 #: field:fleet.vehicle.model.brand,image:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: fleet
 #: field:fleet.vehicle,horsepower_tax:0
@@ -938,7 +953,7 @@ msgstr ""
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
 msgid "Fuel Costs by Month"
-msgstr ""
+msgstr "Brandstofkosten per maand"
 
 #. module: fleet
 #: help:fleet.vehicle.model.brand,image:0
@@ -955,18 +970,18 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "All vehicles"
-msgstr ""
+msgstr "Alle voertuigen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 #: view:fleet.vehicle.log.services:0
 msgid "Additional Details"
-msgstr ""
+msgstr "Extra details"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
 msgid "Services Costs by Month"
-msgstr ""
+msgstr "Service kosten per maand"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_9
@@ -976,88 +991,88 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,price_per_liter:0
 msgid "Price Per Liter"
-msgstr ""
+msgstr "Prijs per liter"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_17
 msgid "Door Window Motor/Regulator Replacement"
-msgstr ""
+msgstr "Portierruit motor/regelaar vervangen"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_46
 msgid "Tire Service"
-msgstr ""
+msgstr "Bandenservice"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_8
 msgid "Ball Joint Replacement"
-msgstr ""
+msgstr "Kogelgewricht vervangen"
 
 #. module: fleet
 #: field:fleet.vehicle,fuel_type:0
 msgid "Fuel Type"
-msgstr ""
+msgstr "Brandstof type"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_22
 msgid "Fuel Injector Replacement"
-msgstr ""
+msgstr "Brandstof injector vervangen"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
-msgstr ""
+msgstr "Waterpomp vervangen"
 
 #. module: fleet
 #: help:fleet.vehicle,location:0
 msgid "Location of the vehicle (garage, ...)"
-msgstr ""
+msgstr "Locatie van het voertuig (garage, ...)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_28
 msgid "Heater Hose Replacement"
-msgstr ""
+msgstr "Kachelslang vervangen"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_40
 msgid "Rotor Replacement"
-msgstr ""
+msgstr "Rotor vervangen"
 
 #. module: fleet
 #: help:fleet.vehicle.model,brand:0
 msgid "Brand of the vehicle"
-msgstr ""
+msgstr "Merk van het voertuig"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,start_date:0
 msgid "Date when the coverage of the contract begins"
-msgstr ""
+msgstr "Datum waarop de dekking van de overeenkomst begint"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Electric"
-msgstr ""
+msgstr "Elektrisch"
 
 #. module: fleet
 #: field:fleet.vehicle,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Labels"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 #: field:fleet.vehicle,log_contracts:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contracten"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_13
 msgid "Brake Pad(s) Replacement"
-msgstr ""
+msgstr "Remblokken vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -1068,7 +1083,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,driver:0
 msgid "Driver"
-msgstr ""
+msgstr "Bestuurder"
 
 #. module: fleet
 #: help:fleet.vehicle.model.brand,image_small:0
@@ -1081,7 +1096,7 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Fleet Dashboard"
-msgstr ""
+msgstr "Wagenpark dashboard"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@@ -1293,7 +1308,7 @@ msgstr ""
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
 msgid "Fleet"
-msgstr ""
+msgstr "Wagenpark"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_14
@@ -1610,7 +1625,7 @@ msgstr ""
 #: code:addons/fleet/fleet.py:397
 #, python-format
 msgid "Vehicle %s has been added to the fleet!"
-msgstr ""
+msgstr "Voertuig %s is toegevoegd aan het wagenpark!"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1690,7 +1705,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.contract,ins_ref:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Contractreferentie"
 
 #. module: fleet
 #: field:fleet.service.type,name:0
@@ -1702,27 +1717,27 @@ msgstr ""
 #: field:fleet.vehicle.state,name:0
 #: field:fleet.vehicle.tag,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: fleet
 #: help:fleet.vehicle,doors:0
 msgid "Number of doors of the vehicle"
-msgstr ""
+msgstr "Aantal deuren van het voertuig"
 
 #. module: fleet
 #: field:fleet.vehicle,transmission:0
 msgid "Transmission"
-msgstr ""
+msgstr "Transmissie"
 
 #. module: fleet
 #: field:fleet.vehicle,vin_sn:0
 msgid "Chassis Number"
-msgstr ""
+msgstr "Chassis nummer"
 
 #. module: fleet
 #: help:fleet.vehicle,color:0
 msgid "Color of the vehicle"
-msgstr ""
+msgstr "Kleur van het voertuig"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
@@ -1740,7 +1755,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,co2:0
 msgid "CO2 Emissions"
-msgstr ""
+msgstr "CO2 Emissie"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1750,33 +1765,33 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Costs"
-msgstr ""
+msgstr "Kosten"
 
 #. module: fleet
 #: field:fleet.vehicle,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
 msgid "Contracts Costs by Month"
-msgstr ""
+msgstr "Contract kosten per maand"
 
 #. module: fleet
 #: field:fleet.vehicle,model_id:0
 #: view:fleet.vehicle.model:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_41
 msgid "Spark Plug Replacement"
-msgstr ""
+msgstr "Bougie vervangen"
 
 #. module: fleet
 #: help:fleet.vehicle,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle
@@ -1786,12 +1801,12 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,co2:0
 msgid "CO2 emissions of the vehicle"
-msgstr ""
+msgstr "CO2 uitstoot van het voertuig"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_53
 msgid "Windshield Wiper(s) Replacement"
-msgstr ""
+msgstr "Ruitenwisser(s) vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1802,7 +1817,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
-msgstr ""
+msgstr "Kleur"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
@@ -1824,18 +1839,18 @@ msgstr ""
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model
 msgid "Model of a vehicle"
-msgstr ""
+msgstr "Model van een voertuig"
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
 msgid "Number of seats of the vehicle"
-msgstr ""
+msgstr "Aantal zitplaatsen van het voertuig"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,odometer:0
 #: field:fleet.vehicle.odometer,value:0
 msgid "Odometer Value"
-msgstr ""
+msgstr "Kilometerstand"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
@@ -1845,38 +1860,38 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_39
 msgid "Rotate Tires"
-msgstr ""
+msgstr "Verwissel banden"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_42
 msgid "Starter Replacement"
-msgstr ""
+msgstr "Startmotor vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 #: field:fleet.vehicle.cost,year:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: fleet
 #: help:fleet.vehicle,license_plate:0
 msgid "License plate number of the vehicle (ie: plate number for a car)"
-msgstr ""
+msgstr "Kentekenplaat van het voertuig"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_contract_state
 msgid "Contains the different possible status of a leasing contract"
-msgstr ""
+msgstr "Bevat de diverse mogelijke statussen van een lease contract"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the contract for this vehicle"
-msgstr ""
+msgstr "toon het contract van dit voertuig"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Total"
-msgstr ""
+msgstr "Totaal"
 
 #. module: fleet
 #: help:fleet.service.type,category:0
@@ -1887,9 +1902,9 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle.cost,cost_type:0
 msgid "For internal purpose only"
-msgstr ""
+msgstr "Alleen voor intern gebruik"
 
 #. module: fleet
 #: help:fleet.vehicle.state,sequence:0
 msgid "Used to order the note stages"
-msgstr ""
+msgstr "Wordt gebruikt om de notitie fases te sorteren"
diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_docs/i18n/pt_BR.po
new file mode 100644
index 00000000000..d280f28bcba
--- /dev/null
+++ b/addons/google_docs/i18n/pt_BR.po
@@ -0,0 +1,210 @@
+# Brazilian Portuguese 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-12-04 13:17+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:136
+#, python-format
+msgid "Key Error!"
+msgstr "Erro de Chave!"
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`"
+msgstr ""
+"para um documento de apresentação (slide) com a url como "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, o ID é `presentation:123456789`"
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`"
+msgstr ""
+"para um documento de texto com a url como "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, o ID é "
+"`document:123456789`"
+
+#. module: google_docs
+#: field:google.docs.config,gdocs_resource_id:0
+msgid "Google Resource ID to Use as Template"
+msgstr "Id de Recurso do Google para usar como Modelo"
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`"
+msgstr ""
+"para um documento de desenho com a url como "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, o ID "
+"é`drawings:123456789`"
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/xml/gdocs.xml:6
+#, python-format
+msgid "Add Google Doc..."
+msgstr "Adicionar um Documento do Google..."
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL:"
+msgstr ""
+"Este é o id do modelo do documento, no lado do google. Você pode encontrá-lo "
+"graças à url:"
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_google_docs_config
+msgid "Google Docs templates config"
+msgstr "Configuração dos modelos do Google Docs"
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:25
+#, python-format
+msgid ""
+"The user google credentials are not set yet. Contact your administrator for "
+"help."
+msgstr ""
+"As credenciais do usuário do google ainda não foram definidas. Para mais "
+"informações, solicite auxílio ao Administrador do Sistema."
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`"
+msgstr ""
+"para uma planilha de cálculo com url como "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"o ID é `spreadsheet:123456789`"
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:98
+#, python-format
+msgid ""
+"Your resource id is not correct. You can find the id in the google docs URL."
+msgstr ""
+"Sua id de recurso não está correta. Você encontra a id na url do google docs."
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:122
+#, python-format
+msgid "Creating google docs may only be done by one at a time."
+msgstr "A criação de documentos do google deve ser feita um de cada vez."
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:122
+#, python-format
+msgid "Google Docs Error!"
+msgstr "Erro do Google Docs!"
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:53
+#, python-format
+msgid "Check your google configuration in Users/Users/Synchronization tab."
+msgstr ""
+"Verifique a sua configuração do google na aba "
+"Usuários/Usuários/Sincronização."
+
+#. module: google_docs
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
+msgid "Google Docs configuration"
+msgstr "Configuração do Google Docs"
+
+#. module: google_docs
+#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
+msgid "Models configuration"
+msgstr "Configuração de modelos"
+
+#. module: google_docs
+#: field:google.docs.config,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:28
+#, python-format
+msgid "User Google credentials are not yet set."
+msgstr "As credenciais de usuário do Google ainda não foram definidas."
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:136
+#, python-format
+msgid "Your Google Doc Name Pattern's key does not found in object."
+msgstr ""
+"A chave do seu Padrão de Nome do Google Docs não foi encontrada no objeto."
+
+#. module: google_docs
+#: help:google.docs.config,name_template:0
+msgid ""
+"Choose how the new google docs will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+"Escolha como os novos documentos do google serão nomeados, no lado do "
+"google. Ex: gdoc_%(field_name)s"
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid "Google Docs Configuration"
+msgstr "Configuração do Google Docs"
+
+#. module: google_docs
+#: help:google.docs.config,gdocs_resource_id:0
+msgid ""
+"\n"
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL: \n"
+"*for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`\n"
+"*for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`\n"
+"*for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`\n"
+"*for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`\n"
+"...\n"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_ir_attachment
+msgid "ir.attachment"
+msgstr "Anexo"
+
+#. module: google_docs
+#: field:google.docs.config,name_template:0
+msgid "Google Doc Name Pattern"
+msgstr "Padrão de Nome do Google Docs"
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 77c1d4cbf60..9e6ef1b8f05 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.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:53+0000\n"
-"PO-Revision-Date: 2011-01-18 11:19+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 15:13+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
@@ -33,11 +33,13 @@ msgid ""
 "Access your documents in OpenERP through WebDAV.\n"
 "                This installs the module document_webdav."
 msgstr ""
+"Acesse os seus documentos no OpenERP através do WEbDAV..\n"
+"                O módulo document_webdav será instalado."
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_page:0
 msgid "This installs the module document_page."
-msgstr ""
+msgstr "O módulo document_page será instalado."
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
@@ -48,12 +50,12 @@ msgstr "Conteúdo Colaborativo"
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: view:knowledge.config.settings:0
 msgid "Configure Knowledge"
-msgstr ""
+msgstr "Configurar Conhecimento"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "Gestão de Conhecimento e Documentos"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document:0
@@ -67,27 +69,27 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
 msgid "Create static web pages"
-msgstr ""
+msgstr "Criar páginas web estáticas"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_ftp:0
 msgid "Share repositories (FTP)"
-msgstr ""
+msgstr "Repositórios compartilhados (FTP)"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "Gerenciar documentos"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -100,16 +102,18 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
+"Acesso seus documentos no OpenERP através da interface FTP.\n"
+"                O módulo document_ftp será instalado."
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "Repositórios compartilhados (WEbDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 22966129142..aa56786f626 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-order_user,"Order user",model_lunch_order,group_lunch_manager,1,1,1,1
-order_line_user,"Order Line user",model_lunch_order_line,group_lunch_manager,1,1,1,1
-cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_manager,1,1,1,1
-product_user,"Product user",model_lunch_product,group_lunch_manager,1,1,1,1
-product_category_user,"Product category user",model_lunch_product_category,group_lunch_manager,1,1,1,1
-alert_user,"Alert user",model_lunch_alert,group_lunch_manager,1,1,1,1
+order_manager,"Order user",model_lunch_order,group_lunch_manager,1,1,1,1
+order_line_manager,"Order Line user",model_lunch_order_line,group_lunch_manager,1,1,1,1
+cashmove_manager,"Cashmove user",model_lunch_cashmove,group_lunch_manager,1,1,1,1
+product_manager,"Product user",model_lunch_product,group_lunch_manager,1,1,1,1
+product_category_manager,"Product category user",model_lunch_product_category,group_lunch_manager,1,1,1,1
+alert_manager,"Alert user",model_lunch_alert,group_lunch_manager,1,1,1,1
 order_user,"Order user",model_lunch_order,group_lunch_user,1,1,1,0
 order_line_user,"Order Line user",model_lunch_order_line,group_lunch_user,1,1,1,1
 cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_user,1,0,0,0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 847267cc31e..f68fb4599dc 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-06-22 01:42+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-04 11:00+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: mail
@@ -36,7 +36,7 @@ msgstr ""
 #: field:mail.compose.message,author_id:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Auteur"
 
 #. module: mail
 #: view:mail.mail:0
@@ -51,7 +51,7 @@ msgstr "Destinataires du message"
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Commentaires"
 
 #. module: mail
 #: view:mail.alias:0
@@ -88,7 +88,7 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Nom du groupe"
 
 #. module: mail
 #: selection:mail.group,public:0
@@ -123,7 +123,7 @@ msgstr ""
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messages non lus"
 
 #. module: mail
 #. openerp-web
@@ -173,7 +173,7 @@ msgstr ""
 #: code:addons/mail/mail_message.py:646
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Accès refusé"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -233,7 +233,7 @@ msgstr "Références"
 #: code:addons/mail/static/src/xml/mail.xml:179
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "Aucun message"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 912113d1e76..77ba29be6e3 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 19:56+0000\n"
+"PO-Revision-Date: 2012-12-04 12:28+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
 msgid "Receive Feeds by Email"
-msgstr "Receber Feeds por Email"
+msgstr "Receber Feeds por E-mail"
 
 #. module: mail
 #: view:mail.followers:0
@@ -71,14 +71,14 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.my.openerp.com>"
 msgstr ""
-"O nome do apelido de email, ex: 'vagas' se você quer capturar mensagens de "
+"O nome do apelido de e-mail, ex: 'vagas' se você quer capturar mensagens de "
 "<vagas@exemplo.my.openerp.com>"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr "Escrever Email"
+msgstr "Escrever E-mail"
 
 #. module: mail
 #: constraint:mail.alias:0
@@ -116,13 +116,13 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
-"Endereço de email do remetente. Este campo é preenchido quando não é "
-"encontrado um parceiro cadastrado para o email recebido."
+"Endereço de e-mail do remetente. Este campo é preenchido quando não é "
+"encontrado um parceiro cadastrado para o e-mail recebido."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr "Assistente de composição de Email"
+msgstr "Assistente de composição de e-mail"
 
 #. module: mail
 #: field:mail.group,message_unread:0
@@ -222,12 +222,12 @@ msgstr "Abrir o editor de correio completo"
 #: code:addons/mail/static/src/xml/mail.xml:37
 #, python-format
 msgid "&ograve"
-msgstr ""
+msgstr "ò"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
 msgid "Alias Domain"
-msgstr ""
+msgstr "Domínio Apelido"
 
 #. module: mail
 #: field:mail.group,group_ids:0
@@ -273,8 +273,9 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
-"Tipo de mensagem: email para mensagens de email, notificação para mensagens "
-"do sistema e comentário para outros tipos como respostas de usuário."
+"Tipo de mensagem: e-mail para mensagens de e-mail, notificação para "
+"mensagens do sistema e comentário para outros tipos como respostas de "
+"usuário."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
@@ -289,7 +290,7 @@ msgstr "Cancelado"
 #. module: mail
 #: field:mail.mail,reply_to:0
 msgid "Reply-To"
-msgstr "Responder para"
+msgstr "Responder Para"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:36
@@ -331,7 +332,7 @@ msgstr "Excluir Automaticamente"
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr "Não seguir"
+msgstr "Não Participar"
 
 #. module: mail
 #. openerp-web
@@ -360,7 +361,7 @@ msgstr "Imagem do usuário"
 #: view:mail.mail:0
 #: view:mail.message:0
 msgid "Emails"
-msgstr "Emails"
+msgstr "E-mails"
 
 #. module: mail
 #: field:mail.followers,partner_id:0
@@ -387,7 +388,7 @@ msgid ""
 "creation of a new record of this model (e.g. a Project Task)"
 msgstr ""
 "O modelo (Tipo de Documento OpenERP) ao qual este apelido corresponde. "
-"Qualquer email recebido que não responda a um registro existente causará a "
+"Qualquer e-mail recebido que não responda a um registro existente causará a "
 "criação de um novo registro deste modelo (ex: Tarefa de Projeto)"
 
 #. module: mail
@@ -434,24 +435,24 @@ msgstr "De"
 #: view:mail.mail:0
 #: view:mail.message.subtype:0
 msgid "Email message"
-msgstr "Mensagem de Email"
+msgstr "Mensagem de E-mail"
 
 #. module: mail
 #: help:mail.compose.message,favorite_user_ids:0
 #: help:mail.message,favorite_user_ids:0
 msgid "Users that set this message in their favorites"
-msgstr ""
+msgstr "Usuários que definem esta mensagem em seus favoritos"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "Configurações"
 
 #. module: mail
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Não lidas"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -525,17 +526,17 @@ msgstr "Tipo"
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr "Grupo de Email"
+msgstr "Grupo de E-mail"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Comments and Emails"
-msgstr "Comentários e Emails"
+msgstr "Comentários e E-mails"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_favorite
@@ -546,7 +547,7 @@ msgstr "Mensagens favoritas"
 #: code:addons/mail/res_users.py:97
 #, python-format
 msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s conectou-se à rede de %s."
 
 #. module: mail
 #: help:mail.group,image_small:0
@@ -555,6 +556,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Imagem em tamanho reduzido do grupo. Ela será automaticamente redimensionada "
+"para 64x64px, mantendo-se as proporções da imagem original. Utilize esse "
+"campo em lugares onde uma pequena imagem for necessária."
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -567,14 +571,14 @@ msgstr "Destinatários"
 #: code:addons/mail/static/src/xml/mail.xml:126
 #, python-format
 msgid "<<<"
-msgstr ""
+msgstr "<<<"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:43
 #, python-format
 msgid "Write to the followers of this document..."
-msgstr ""
+msgstr "Escrever para os seguidores deste documento..."
 
 #. module: mail
 #: field:mail.group,group_public_id:0
@@ -595,13 +599,13 @@ msgstr "Remetente da mensagem, baseado nas preferências do usuário."
 #: code:addons/mail/wizard/invite.py:39
 #, python-format
 msgid "<div>You have been invited to follow a new document.</div>"
-msgstr ""
+msgstr "<div>Você foi convidado a seguir um novo documento.</div>"
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Mensagem Principal"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -621,23 +625,29 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nenhuma mensagem privada.</b>\n"
+"                </p><p>\n"
+"                    Esta lista contém mensagens enviadas à você.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
 msgid "R&D"
-msgstr ""
+msgstr "R&D"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:61
 #, python-format
 msgid "/web/binary/upload_attachment"
-msgstr ""
+msgstr "Enviar Anexo"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread
 msgid "Email Thread"
-msgstr "Tópico do Email"
+msgstr "Tópico do E-mail"
 
 #. module: mail
 #: view:mail.mail:0
@@ -665,6 +675,8 @@ msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
+"Você não pode criar um usuário. Para criar usuários, você deve utilizar o "
+"menu \"Configurações > Usuários\"."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -680,14 +692,14 @@ msgstr "Mensagens"
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
 msgid "Model of the followed resource"
-msgstr ""
+msgstr "Modelo do recurso seguido"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:271
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "como"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -701,12 +713,12 @@ msgstr "Cancelar"
 #: code:addons/mail/static/src/xml/mail.xml:44
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "Compartilhar com os meus seguidores..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: mail
 #: view:mail.group:0
@@ -714,21 +726,23 @@ msgid ""
 "Only the invited followers can read the\n"
 "                                    discussions on this group."
 msgstr ""
+"Somente os seguidores convidados podem ler as\n"
+"                                    discussões deste grupo."
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "Menu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr ""
+msgstr "Possui anexos"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "on"
-msgstr ""
+msgstr "em"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:809
@@ -737,6 +751,8 @@ msgid ""
 "The following partners chosen as recipients for the email have no email "
 "address linked :"
 msgstr ""
+"Os seguintes parceiros selecionados como destinatários não possuem um "
+"endereço de e-mail cadastrado :"
 
 #. module: mail
 #: help:mail.alias,alias_defaults:0
@@ -744,6 +760,8 @@ msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
 msgstr ""
+"Um dicionário python que será avaliado para gerar valores padrão quando "
+"forem criados novos registros para este apelido."
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -751,13 +769,15 @@ msgstr ""
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
+"Parceiros que serão notificados quando esta mensagem for enviada para suas "
+"caixas de correio"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Comentário"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -773,23 +793,31 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Bom Trabalho!</b> Sua caixa de entrada está vazia.\n"
+"                </p><p>\n"
+"                    Sua caixa de entrada contém mensagens privadas ou e-"
+"mails enviados para você bem como informações relacionadas à documentos ou "
+"pessoas que você segue.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "É Notificação"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:161
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "Escrever uma nova mensagem"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Send Now"
-msgstr "Enviar agora"
+msgstr "Enviar Agora"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
@@ -797,6 +825,8 @@ msgstr "Enviar agora"
 msgid ""
 "Unable to send email, please configure the sender's email address or alias."
 msgstr ""
+"Não foi possível enviar o e-mail, por favor configure o endereço de e-mail "
+"do remetente ou apelido."
 
 #. module: mail
 #: help:res.users,alias_id:0
@@ -804,11 +834,13 @@ msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
 msgstr ""
+"Endereço de e-mail associado internamente a este usuário. Mensagens "
+"recebidas aparecerão nas notificações do usuário."
 
 #. module: mail
 #: field:mail.group,image:0
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #. module: mail
 #. openerp-web
@@ -817,13 +849,13 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
 #: help:mail.message,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Usuários que votaram para esta mensagem"
 
 #. module: mail
 #: help:mail.group,alias_id:0
@@ -831,6 +863,8 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
+"Endereço de e-mail associado a este grupo. Novas mensagens recebidas criarão "
+"automaticamente novos tópicos."
 
 #. module: mail
 #: view:mail.mail:0
@@ -840,34 +874,35 @@ msgstr "Mês"
 #. module: mail
 #: view:mail.mail:0
 msgid "Email Search"
-msgstr "Pesquisar Email"
+msgstr "Pesquisar E-mail"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_canceled
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: mail
 #: field:mail.compose.message,child_ids:0
 #: field:mail.message,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Mensagens Filhas"
 
 #. module: mail
 #: help:mail.compose.message,to_read:0
 #: help:mail.message,to_read:0
 msgid "Functional field to search for messages the current user has to read"
 msgstr ""
+"Campo Funcional para pesquisar por mensagens não lidas do usuário atual"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Proprietário"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -878,77 +913,77 @@ msgstr ""
 #: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "Todo"
-msgstr ""
+msgstr "A Fazer"
 
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id do recurso seguido"
 
 #. module: mail
 #: field:mail.compose.message,body:0
 #: field:mail.message,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Conteúdo"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "Apelidos"
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Votos"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacidade"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Notificação"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
 msgid "Support"
-msgstr ""
+msgstr "Suporte"
 
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Adicionar Seguidores"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_closed
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "Id do Registro do Tópico"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Meus Grupos"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -962,12 +997,21 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nenhuma mensagem encontrada e nenhuma enviada ainda.\n"
+"                </p><p>\n"
+"                    Clique no ícone no canto superior direito para compor "
+"uma nova mensagem.\n"
+"                    Esta mensagem será enviada por e-mail se não for um "
+"contato interno.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: mail
 #: view:mail.mail:0
@@ -978,13 +1022,13 @@ msgstr "Enviando"
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "All feeds"
-msgstr ""
+msgstr "Todos os feeds"
 
 #. module: mail
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Nome dado ao documento relacionado."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -995,12 +1039,12 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "Notificações"
 
 #. module: mail
 #: view:mail.alias:0
 msgid "Search Alias"
-msgstr ""
+msgstr "Apelido de Pesquisa"
 
 #. module: mail
 #: help:mail.alias,alias_force_thread_id:0
@@ -1009,6 +1053,9 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"Id opcional de um tópico (registro) ao qual todas as mensagens recebidas "
+"serão anexadas, a não ser que elas não sejam respostas a este. Se definido, "
+"ele desabilitará a criação de novos registros completamente."
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1019,6 +1066,11 @@ msgid ""
 "subtypes allow to precisely tune the notifications the user want to receive "
 "on its wall."
 msgstr ""
+"Subtipos de mensagem proporcionam um tipo mais preciso nas mensagens, "
+"especialmente para sistemas de notificação. Por exemplo, podem ser uma "
+"notificação relacionada a um novo registro (Novo), ou a uma mudança de "
+"estágio em um processo (Mudança de Estágio). Elas permitem refinar as "
+"notificações que o usuário quer receber em ser mural."
 
 #. module: mail
 #: view:mail.mail:0
@@ -1028,19 +1080,19 @@ msgstr "por"
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "Melhores Práticas de Vendas"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Somente o Grupo Selecionado"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
 #: field:mail.thread,message_is_follower:0
 #: field:res.partner,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1053,12 +1105,12 @@ msgstr "Usuário"
 #. module: mail
 #: view:mail.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Messages Search"
-msgstr ""
+msgstr "Pesquisar Mensagens"
 
 #. module: mail
 #: field:mail.compose.message,date:0
@@ -1071,7 +1123,7 @@ msgstr "Data"
 #: code:addons/mail/static/src/xml/mail.xml:34
 #, python-format
 msgid "Post"
-msgstr ""
+msgstr "Postar"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1086,52 +1138,52 @@ msgstr "Filtros Extendidos..."
 #: field:res.partner,message_comment_ids:0
 #: help:res.partner,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:107
 #, python-format
 msgid "To:"
-msgstr ""
+msgstr "Para:"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:166
 #, python-format
 msgid "Write to my followers"
-msgstr ""
+msgstr "Escrever aos meus seguidores"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Grupos de Acesso"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "Padrão"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:245
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "mostrar mais mensagens"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Marcar como A Fazer"
 
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sumário"
 
 #. module: mail
 #: field:mail.compose.message,subtype_id:0
@@ -1139,38 +1191,40 @@ msgstr ""
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Subtipo"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group Form"
-msgstr ""
+msgstr "Formulário do Grupo"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:247
 #, python-format
 msgid "more messages"
-msgstr ""
+msgstr "mais mensagens"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:13
 #, python-format
 msgid "Following"
-msgstr ""
+msgstr "Seguindo"
 
 #. module: mail
 #: sql_constraint:mail.alias:0
 msgid ""
 "Unfortunately this email alias is already used, please choose a unique one"
 msgstr ""
+"Infelizmente este apelido de e-mail já está em uso, por favor escolha um "
+"outro que seja exclusivo"
 
 #. module: mail
 #: help:mail.alias,alias_user_id:0
@@ -1180,11 +1234,16 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"O proprietário dos registros criados após o recebimento de e-mails neste "
+"apelido. Se este campo não estiver definido, o sistema tentará encontrar o "
+"proprietário correto baseado no endereço do remetente (De), ou utilizará a "
+"conta do Administrador se não for encontrado um usuário do sistema para este "
+"endereço."
 
 #. module: mail
 #: view:mail.favorite:0
 msgid "Favorite Form"
-msgstr ""
+msgstr "Formulário de Favorito"
 
 #. module: mail
 #: help:mail.group,image:0
@@ -1192,6 +1251,8 @@ msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr ""
+"Este campo armazena a imagem utilizada como foto para o grupo, limitada a "
+"1024x1024px."
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
@@ -1204,7 +1265,7 @@ msgstr "Anexos"
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Nome do Registro da Mensagem"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
@@ -1217,43 +1278,45 @@ msgstr "Cc"
 #: view:mail.compose.message:0
 #, python-format
 msgid "Followers of"
-msgstr ""
+msgstr "Seguidores de"
 
 #. module: mail
 #: help:mail.mail,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
-"Excluir permanentemente este email depois do envio para economizar espaço"
+"Excluir permanentemente este e-mail depois do envio para economizar espaço"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Grupo de Discussão"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:209
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
 msgid ""
 "Related model of the subtype. If False, this subtype exists for all models."
 msgstr ""
+"Modelo relacionado ao subtipo. Se falso, este subtipo existe para todos os "
+"modelos."
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
 msgid "Discussions"
-msgstr ""
+msgstr "Discussões"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:11
 #, python-format
 msgid "Follow"
-msgstr ""
+msgstr "Seguir"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
@@ -1266,34 +1329,34 @@ msgstr "Toda a Empresa"
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "e"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Mensagem com formatação Rich-text/HTML"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr "Mês de criação"
+msgstr "Mês de Criação"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:257
 #, python-format
 msgid "Compose new Message"
-msgstr ""
+msgstr "Escrever nova Mensagem"
 
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Menu Relacionado"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Conteúdo"
 
 #. module: mail
 #: field:mail.mail,email_to:0
@@ -1303,30 +1366,30 @@ msgstr "Para"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "mail_message_subtype"
-msgstr ""
+msgstr "Subtipo da Mensagem"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Private"
-msgstr ""
+msgstr "Particular"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_new
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: mail
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Parceiros notificados"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:22
 #, python-format
 msgid "Invite others"
-msgstr ""
+msgstr "Convidar outros"
 
 #. module: mail
 #: help:mail.group,public:0
@@ -1334,16 +1397,18 @@ msgid ""
 "This group is visible by non members.             Invisible groups can add "
 "members through the invite button."
 msgstr ""
+"Este grupo é visível por não membros. Grupos invisíveis podem adicionar "
+"membros através do botão convidar."
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
 msgid "Board meetings"
-msgstr ""
+msgstr "Reuniões"
 
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
-msgstr ""
+msgstr "Modelo Apelidado"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0
@@ -1354,18 +1419,18 @@ msgstr "Identificador da mensagem"
 #. module: mail
 #: field:mail.group,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_crm_stage
 #: model:mail.message.subtype,name:mail.mt_issue_change
 msgid "Stage Changed"
-msgstr ""
+msgstr "Estágio Alterado"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Seguidores do Documento"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:647
@@ -1376,11 +1441,15 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"A operação solicitada não pode ser completado devido a restrições de "
+"segurança. Por favor, informe o administrador do sistema..\n"
+"\n"
+"(Tipo de documento: %s, Operação: %s)"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Never"
-msgstr ""
+msgstr "Nunca"
 
 #. module: mail
 #: field:mail.mail,mail_server_id:0
@@ -1391,32 +1460,33 @@ msgstr "Servidor de envio"
 #: code:addons/mail/mail_message.py:813
 #, python-format
 msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Endereço de e-mail do parceiro não encontrado"
 
 #. module: mail
 #: view:mail.mail:0
 #: selection:mail.mail,state:0
 msgid "Sent"
-msgstr "Enviado"
+msgstr "Enviada"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_favorites
 #: model:ir.ui.menu,name:mail.menu_email_favorites
 #: view:mail.favorite:0
 msgid "Favorites"
-msgstr ""
+msgstr "Favoritos"
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
 msgid ""
 "Choose in which case you want to receive an email when you receive new feeds."
 msgstr ""
+"Escolha em que caso deseja receber um e-mail quando receber novos feeds."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_groups
 #: model:ir.ui.menu,name:mail.mail_allgroups
 msgid "Join a group"
-msgstr ""
+msgstr "Participar de um grupo"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1426,6 +1496,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nenhuma mensagem neste grupo.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.group:0
@@ -1435,20 +1509,24 @@ msgid ""
 "installed\n"
 "                                    the portal module."
 msgstr ""
+"Este grupo é visível para todos,\n"
+"                                    incluindo os seus clientes se o módulo "
+"de \n"
+"                                    portal estiver instalado."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:210
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Devolver a A Fazer"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:113
 #, python-format
 msgid "this document"
-msgstr ""
+msgstr "este documento"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
@@ -1458,12 +1536,12 @@ msgstr "Filtros"
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_crm_lost
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
 #. module: mail
 #: field:mail.alias,alias_defaults:0
 msgid "Default Values"
-msgstr ""
+msgstr "Valores Padrão"
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1471,19 +1549,21 @@ msgid ""
 "If you have setup a catch-all email domain redirected to the OpenERP server, "
 "enter the domain name here."
 msgstr ""
+"Se você configurou um domínio de e-mail 'pega-tudo' redirecionado ao "
+"servidor OpenERP, informe o nome do domínio aqui."
 
 #. module: mail
 #: field:mail.compose.message,favorite_user_ids:0
 #: field:mail.message,favorite_user_ids:0
 msgid "Favorite"
-msgstr ""
+msgstr "Favorito"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:125
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "outros..."
 
 #. module: mail
 #: view:mail.alias:0
@@ -1491,12 +1571,12 @@ msgstr ""
 #: field:mail.group,alias_id:0
 #: field:res.users,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Apelido"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "E-mails Enviados"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1505,6 +1585,8 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Campo técnico que armazena as notificações de mensagem. Utilize "
+"notified_partner_ids para acessar os parceiros notificados."
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
@@ -1516,12 +1598,12 @@ msgstr "Comunicações"
 #: view:mail.alias:0
 #: field:mail.message.subtype,res_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Unread"
-msgstr ""
+msgstr "Não Lida"
 
 #. module: mail
 #: help:mail.followers,subtype_ids:0
@@ -1529,13 +1611,15 @@ msgid ""
 "Message subtypes followed, meaning subtypes that will be pushed onto the "
 "user's Wall."
 msgstr ""
+"Subtipos de mensagem seguidos, são subtipos que serão enviados ao Mural do "
+"usuário."
 
 #. module: mail
 #: help:mail.group,message_ids:0
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: mail
 #: help:mail.mail,references:0
@@ -1546,7 +1630,7 @@ msgstr ""
 #. module: mail
 #: field:mail.compose.message,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Modo de composição"
 
 #. module: mail
 #: field:mail.compose.message,model:0
@@ -1561,7 +1645,7 @@ msgstr "Modelo de Documento Relacionado"
 #: code:addons/mail/static/src/xml/mail.xml:272
 #, python-format
 msgid "unlike"
-msgstr ""
+msgstr "não como"
 
 #. module: mail
 #: help:mail.compose.message,author_id:0
@@ -1570,27 +1654,29 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Autor da mensagem. Se não definido, o campo email_from pode conter um "
+"endereço de e-mail que não corresponde a nenhum parceiro."
 
 #. module: mail
 #: help:mail.mail,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr "Cópia oculta da mensagem para os destinatários"
+msgstr "Destinatários de cópia oculta da mensagem"
 
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "Dominio apelido"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Erro durante a comunicação com o servidor de suporte."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_vote
 msgid "Mail Vote"
-msgstr ""
+msgstr "Votação de E-mail"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_star_feeds
@@ -1605,73 +1691,81 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Nada A Fazer!</b>\n"
+"                </p><p>\n"
+"                    Quando você processa mensagens de sua caixa de entrada, "
+"você pode marcá-las como <i>a fazer</i>. A partir deste menu, você pode "
+"processar todas as suas pendências.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
 msgid "Delivery Failed"
-msgstr "Falha no envio"
+msgstr "Falha no Envio"
 
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Contatos adicionais"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
 #: help:mail.message,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Mensagem inicial do tópico."
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
 msgid "HR Policies"
-msgstr ""
+msgstr "Políticas de RH"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Emails only"
-msgstr ""
+msgstr "Somente e-mails"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_inbox_feeds
 #: model:ir.ui.menu,name:mail.mail_inboxfeeds
 msgid "Inbox"
-msgstr ""
+msgstr "Caixa de Entrada"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:58
 #, python-format
 msgid "File"
-msgstr ""
+msgstr "Arquivo"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Por favor, complete as informações do parceiro e o e-mail"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
 #: model:ir.ui.menu,name:mail.menu_message_subtype
 msgid "Subtypes"
-msgstr ""
+msgstr "Subtipos"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_alias
 msgid "Email Aliases"
-msgstr ""
+msgstr "Apelidos de E-mail"
 
 #. module: mail
 #: field:mail.group,image_small:0
 msgid "Small-sized photo"
-msgstr ""
+msgstr "Foto pequena"
 
 #. module: mail
 #: help:mail.mail,reply_to:0
 msgid "Preferred response address for the message"
-msgstr "Endereço de resposta preferido"
+msgstr "Endereço de resposta preferido para a mensagem"
 
 #~ msgid "Open Attachments"
 #~ msgstr "Abrir Anexos"
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 36f779afcbe..768967e15e5 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/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-12-04 05:52+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: mail
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index da590c82f57..5d8434abe50 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-13 19:48+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 11:05+0000\n"
+"Last-Translator: Numérigraphe <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-12-04 05:51+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: marketing_campaign
@@ -957,6 +957,13 @@ msgid ""
 "campaign previously. Only easily comparable fields like textfields, "
 "integers, selections or single relationships may be used."
 msgstr ""
+"Si activé, ce champ aidera les segments qui fonctionne en mode \"Pas de "
+"doublon\" à éviter de sélectionner deux fois des enregistrements similaires. "
+"Les enregistrements similaires sont ceux qui ont la même valeur pour ce "
+"champ unique. Par exemple, en choisissant le champ \"email_from\" pour les "
+"pistes, vous  empêcherez la même campagne d'être ré-envoyée à la même "
+"adresse courriel. Seuls les champs faciles à comparer peuvent être utilisés "
+": les champs texte, les entiers, les sélections ou les relations simple."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:529
diff --git a/addons/note/i18n/fr.po b/addons/note/i18n/fr.po
new file mode 100644
index 00000000000..ec19f6a62b7
--- /dev/null
+++ b/addons/note/i18n/fr.po
@@ -0,0 +1,288 @@
+# French 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-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-04 15:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr ""
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr ""
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr ""
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr ""
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr ""
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index b6414619e79..639280fbea8 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-28 18:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-04 10:52+0000\n"
+"Last-Translator: Numérigraphe <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-12-04 05:14+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: point_of_sale
@@ -51,7 +51,7 @@ msgstr "Imprimer le ticket de la vente"
 #. module: point_of_sale
 #: field:pos.session,cash_register_balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Solde calculé"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -85,7 +85,7 @@ msgstr ""
 #: field:pos.config,journal_id:0
 #: field:pos.order,sale_journal:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Journal de vente"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -111,7 +111,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -181,7 +181,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.ean_wizard,ean13_pattern:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1040
@@ -207,7 +207,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:479
 #, python-format
 msgid "Weighting"
-msgstr ""
+msgstr "Pesée"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
@@ -225,7 +225,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:741
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erreur de paramétrage !"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -300,7 +300,7 @@ msgstr "Ventes par mois"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda_orange
 msgid "Orange"
-msgstr ""
+msgstr "Orange"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
@@ -347,13 +347,13 @@ msgstr "Rapport des Ventes"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beverage
 msgid "Beverages"
-msgstr ""
+msgstr "Boissons"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_session_opening
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_session_opening
 msgid "Your Session"
-msgstr ""
+msgstr "Votre session"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_50cl_product_template
@@ -471,7 +471,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.Onions_product_template
 msgid "Onions"
-msgstr ""
+msgstr "Oignons"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -484,7 +484,7 @@ msgstr ""
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "In Progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -508,7 +508,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Open Session"
-msgstr ""
+msgstr "Ouvrir la session"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
@@ -520,7 +520,7 @@ msgstr "Opérations journalières"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:42
 #, python-format
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
@@ -678,7 +678,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:459
 #, python-format
 msgid "Set Weight"
-msgstr ""
+msgstr "Définir le poids"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -710,12 +710,12 @@ msgstr "Passer les écritures comptables du PdV"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:463
 #, python-format
 msgid "Barcode Scanner"
-msgstr ""
+msgstr "Lecteur de code-barres"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
 msgid "Granny Smith apples"
-msgstr ""
+msgstr "Pommes Granny Smith"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -773,7 +773,7 @@ msgstr "Ajouter un article"
 #. module: point_of_sale
 #: field:pos.config,name:0
 msgid "Point of Sale Name"
-msgstr ""
+msgstr "Nom du point de vente"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -1848,6 +1848,8 @@ msgid ""
 "Generate all sale journal entries for non invoiced orders linked to a closed "
 "cash register or statement."
 msgstr ""
+"Générer toutes les écritures de vente pour les commandes non facturées liées "
+"à une caisse ou à un relevé fermée."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.unreferenced_product_product_template
@@ -3869,7 +3871,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Start Selling"
-msgstr ""
+msgstr "Commencer la vente"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -3892,7 +3894,7 @@ msgstr "Note de Crédit Fournisseur"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:596
 #, python-format
 msgid "Discount:"
-msgstr ""
+msgstr "Réduction :"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
@@ -3918,7 +3920,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:41
 #, python-format
 msgid "Mozilla Firefox"
-msgstr ""
+msgstr "Mozilla Firefox"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.raisins_noir_product_template
@@ -3928,7 +3930,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.category,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:316
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 33935b85d12..41a061e78b4 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -563,7 +563,7 @@
         <div class="pos-sale-ticket">
             
             <div class="pos-right-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
-                Date.CultureInfo.formatPatterns.longTime)"/><t t-esc="widget.currentOrder.attributes.name"/></div>
+                Date.CultureInfo.formatPatterns.longTime)"/> <t t-esc="widget.currentOrder.attributes.name"/></div>
             <br />
             <t t-esc="widget.company.name"/><br />
             Phone: <t t-esc="widget.company.phone || ''"/><br />
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 29952f38bd2..3e2290ba133 100644
--- a/addons/portal/i18n/pt_BR.po
+++ b/addons/portal/i18n/pt_BR.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-07-11 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-04 21:48+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "Mako"
-msgstr ""
+msgstr "Mako"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:50
 #, python-format
 msgid "Please select at least one user to share with"
-msgstr ""
+msgstr "Por favor selecione pelo menos um usuário com o qual compartilhar"
 
 #. module: portal
 #: view:portal.wizard:0
@@ -37,58 +37,63 @@ msgid ""
 "                        If necessary, you can fix any contact's email "
 "address directly in the list."
 msgstr ""
+"Selecione que contatos poderão acessar o portal na lista abaixo.\n"
+"                        O endereço de e-mail de cada contato selecionado "
+"deve ser válido e único.\n"
+"                        Se necessário, você pode acertar o endereço de e-"
+"mail do contato diretamente na lista."
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:54
 #, python-format
 msgid "Please select at least one group to share with"
-msgstr ""
+msgstr "Por favor selecione pelo menos um grupo com o qual compartilhar"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
 msgid "Company's news"
-msgstr ""
+msgstr "Notícias da Empresa"
 
 #. module: portal
 #: view:portal.wizard.user:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contatos"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,group_ids:0
 msgid "Existing groups"
-msgstr ""
+msgstr "Grupos existentes"
 
 #. module: portal
 #: view:res.groups:0
 msgid "Portal Groups"
-msgstr ""
+msgstr "Grupos de Portal"
 
 #. module: portal
 #: field:portal.wizard,welcome_message:0
 msgid "Invitation Message"
-msgstr ""
+msgstr "Mensagem de Convite"
 
 #. module: portal
 #: view:res.groups:0
 msgid "Non-Portal Groups"
-msgstr ""
+msgstr "Grupos que não são do Portal"
 
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_orders
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Cotações e Pedidos de Vendas"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "reference: the reference number of the document to pay"
-msgstr ""
+msgstr "referência: o número de referência do documento a pagar"
 
 #. module: portal
 #: help:portal.payment.acquirer,visible:0
@@ -96,16 +101,18 @@ msgid ""
 "Make this payment acquirer available in portal forms (Customer invoices, "
 "etc.)"
 msgstr ""
+"Fazer este método de pagamento disponível nos formulários do portal (Faturas "
+"de cliente, etc.)"
 
 #. module: portal
 #: model:ir.model,name:portal.model_share_wizard
 msgid "Share Wizard"
-msgstr ""
+msgstr "Assistente de Compartilhamento"
 
 #. module: portal
 #: field:portal.wizard.user,email:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_news
@@ -115,28 +122,32 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Você não possui notícias da empresa para ler.\n"
+"                </p>\n"
+"            "
 
 #. module: portal
 #: view:portal.wizard:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_jobs
 #: model:ir.ui.menu,name:portal.portal_jobs
 msgid "Jobs"
-msgstr ""
+msgstr "Oportunidades de Emprego"
 
 #. module: portal
 #: field:portal.wizard,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: portal
 #: code:addons/portal/acquirer.py:74
 #, python-format
 msgid "Pay safely online"
-msgstr ""
+msgstr "Pagar online com segurança"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -144,17 +155,19 @@ msgid ""
 "kind: the kind of document on which the payment form is rendered (translated "
 "to user language, e.g. \"Invoice\")"
 msgstr ""
+"tipo: o tipo do documento em que o formulário de pagamento é gerado "
+"(traduzido para a linguagem do usuário, \"Fatura\")"
 
 #. module: portal
 #: help:portal.wizard,portal_id:0
 msgid "The portal that users can be added in or removed from."
-msgstr ""
+msgstr "O portal ao qual os usuário podem ser adicionados ou removidos."
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:38
 #, python-format
 msgid "Users you already shared with"
-msgstr ""
+msgstr "Usuários com os quais você já compartilha"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_jobs
@@ -164,11 +177,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Você não possui nenhuma oportunidade de emprego para "
+"ler.\n"
+"                </p>\n"
+"            "
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
 msgid "Company's jobs"
-msgstr ""
+msgstr "Oportunidades de Emprego da Empresa"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_menu
@@ -176,34 +194,34 @@ msgstr ""
 #: field:res.groups,is_portal:0
 #: model:res.groups,name:portal.group_portal
 msgid "Portal"
-msgstr ""
+msgstr "Portal"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:34
 #, python-format
 msgid "Your OpenERP account at %(company)s"
-msgstr ""
+msgstr "Sua conta do OpenERP em %(company)s"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "cr: the current database cursor"
-msgstr ""
+msgstr "cr: o cursor atual do banco de dados"
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
 msgid "In Portal"
-msgstr ""
+msgstr "No Portal"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_news
 #: model:ir.ui.menu,name:portal.portal_company_news
 msgid "News"
-msgstr ""
+msgstr "Notícias"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_after_sales
 msgid "After Sale Services"
-msgstr ""
+msgstr "Serviços Pós Venda"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal
@@ -212,34 +230,37 @@ msgid ""
 "restricted menus).\n"
 "                They usually do not belong to the usual OpenERP groups."
 msgstr ""
+"Membros do portal possuem direitos de acesso específicos (como em regras de "
+"registros e menus restritos).\n"
+"                Eles normalmente não pertencem a grupos normais do OpenERP."
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.action_acquirer_list
 #: view:portal.payment.acquirer:0
 msgid "Payment Acquirers"
-msgstr ""
+msgstr "Métodos de Pagamento"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_projects
 msgid "Projects"
-msgstr ""
+msgstr "Projetos"
 
 #. module: portal
 #: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
 #: model:ir.ui.menu,name:portal.portal_inbox
 msgid "Inbox"
-msgstr ""
+msgstr "Caixa de Entrada"
 
 #. module: portal
 #: view:share.wizard:0
 #: field:share.wizard,user_ids:0
 msgid "Existing users"
-msgstr ""
+msgstr "Usuários Existentes"
 
 #. module: portal
 #: field:portal.wizard.user,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistente"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -247,21 +268,23 @@ msgid ""
 ", so it may use Mako expressions.\n"
 "                                The Mako evaluation context provides:"
 msgstr ""
+", então é possível utilizar expressões Mako.\n"
+"                                O contexto de avaliação Mako fornece:"
 
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Grupos de Acesso"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "uid: the current user id"
-msgstr ""
+msgstr "uid: o id do usuário atual"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -269,42 +292,44 @@ msgid ""
 "quote(): a method to quote special string character to make them suitable "
 "for inclusion in a URL"
 msgstr ""
+"quote(): um método para formatar caracteres especiais e fazê-los compatíveis "
+"para inclusão em uma url"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "amount: the total amount to pay, as a float"
-msgstr ""
+msgstr "amount: o valor total a pagar, como um número flutuante"
 
 #. module: portal
 #: help:res.groups,is_portal:0
 msgid "If checked, this group is usable as a portal."
-msgstr ""
+msgstr "Se marcado, este grupo pode ser utilizado como um portal"
 
 #. module: portal
 #: field:portal.payment.acquirer,form_template:0
 msgid "Payment form template (HTML)"
-msgstr ""
+msgstr "Modelo de formulário de pagamento (HTML)"
 
 #. module: portal
 #: field:portal.wizard.user,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: portal
 #: model:ir.model,name:portal.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "E-mails Enviados"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:194
 #, python-format
 msgid "Email required"
-msgstr ""
+msgstr "E-mail obrigatório"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_messages
 msgid "Messaging"
-msgstr ""
+msgstr "Comunicações"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:195
@@ -312,11 +337,13 @@ msgstr ""
 msgid ""
 "You must have an email address in your User Preferences to send emails."
 msgstr ""
+"Você deve possuir um endereço de e-mail em suas preferências de usuário para "
+"enviar e-mails."
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_payment_acquirer
 msgid "Online Payment Acquirer"
-msgstr ""
+msgstr "Método de Pagamento Online"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -324,6 +351,8 @@ msgid ""
 "object: the document on which the payment form is rendered (usually an "
 "invoice or sale order record)"
 msgstr ""
+"object: o documento em que o formulário de pagamento é gerado (normalmente "
+"um registro de fatura ou pedido de venda)"
 
 #. module: portal
 #: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
@@ -339,16 +368,25 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    <b>Bom Trabalho!</b> Sua caixa de entrada está vazia.\n"
+"                </p><p>\n"
+"                    Sua caixa de entrada contém mensagens privadas ou e-"
+"mails enviados para você bem como informações relacionadas à documentos ou "
+"pessoas que você segue.\n"
+"                </p>\n"
+"            "
 
 #. module: portal
 #: help:portal.wizard,welcome_message:0
 msgid "This text is included in the email sent to new users of the portal."
 msgstr ""
+"Este texto é incluído nos e-mails enviados a novos usuários do portal."
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_company
 msgid "About Us"
-msgstr ""
+msgstr "Sobre Nós"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -356,11 +394,13 @@ msgid ""
 "currency: the currency record in which the document is issued (e.g. "
 "currency.name could be EUR)"
 msgstr ""
+"currency: o registro da moeda em que o documento é baseado (ex: "
+"currency.name pode ser BRL)"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "Payment Acquirer"
-msgstr ""
+msgstr "Método de Pagamento"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:35
@@ -383,6 +423,22 @@ msgid ""
 "OpenERP - Open Source Business Applications\n"
 "http://www.openerp.com\n"
 msgstr ""
+"Prezado(a) %(name)s,\n"
+"\n"
+"Você recebeu acesso a(o) %(portal)s.\n"
+"\n"
+"Os seus dados de acesso são:\n"
+"Base de Dados: %(db)s\n"
+"Nome de Usuário: %(login)s\n"
+"\n"
+"Para completar o seu processo de registro, clique na seguinte url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
 
 #. module: portal
 #: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
@@ -405,11 +461,28 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_wizard_user
 msgid "Portal User Config"
-msgstr ""
+msgstr "Configuração do Usuário do Portal"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -417,32 +490,34 @@ msgid ""
 "If the template renders to an empty result in a certain context it will be "
 "ignored, as if it was inactive."
 msgstr ""
+"Se o modelo gerar um resultado vazio em um determinado contexto ele será "
+"ignorado, como se estivesse inativo."
 
 #. module: portal
 #: field:portal.payment.acquirer,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "Visível"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:39
 #, python-format
 msgid "Existing Groups (e.g Portal Groups)"
-msgstr ""
+msgstr "Grupos Existentes (Ex: Grupos do Portal)"
 
 #. module: portal
 #: view:portal.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: portal
 #: view:portal.wizard:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "ctx: the current context dictionary"
-msgstr ""
+msgstr "ctx: o dicionário do contexto atual"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -450,6 +525,8 @@ msgid ""
 "This is an HTML form template to submit a payment through this acquirer.\n"
 "                                The template will be rendered with"
 msgstr ""
+"Este é um modelo de formulário em HTML para enviar o pagamento através deste "
+"método."
 
 #. module: portal
 #: code:addons/portal/mail_mail.py:40
@@ -457,15 +534,17 @@ msgstr ""
 msgid ""
 "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
 msgstr ""
+"Acesse os seus documentos pessoais através de <a href=\"%s\">Portal do "
+"Cliente</a>"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "Form Template"
-msgstr ""
+msgstr "Modelo de Formulário"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.partner_wizard_action
 #: model:ir.model,name:portal.model_portal_wizard
 #: view:portal.wizard:0
 msgid "Portal Access Management"
-msgstr ""
+msgstr "Gerenciamento de Acesso do Portal"
diff --git a/addons/portal_crm/i18n/pt_BR.po b/addons/portal_crm/i18n/pt_BR.po
new file mode 100644
index 00000000000..caeaab7de1c
--- /dev/null
+++ b/addons/portal_crm/i18n/pt_BR.po
@@ -0,0 +1,568 @@
+# Brazilian Portuguese 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-04 14:52+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr "Prospecto"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr "Tratamento"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr "Taxa de Sucesso (%)"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr "Contato"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr "Data da Próxima Ação"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr "CEP"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens Não Lidas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr "Dias para Abrir"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+"Obrigado pelo interesse. Sua solicitação será respondida o mais breve "
+"possível."
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr "Mais Alto"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr "Celular"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr "Índice de Cores"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Latitude Geográfica"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr "Nome do Cliente"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se marcado novas mensagens requerem sua atenção"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr "Canal de comunicação (email, diretamente, telefone, ...)"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr "Campanha"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr "Próxima Ação"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr "Entre em Contato Conosco"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr "Desistência"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr "Situação"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+"Parceiro conectado (opcional). Normalmente criado na conversão de prospecto."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr "Forma de Pagamento"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr "Novo"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr "E-mail"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr "Mais Baixa"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr "Fechar"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr "Login do Usuário"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+"If desistência é marcado, este contato recusou receber e-mails ou inscrições "
+"para uma campanha."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr "Nome do Contato"
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr "Contato"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "E-mail de Contato do Parceiro"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Receita Esperada"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr "Tarefas"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr "Formulário de contato"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr "Moeda"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr "Data de Atualização"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr "Fechamento Esperado"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr "Referência 2"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr "E-mail do Usuário"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr "Aberto"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr "Em Progresso"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+"O nome da futura empresa parceira que será criada quando o prospecto for "
+"convertido para oportunidade"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos Planejados"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr "Estimativa de data em que a oportunidade será ganha."
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Estes endereços de e-mail serão adicionados no campo CC de todas as entradas "
+"e saídas de e-mails para este registro antes de serem enviados. Separe "
+"múltiplos endereços de e-mail com vírgula."
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr "Baixa"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr "Fechado"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr "Data da Atribuição"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr "Situação"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr "Complemento"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr "Telefone"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um Seguidor"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr "Dias para Fechar"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_comment_ids:0
+#: help:portal_crm.crm_contact_us,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Comentários e e-mails"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+"Ao enviar e-mails, o endereço de e-mail padrão é o da equipe de vendas."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr "Nome de Contato do Parceiro"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Longitude Geográfica"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "Última data em que este caso foi enviado/atribuído a um parceiro"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr "Endereço de e-mail do contato"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr "Cidade"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr "Enviar"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr "Função"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr "Referenciado por"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "Parceiro Atribuído"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Parceiro para o qual este caso foi enviado/atribuído"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr "Obrigado"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+"De qual campanha (seminário, campanha de marketing, e-mail em massa, ...) "
+"este contato veio?"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr "Alta"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr "Equipe de Vendas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr "Rua"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr "Última Ação"
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr "Formulário de contato para o portal"
diff --git a/addons/portal_event/i18n/pt_BR.po b/addons/portal_event/i18n/pt_BR.po
new file mode 100644
index 00000000000..d0f535b8bbe
--- /dev/null
+++ b/addons/portal_event/i18n/pt_BR.po
@@ -0,0 +1,59 @@
+# Brazilian Portuguese 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-04 13:38+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr "Configurações do Portal"
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr "Não há eventos públicos."
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr "Particular"
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr "Evento"
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr "Eventos"
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr "A visibilidade do evento na página de contato do portal"
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr "Público"
diff --git a/addons/portal_hr_employees/i18n/pt_BR.po b/addons/portal_hr_employees/i18n/pt_BR.po
new file mode 100644
index 00000000000..2deb98fb7a8
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/pt_BR.po
@@ -0,0 +1,95 @@
+# Brazilian Portuguese 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-04 17:33+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Coach"
+msgstr "Treinador"
+
+#. module: portal_hr_employees
+#: model:ir.actions.act_window,name:portal_hr_employees.action_team
+#: view:portal_crm.crm_contact_us:0
+msgid "Meet the team"
+msgstr "Conheça o time"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr "Público"
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr "Visibilidade do colaborador na página de contato do portal"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr "Particular"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr "Colaborador"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Job"
+msgstr "Trabalho"
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr "Formulário de contato para o portal"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr "Colaboradores"
diff --git a/addons/portal_project/i18n/pt_BR.po b/addons/portal_project/i18n/pt_BR.po
new file mode 100644
index 00000000000..881f2ee267e
--- /dev/null
+++ b/addons/portal_project/i18n/pt_BR.po
@@ -0,0 +1,37 @@
+# Brazilian Portuguese 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-12-03 10:25+0000\n"
+"PO-Revision-Date: 2012-12-04 13:18+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_project
+#: model:ir.actions.act_window,help:portal_project.open_view_project
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Clique para iniciar um novo projeto.\n"
+"                </p>\n"
+"            "
+
+#. module: portal_project
+#: model:ir.actions.act_window,name:portal_project.open_view_project
+#: model:ir.ui.menu,name:portal_project.portal_services_projects
+msgid "Projects"
+msgstr "Projetos"
diff --git a/addons/portal_project_issue/i18n/pt_BR.po b/addons/portal_project_issue/i18n/pt_BR.po
new file mode 100644
index 00000000000..7fbaa3ff63b
--- /dev/null
+++ b/addons/portal_project_issue/i18n/pt_BR.po
@@ -0,0 +1,47 @@
+# Brazilian Portuguese 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-12-03 10:25+0000\n"
+"PO-Revision-Date: 2012-12-04 13:24+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "Criação:"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um incidente.\n"
+"              </p><p>\n"
+"                Você pode monitorar seus incidentes a partir deste menu e\n"
+"                as ações que serão tomadas.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr "Incidentes"
diff --git a/addons/portal_sale/i18n/pt_BR.po b/addons/portal_sale/i18n/pt_BR.po
new file mode 100644
index 00000000000..65598ecb25e
--- /dev/null
+++ b/addons/portal_sale/i18n/pt_BR.po
@@ -0,0 +1,400 @@
+# Brazilian Portuguese 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-04 21:39+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "We haven't sent you any invoice."
+msgstr "Não foi enviada nenhuma fatura."
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sale order."
+msgstr "Não foi enviado nenhum pedido de venda."
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr "Ver Opções de Pagamento Online"
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr "Mostrar botões de pagamento para os colaboradores também"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "We haven't sent you any quotation."
+msgstr "Não foi enviada nenhuma cotação."
+
+#. module: portal_sale
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sales Orders"
+msgstr "Pedidos de Vendas"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+"Os membros deste grupo visualizam as opções de pagamento online\n"
+"nas Faturas de Cliente e Pedidos de Venda. Estas opções são destinadas aos "
+"clientes que acessam\n"
+"os seus documentos através do portal."
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "E-mails Enviados"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venda"
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr "Opções de Pagamento do Portal"
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+"Mostrar opções de pagamento online em Pedidos de Vendas e Faturas de "
+"Clientes para os colaboradores. Se não marcado, estas opções serão visíveis "
+"somente aos usuários do portal."
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr "Faturas"
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr "Configurar métodos de pagamento"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+msgid "Sale Orders"
+msgstr "Pedidos de Venda"
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 1585d99c75c..cdc9fb60ac4 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-17 00:02+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2012-12-04 14:58+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: <pt@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-12-04 05:05+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:18+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: project
 #: view:project.project:0
 msgid "Email Interface"
-msgstr ""
+msgstr "Interface de E-mail"
 
 #. module: project
 #: help:account.analytic.account,use_tasks:0
@@ -28,6 +28,8 @@ msgid ""
 "If checked, this contract will be available in the project menu and you will "
 "be able to manage tasks or track issues"
 msgstr ""
+"Se marcado, este contrato estará disponível no menu do projeto e você poderá "
+"gerenciar tarefas e monitorar problemas"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -92,7 +94,7 @@ msgstr "Aviso!"
 #: help:project.project,message_unread:0
 #: help:project.task,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -107,7 +109,7 @@ msgstr "A tarefa está concluída"
 #. module: project
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -122,7 +124,7 @@ msgstr "Conta Analítica"
 #. module: project
 #: field:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Manage time estimation on tasks"
-msgstr ""
+msgstr "Gerencia estimativas de tempo em tarefas"
 
 #. module: project
 #: help:project.project,message_summary:0
@@ -131,13 +133,16 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: project
 #: code:addons/project/project.py:440
 #: code:addons/project/project.py:1414
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -147,7 +152,7 @@ msgstr "Parceiro"
 #. module: project
 #: field:project.config.settings,group_manage_delegation_task:0
 msgid "Allow task delegation"
-msgstr ""
+msgstr "Permitir delegação de tarefa"
 
 #. module: project
 #: field:project.task.delegate,planned_hours:0
@@ -175,7 +180,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
 msgid "Open Project Menu"
-msgstr ""
+msgstr "Menu de Projetos Abertos"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -196,7 +201,7 @@ msgstr "Título da Tarefa de Validação"
 #. module: project
 #: model:res.groups,name:project.group_delegate_task
 msgid "Task Delegation"
-msgstr ""
+msgstr "Delegação de Tarefa"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -208,17 +213,17 @@ msgstr "Tempo Planejado"
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Public"
-msgstr ""
+msgstr "Público"
 
 #. module: project
 #: model:project.category,name:project.project_category_01
 msgid "Contact's suggestion"
-msgstr ""
+msgstr "Sugestão do contato"
 
 #. module: project
 #: help:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Allows you to compute Time Estimation on tasks."
-msgstr ""
+msgstr "Permite calcular estimativas de tempo em tarefas."
 
 #. module: project
 #: field:report.project.task.user,user_id:0
@@ -252,7 +257,7 @@ msgstr "Modelos de Projetos"
 #. module: project
 #: field:project.project,analytic_account_id:0
 msgid "Contract/Analytic"
-msgstr ""
+msgstr "Contrato/Analítico"
 
 #. module: project
 #: view:project.config.settings:0
@@ -269,12 +274,12 @@ msgstr "Atribuíção de Tarefas de Projeto"
 #: code:addons/project/project.py:557
 #, python-format
 msgid "Project has been <b>created</b>."
-msgstr ""
+msgstr "O projeto foi <b>criado</b>."
 
 #. module: project
 #: view:project.config.settings:0
 msgid "Support"
-msgstr ""
+msgstr "Suporte"
 
 #. module: project
 #: view:project.project:0
@@ -284,7 +289,7 @@ msgstr "Membro"
 #. module: project
 #: view:project.task:0
 msgid "Cancel Task"
-msgstr ""
+msgstr "Cancelar Tarefa"
 
 #. module: project
 #: help:project.project,members:0
@@ -319,7 +324,7 @@ msgstr "Agosto"
 #: code:addons/project/project.py:1303
 #, python-format
 msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
+msgstr "A tarefa foi <b>delegada</b> para <em>%s</em>."
 
 #. module: project
 #: view:project.project:0
@@ -364,12 +369,13 @@ msgstr "Quando uma tarefa é completada, se converte no estado Concluida."
 #: field:project.project,message_summary:0
 #: field:project.task,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: project
 #: view:project.project:0
 msgid "Append this project to another one using analytic accounts hierarchy"
 msgstr ""
+"Adicionar este projeto em outro utilizando a hierarquia de contas analíticas"
 
 #. module: project
 #: view:project.task:0
@@ -404,7 +410,7 @@ msgstr "É necessário especificar o usuário delegado"
 #. module: project
 #: view:project.project:0
 msgid "Project(s) Manager"
-msgstr ""
+msgstr "Gerente do(s) Projeto(s)"
 
 #. module: project
 #: selection:project.project,state:0
@@ -436,12 +442,12 @@ msgstr "Reavaliar Tarefa"
 #: code:addons/project/project.py:1292
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Estágio alterado para <b>%s</b>."
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time"
-msgstr ""
+msgstr "Validar tempo planejado"
 
 #. module: project
 #: field:project.config.settings,module_pad:0
@@ -456,7 +462,7 @@ msgstr "Codifique suas horas trabalhadas."
 #. module: project
 #: field:project.project,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Apelido"
 
 #. module: project
 #: view:project.task:0
@@ -481,7 +487,7 @@ msgstr "Para alterar para Aberto"
 #. module: project
 #: view:project.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -496,7 +502,7 @@ msgstr "Recolocar a descrição da tarefa na tarefa do usuário"
 #. module: project
 #: view:project.project:0
 msgid "Project Settings"
-msgstr ""
+msgstr "Configurações do Projeto"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -587,7 +593,7 @@ msgstr "Tarefa"
 #. module: project
 #: help:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Allows you to compute work on tasks."
-msgstr ""
+msgstr "Permite calcular o trabalho nas tarefas."
 
 #. module: project
 #: view:project.project:0
@@ -597,7 +603,7 @@ msgstr "Administração"
 #. module: project
 #: field:project.config.settings,group_tasks_work_on_tasks:0
 msgid "Log work activities on tasks"
-msgstr ""
+msgstr "Registrar atividades de trabalho nas tarefas"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -620,11 +626,13 @@ msgstr "Não é uma Tarefa Modelo"
 msgid ""
 "Follow this project to automatically follow all related tasks and issues."
 msgstr ""
+"Siga este projeto para segir automaticamente todas as tarefas e incidentes "
+"relacionados."
 
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
-msgstr ""
+msgstr "Horas Planejadas Inicialmente"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -652,6 +660,22 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Clique para iniciar um novo projeto.\n"
+"                </p><p>\n"
+"                  Projetos são utilizados para organizar suas atividades; "
+"planejar\n"
+"                  tarefas, monitorar incidentes, faturar horas trabalhadas. "
+"Você pode definir\n"
+"                  projetos internos (R&amp;D, Melhoria no Processo de "
+"Vendas),\n"
+"                  projetos pessoais (Meus A Fazer) ou ou para clientes.\n"
+"                </p><p>\n"
+"                  Você poderá colaborar com os projetos de usuários "
+"internos\n"
+"                  ou convidar clientes para compartilhar suas atividades.\n"
+"                </p>\n"
+"            "
 
 #. module: project
 #: view:project.config.settings:0
@@ -678,7 +702,7 @@ msgstr "Nova Tarefa"
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
-msgstr ""
+msgstr "Faturar horas trabalhadas em incidentes"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -730,7 +754,7 @@ msgstr "Data da criação"
 #. module: project
 #: view:project.project:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: project
 #: view:project.task:0
@@ -748,7 +772,7 @@ msgstr "Tarefa Rascunho Aberta"
 #. module: project
 #: field:project.project,alias_model:0
 msgid "Alias Model"
-msgstr ""
+msgstr "Modelo Apelido"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -769,7 +793,7 @@ msgstr "Estágios"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -789,7 +813,7 @@ msgstr "Urgente"
 #. module: project
 #: model:project.category,name:project.project_category_02
 msgid "Feature request"
-msgstr ""
+msgstr "Solicitação de recurso"
 
 #. module: project
 #: view:project.task:0
@@ -810,12 +834,12 @@ msgstr "VERIFICAR: %s"
 #. module: project
 #: view:project.project:0
 msgid "Close Project"
-msgstr ""
+msgstr "Fechar Projeto"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Task Activities"
-msgstr ""
+msgstr "Atividades da Tarefa"
 
 #. module: project
 #: field:project.project,effective_hours:0
@@ -827,18 +851,18 @@ msgstr "Tempo Gasto"
 #: view:project.project:0
 #: view:project.task:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: project
 #: field:account.analytic.account,company_uom_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: project
 #: field:project.project,message_is_follower:0
 #: field:project.task,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -883,6 +907,8 @@ msgid ""
 "Provides management of issues/bugs in projects.\n"
 "                This installs the module project_issue."
 msgstr ""
+"Fornece gerenciamento de incidentes/problemas em projetos.\n"
+"                O módulo project_issue será instalado."
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -893,6 +919,11 @@ msgid ""
 " * Ready for next stage indicates the task is ready to be pulled to the next "
 "stage"
 msgstr ""
+"Um estado de tarefa kanban indica uma situação especial que a afeta:\n"
+" * Normal é a situação padrão\n"
+" * Bloqueada indica que algo está impedindo o progresso da tarefa\n"
+" * Pronta para o próximo estágio indica que a tarefa está pronta para ser "
+"enviada para o próximo estágio"
 
 #. module: project
 #: view:project.task:0
@@ -903,7 +934,7 @@ msgstr ""
 #: code:addons/project/project.py:566
 #, python-format
 msgid "Project has been <b>canceled</b>."
-msgstr ""
+msgstr "O projeto foi <b>cancelado</b>."
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -930,17 +961,17 @@ msgstr "Cancelar"
 #: code:addons/project/project.py:569
 #, python-format
 msgid "Project has been <b>closed</b>."
-msgstr ""
+msgstr "O projeto foi <b>fechado</b>."
 
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_task_read
 msgid "Task: Mark read"
-msgstr ""
+msgstr "Tarefa: Marcar lida"
 
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Outras informações"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -976,12 +1007,12 @@ msgstr "Usuários"
 #: model:mail.message.subtype,name:project.mt_project_stage
 #: model:mail.message.subtype,name:project.mt_task_change
 msgid "Stage Changed"
-msgstr ""
+msgstr "Estágio Alterado"
 
 #. module: project
 #: field:project.task.type,fold:0
 msgid "Hide in views if empty"
-msgstr ""
+msgstr "Esconder se visão estiver vazia"
 
 #. module: project
 #: view:project.task:0
@@ -997,7 +1028,7 @@ msgstr "Comum para Todos os Projetos"
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1024,7 +1055,7 @@ msgstr "Comum"
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: project
 #: view:project.project:0
@@ -1032,6 +1063,8 @@ msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
 msgstr ""
+"Para faturar ou configurar o faturamento e opções de renovação, vá para o "
+"contrato relacionado:"
 
 #. module: project
 #: field:project.task.delegate,state:0
@@ -1047,13 +1080,13 @@ msgstr "Sumário do trabalho"
 #: code:addons/project/project.py:563
 #, python-format
 msgid "Project is now <b>pending</b>."
-msgstr ""
+msgstr "O projeto está agora <b>pendente</b>."
 
 #. module: project
 #: code:addons/project/project.py:560
 #, python-format
 msgid "Project has been <b>opened</b>."
-msgstr ""
+msgstr "O projeto foi <b>aberto</b>."
 
 #. module: project
 #: view:project.project:0
@@ -1099,7 +1132,7 @@ msgstr "Tarefas Delegadas"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens Não Lidas"
 
 #. module: project
 #: view:project.task:0
@@ -1110,7 +1143,7 @@ msgstr "Tarefas Pai"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_read
 msgid "Project: Mark read"
-msgstr ""
+msgstr "Projeto: Marcar Lido"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1146,7 +1179,7 @@ msgstr "Mostrar apenas tarefas que tem um prazo final"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Usabilidade"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1163,7 +1196,7 @@ msgstr "Concluído por"
 #: code:addons/project/project.py:180
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1181,7 +1214,7 @@ msgstr "Informações Adicionais"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1192,12 +1225,12 @@ msgstr "# de tarefas"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "Número de documentos anexados"
 
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_task_unread
 msgid "Task: Mark unread"
-msgstr ""
+msgstr "Tarefa: Marcar não lida"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1217,6 +1250,9 @@ msgid ""
 "automatically synchronizedwith Tasks (or optionally Issues if the Issue "
 "Tracker module is installed)."
 msgstr ""
+"E-mail interno associado a este projeto. E-mails recebidos serão "
+"automaticamente sincronizados com tarefas (ou opcionalmente incidentes se o "
+"Rastreador de Incidentes estiver instalado)"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -1232,6 +1268,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um estágio às tarefas.\n"
+"              </p><p>\n"
+"                Define os passos que serão utilizados no projeto da criação\n"
+"                da tarefa, até o fechamento da mesma ou do incidente.\n"
+"                Estes estágios serão usados para monitorar o progresso em\n"
+"                resolver uma tarefa ou um incidente.\n"
+"              </p>\n"
+"            "
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -1276,12 +1321,12 @@ msgstr "Horas de Atraso"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Equipe"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Define a unidade de medida utilizada em projetos e tarefas."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1330,7 +1375,7 @@ msgstr "Título para sua tarefa de validação"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Unidade de Tempo de Trabalho"
 
 #. module: project
 #: view:project.project:0
@@ -1348,7 +1393,7 @@ msgstr "Baixo"
 #: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #. module: project
 #: view:project.project:0
@@ -1367,7 +1412,7 @@ msgstr "Pendente"
 #. module: project
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1387,7 +1432,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Permite delegar tarefas a outros usuários."
 
 #. module: project
 #: field:project.project,active:0
@@ -1397,7 +1442,7 @@ msgstr "Ativo"
 #. module: project
 #: model:ir.model,name:project.model_project_category
 msgid "Category of project's task, issue, ..."
-msgstr ""
+msgstr "Categoria da tarefa ou incidente do projeto"
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1416,7 +1461,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Helpdesk e Suporte"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1441,7 +1486,7 @@ msgstr ""
 #: code:addons/project/project.py:219
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #. module: project
 #: view:project.task:0
@@ -1464,6 +1509,9 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Não é possível excluir um projeto que contenha tarefas. É possível tanto "
+"excluir todas as tarefas do projeto e então excluir o projeto ou desativar o "
+"projeto."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1474,7 +1522,7 @@ msgstr "Aberto"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Privacidade / Visibilidade"
 
 #. module: project
 #: view:project.task:0
@@ -1515,7 +1563,7 @@ msgstr "Gerente"
 #. module: project
 #: view:project.task:0
 msgid "Very Important"
-msgstr ""
+msgstr "Muito Importante"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1594,12 +1642,12 @@ msgstr "Atribuir para"
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
-msgstr ""
+msgstr "Estimativa de Tempo em Tarefas"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1618,6 +1666,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Este estágio não é visível, por exemplo na barra de status ou visão kanban, "
+"quando não há registros definidos no mesmo para visualizar."
 
 #. module: project
 #: view:project.task:0
@@ -1647,7 +1697,7 @@ msgstr "Projetos Pendentes"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Restante"
 
 #. module: project
 #: field:project.task,progress:0
@@ -1676,17 +1726,17 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_issue:0
 msgid "Track issues and bugs"
-msgstr ""
+msgstr "Rastrear incidentes e problemas"
 
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Gerar tarefas a partir de pedidos de vendas"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Estágios da Tarefa"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1697,7 +1747,7 @@ msgstr "Defina as exigências e ajuste horas de planejamento."
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: project
 #: field:project.project,color:0
@@ -1745,6 +1795,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma nova tarefa.\n"
+"              </p><p>\n"
+"                O gerenciamento de projetos do OpenERP permite gerenciar\n"
+"                as tarefas para obter as coisas feitas de forma eficiente. É "
+"possível\n"
+"                monitorar o progresso, discutir nas tarefas, anexar "
+"documentos, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: project
 #: field:project.task,date_end:0
@@ -1755,12 +1815,12 @@ msgstr "Data Final"
 #. module: project
 #: field:project.task.type,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Situação Relacionada"
 
 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1772,7 +1832,7 @@ msgstr "# de Dias"
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_new
@@ -1812,7 +1872,7 @@ msgstr "Validação da tarefa"
 #. module: project
 #: field:project.config.settings,module_project_long_term:0
 msgid "Manage resources planning on gantt view"
-msgstr ""
+msgstr "Gerenciar o planejamento de recursos no Gráfico Gantt"
 
 #. module: project
 #: view:project.task:0
@@ -1871,7 +1931,7 @@ msgstr "Projetos"
 #. module: project
 #: model:res.groups,name:project.group_tasks_work_on_tasks
 msgid "Task's Work on Tasks"
-msgstr ""
+msgstr "Trabalho de Tarefas em Tarefas"
 
 #. module: project
 #: help:project.task.delegate,name:0
@@ -1895,7 +1955,7 @@ msgstr "Tarefas do Projeto"
 #: code:addons/project/project.py:1296
 #, python-format
 msgid "Task has been <b>created</b>."
-msgstr ""
+msgstr "A tarefa foi <b>criada</b>."
 
 #. module: project
 #: field:account.analytic.account,use_tasks:0
@@ -1919,14 +1979,14 @@ msgstr "Dezembro"
 #: model:mail.message.subtype,name:project.mt_project_canceled
 #: model:mail.message.subtype,name:project.mt_task_canceled
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: project
 #: help:project.config.settings,module_project_mrp:0
@@ -1948,7 +2008,7 @@ msgstr "Tempo Estimado para o usuário concluir esta tarefa a ele atribuída"
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr ""
+msgstr "Experimento"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1967,12 +2027,12 @@ msgstr "Situação Kanban"
 #: code:addons/project/project.py:1299
 #, python-format
 msgid "Task has been set as <b>draft</b>."
-msgstr ""
+msgstr "A tarefa foi definida como <b>rascunho</b>."
 
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
 msgid "Record timesheet lines per tasks"
-msgstr ""
+msgstr "Registrar planinha de tempo por tarefa"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -2009,12 +2069,14 @@ msgid ""
 "The kind of document created when an email is received on this project's "
 "email alias"
 msgstr ""
+"O tipo de documento criado no recebimento de e-mail pelo apelido de e-mail "
+"do projeto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr ""
+msgstr "Configurar Projeto"
 
 #. module: project
 #: field:project.project,message_comment_ids:0
@@ -2022,7 +2084,7 @@ msgstr ""
 #: field:project.task,message_comment_ids:0
 #: help:project.task,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -2037,7 +2099,7 @@ msgstr "Janeiro"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_unread
 msgid "Project: Mark unread"
-msgstr ""
+msgstr "Projeto: Marcar não lido"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -2071,7 +2133,7 @@ msgstr "Projetos nos quais eu sou gerente"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready for next stage"
-msgstr ""
+msgstr "Pronto para o próximo estágio"
 
 #. module: project
 #: view:project.task:0
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index e004f0ba2b6..c271005eca0 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-20 19:36+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 16:20+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
 msgid "Deadly bug"
-msgstr ""
+msgstr "Problema irrecuperável"
 
 #. module: project_issue
 #: help:project.config.settings,fetchmail_issue:0
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create issues from "
 "incoming emails."
 msgstr ""
+"Permite configurar seu servidor de e-mail de entrada, e criar incidentes a "
+"partir de e-mails recebidos."
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -69,18 +71,18 @@ msgstr "Progresso"
 #: view:project.issue:0
 #: field:project.issue,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens Não Lidas"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:560
 #, python-format
 msgid "<b>escalated</b>."
-msgstr ""
+msgstr "<b>escalado</b>."
 
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
 msgid "Issue: Mark unread"
-msgstr ""
+msgstr "Incidente: Marcar não lido"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
@@ -90,12 +92,12 @@ msgstr "Emails dos Observadores"
 #. module: project_issue
 #: help:project.issue,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: project_issue
 #: help:account.analytic.account,use_issues:0
 msgid "Check this field if this project manages issues"
-msgstr ""
+msgstr "Marque este campo se este projeto gerencia incidentes"
 
 #. module: project_issue
 #: field:project.issue,day_open:0
@@ -178,6 +180,16 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para reportar um novo incidente.\n"
+"          </p><p>\n"
+"            O rastreador de incidentes do OpenERP permite gerenciar "
+"eficientemente coisas\n"
+"            como solicitações internas, problemas de desenvolvimento de "
+"programas, reclamações de\n"
+"            clientes, problemas de projeto, falta de materiais, etc.\n"
+"          </p>\n"
+"        "
 
 #. module: project_issue
 #: selection:project.issue,state:0
@@ -188,7 +200,7 @@ msgstr "Cancelado"
 #. module: project_issue
 #: field:project.issue,description:0
 msgid "Private Note"
-msgstr ""
+msgstr "Nota Particular"
 
 #. module: project_issue
 #: field:project.issue.report,date_closed:0
@@ -198,7 +210,7 @@ msgstr "Data do Fechamento"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr "Rastreador de Problemas"
+msgstr "Rastreador de Incidentes"
 
 #. module: project_issue
 #: field:project.issue,color:0
@@ -218,7 +230,7 @@ msgstr "Média de Horas Trabalhadas para Abrir"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: project_issue
 #: help:project.issue,message_summary:0
@@ -226,6 +238,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: project_issue
 #: help:project.project,project_escalation_id:0
@@ -257,7 +272,7 @@ msgstr ""
 #. module: project_issue
 #: view:project.issue:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -278,7 +293,7 @@ msgstr "Manutenção"
 #: code:addons/project_issue/project_issue.py:547
 #, python-format
 msgid "Project issue <b>converted</b> to task."
-msgstr ""
+msgstr "Incidente de projeto <b>convertido</b> para tarefa."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -299,7 +314,7 @@ msgstr "Versão"
 #. module: project_issue
 #: field:project.issue,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -311,7 +326,7 @@ msgstr "Novo"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
 msgid "Issue Categories"
-msgstr "Categorias de Problemas"
+msgstr "Categorias de Incidentes"
 
 #. module: project_issue
 #: field:project.issue,email_from:0
@@ -334,7 +349,7 @@ msgstr "Mais Baixa"
 #: code:addons/project_issue/project_issue.py:358
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -367,7 +382,7 @@ msgstr "project.issue.version"
 #. module: project_issue
 #: field:project.config.settings,fetchmail_issue:0
 msgid "Create issues from an incoming email account "
-msgstr ""
+msgstr "Criar incidentes a partir de uma conta de recebimento de e-mails "
 
 #. module: project_issue
 #: view:project.issue:0
@@ -405,7 +420,7 @@ msgstr "Análise de Questões"
 #: code:addons/project_issue/project_issue.py:493
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Sem Assunto"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
@@ -424,12 +439,12 @@ msgstr "Contato"
 #: code:addons/project_issue/project_issue.py:551
 #, python-format
 msgid "Project issue <b>created</b>."
-msgstr ""
+msgstr "Incidente de Projeto <b>criado</b>"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:341
@@ -440,12 +455,12 @@ msgstr "Tarefas"
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
-msgstr "No de Problemas"
+msgstr "Nº de Incidentes"
 
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
 msgid "Issue: Mark read"
-msgstr ""
+msgstr "Incidente: Marcar lido"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -455,7 +470,7 @@ msgstr "Dezembro"
 #. module: project_issue
 #: field:project.issue,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -465,12 +480,12 @@ msgstr "Árvore de Rastreamento de Questões"
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_01
 msgid "Little problem"
-msgstr ""
+msgstr "Problema pequeno"
 
 #. module: project_issue
 #: view:project.project:0
 msgid "creates"
-msgstr ""
+msgstr "cria"
 
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.feature_request_categ
@@ -485,7 +500,7 @@ msgstr "Data de Atualização"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Project:"
-msgstr ""
+msgstr "Projeto:"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -590,12 +605,12 @@ msgstr "Normal"
 #. module: project_issue
 #: field:project.project,issue_count:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Category:"
-msgstr ""
+msgstr "Categoria:"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -605,7 +620,7 @@ msgstr "Junho"
 #. module: project_issue
 #: help:project.issue,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -620,7 +635,7 @@ msgstr "Dias para concluir"
 #. module: project_issue
 #: field:project.issue,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: project_issue
 #: help:project.issue,state:0
@@ -647,13 +662,13 @@ msgstr "Novembro"
 #: code:addons/project_issue/project_issue.py:472
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: project_issue
 #: field:project.issue,message_comment_ids:0
 #: help:project.issue,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -688,7 +703,7 @@ msgstr "Essas pessoas receberão e-mail."
 #. module: project_issue
 #: field:project.issue,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: project_issue
 #: field:project.issue,date:0
@@ -705,7 +720,7 @@ msgstr "Atribuído a"
 #. module: project_issue
 #: view:project.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -720,7 +735,7 @@ msgstr "Setembro"
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
-msgstr "Versão do Problema"
+msgstr "Versão do Incidente"
 
 #. module: project_issue
 #: field:project.issue.version,name:0
@@ -746,7 +761,7 @@ msgstr "Aberto"
 #: view:project.issue:0
 #: view:project.project:0
 msgid "Issues"
-msgstr "Problemas"
+msgstr "Incidentes"
 
 #. module: project_issue
 #: selection:project.issue,state:0
@@ -774,7 +789,7 @@ msgstr "Mês de criação"
 #: code:addons/project_issue/project_issue.py:557
 #, python-format
 msgid "<b>escalated</b> to <em>'%s'</em>."
-msgstr ""
+msgstr "<b>escalado</b> para <em>'%s'</em>."
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -794,13 +809,13 @@ msgstr "Mês"
 #: field:project.issue,name:0
 #: view:project.project:0
 msgid "Issue"
-msgstr "Problema"
+msgstr "Incidente"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:540
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Estágio alterado para <b>%s</b>."
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
@@ -865,6 +880,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar uma nova versão.\n"
+"              </p><p>\n"
+"                Defina aqui as diferentes versões de seus produtos que\n"
+"                serão utilizadas em incidentes.\n"
+"              </p>\n"
+"            "
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -878,12 +900,12 @@ msgstr ""
 #. module: project_issue
 #: view:board.board:0
 msgid "My Issues"
-msgstr "Meus Problemas"
+msgstr "Meus Incidentes"
 
 #. module: project_issue
 #: help:project.issue.report,delay_open:0
 msgid "Number of Days to open the project issue."
-msgstr ""
+msgstr "Número de dias para abrir o incidente do projeto."
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -893,7 +915,7 @@ msgstr "Abril"
 #. module: project_issue
 #: view:project.issue:0
 msgid "⇒ Escalate"
-msgstr ""
+msgstr "⇒ Escalar"
 
 #. module: project_issue
 #: view:project.issue:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 488d7979b0e..31334e1f9d4 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -213,6 +213,7 @@ class purchase_order(osv.osv):
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums",help="The total amount"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
+        'payment_term_id': fields.many2one('account.payment.term', 'Payment Term'),
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
@@ -289,12 +290,17 @@ class purchase_order(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         partner = self.pool.get('res.partner')
         if not partner_id:
-            return {'value':{'fiscal_position': False}}
+            return {'value': {
+                'fiscal_position': False,
+                'payment_term_id': False,
+                }}
         supplier_address = partner.address_get(cr, uid, [partner_id], ['default'])
         supplier = partner.browse(cr, uid, partner_id)
-        pricelist = supplier.property_product_pricelist_purchase.id
-        fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
-        return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+        return {'value': {
+            'pricelist_id': supplier.property_product_pricelist_purchase.id,
+            'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+            'payment_term_id': supplier.property_supplier_payment_term.id or False,
+            }}
 
     def invoice_open(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
@@ -528,8 +534,8 @@ class purchase_order(osv.osv):
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
                 'invoice_line': [(6, 0, inv_lines)],
                 'origin': order.name,
-                'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
-                'payment_term': order.partner_id.property_payment_term and order.partner_id.property_payment_term.id or False,
+                'fiscal_position': order.fiscal_position.id or False,
+                'payment_term': order.payment_term_id.id or False,
                 'company_id': order.company_id.id,
             }
             inv_id = inv_obj.create(cr, uid, inv_data, context=context)
@@ -1140,7 +1146,8 @@ class procurement_order(osv.osv):
                 'pricelist_id': pricelist_id,
                 'date_order': purchase_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
                 'company_id': procurement.company_id.id,
-                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
+                'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
+                'payment_term_id': partner.property_supplier_payment_term.id or False,
             }
             res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=new_context)
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f0be9e56dec..eba27492974 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -278,6 +278,7 @@
                                 <group>
                                     <field name="invoice_method"/>
                                     <field name="invoiced"/>
+                                    <field name="payment_term_id" widget="selection"/>
                                     <field name="fiscal_position"/>
                                     <!-- We do not need these fields anymore, the information is in open chatter -->
                                     <field name="validator" groups="base.group_no_one"/>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index b5b708119cc..671a21ef364 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -60,6 +60,13 @@ class stock_picking(osv.osv):
         invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
         if picking.purchase_id:
             invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id
+            invoice_vals['payment_term'] = picking.purchase_id.payment_term_id.id
+            # Fill the date_due on the invoice, for usability purposes.
+            # Note that when an invoice with a payment term is validated, the
+            # date_due is always recomputed from the invoice date and the payment
+            # term.
+            if picking.purchase_id.payment_term_id and context.get('date_inv'):
+                invoice_vals['date_due'] = self.pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [], picking.purchase_id.payment_term_id.id, context.get('date_inv'))['value'].get('date_due')
         return invoice_vals
 
     def get_currency_id(self, cursor, user, picking):
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index edce941ab7b..fc2560f7791 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -74,10 +74,6 @@ class purchase_line_invoice(osv.osv_memory):
                 journal_id = account_jrnl_obj.search(cr, uid, [('type', '=', 'purchase')], context=None)
                 journal_id = journal_id and journal_id[0] or False
                 a = partner.property_account_payable.id
-                if partner and partner.property_payment_term.id:
-                    pay_term = partner.property_payment_term.id
-                else:
-                    pay_term = False
                 inv = {
                     'name': name,
                     'origin': name,
@@ -89,7 +85,7 @@ class purchase_line_invoice(osv.osv_memory):
                     'invoice_line': [(6,0,lines_ids)],
                     'currency_id' : orders[0].pricelist_id.currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
-                    'payment_term': pay_term,
+                    'payment_term': orders[0].payment_term_id.id,
                     'fiscal_position': partner.property_account_position.id
                 }
                 inv_id = invoice_obj.create(cr, uid, inv)
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index 4695ca8103a..a10fc0a0e56 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:59+0000\n"
+"Last-Translator: Numérigraphe <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:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -94,6 +94,8 @@ msgstr "Ressources"
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
+"Assurez vous que le temps de travail a été configuré pour les bons jours de "
+"la semaine !"
 
 #. module: resource
 #: code:addons/resource/resource.py:310
@@ -268,7 +270,7 @@ msgstr "Définir le programme de la ressource"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "Date de départ en congés"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -337,7 +339,7 @@ msgstr "(vacances)"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erreur de paramétrage !"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 8a902aa1b53..c97892adf70 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-25 19:14+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 07:48+0000\n"
+"Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\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-12-04 05:30+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: sale
@@ -59,6 +59,7 @@ msgstr "Dag"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Annuleer order"
 
@@ -101,6 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -257,7 +259,7 @@ msgstr "Korting (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Maak en bekijk factuur"
 
 #. module: sale
 #: view:board.board:0
@@ -302,7 +304,7 @@ msgid "Advance of %s %%"
 msgstr "Vooruitbetaling van %s %%"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Verkooporders met uitgestelde levering"
 
@@ -378,8 +380,8 @@ msgid "Advance of %s %s"
 msgstr "Voorschot van %s %s"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -388,14 +390,13 @@ msgstr "Offertes"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Aantal"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Afleveradres voor de huidige verkooporder"
 
 #. module: sale
 #: report:sale.order:0
@@ -413,6 +414,7 @@ msgid "Fiscal Position"
 msgstr "Fiscale positie"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "In behandeling"
@@ -421,7 +423,7 @@ msgstr "In behandeling"
 #: code:addons/sale/sale.py:667
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "Concept factuur van %s %s <b>wacht op validatie</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -503,7 +505,6 @@ msgid "or"
 msgstr "of"
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -605,6 +606,7 @@ msgstr "(update)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Verkooporderregel"
 
@@ -624,7 +626,6 @@ msgid "Order N°"
 msgstr "Order nr."
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Orderregels"
@@ -722,6 +723,7 @@ msgstr "Orderdatum"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Verzonden"
 
@@ -733,7 +735,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -770,7 +771,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr "Het is niet mogelijk een verkooporder zonder regels te bevestigen"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -883,6 +884,7 @@ msgid "Your Reference"
 msgstr "Uw referentie"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Hvhd"
@@ -894,9 +896,10 @@ msgstr "Mijn verkooporderregels"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -917,10 +920,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Maak factuur"
@@ -947,6 +949,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Bedrag"
 
@@ -1084,6 +1087,7 @@ msgid "Sale Order"
 msgstr "Verkooporder"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1153,6 +1157,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Maak facturen"
 
@@ -1257,7 +1262,7 @@ msgstr "Verkoopanalyse"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Offerte"
@@ -1406,10 +1411,8 @@ msgid "Customer Invoices"
 msgstr "Klantfacturen"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1431,7 +1434,6 @@ msgid "Unit Price"
 msgstr "Prijs"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1440,10 +1442,8 @@ msgid "Done"
 msgstr "Gereed"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Factuur"
 
@@ -1519,6 +1519,7 @@ msgid "Product UoS"
 msgstr "Artikel UoS"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Handmatig in behandeling"
@@ -1670,7 +1671,7 @@ msgid "Invoice Exception"
 msgstr "Fouten in facturatie"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Geen klant opgegeven!"
@@ -1738,7 +1739,7 @@ msgstr "Niet-gefactureerde regels zoeken"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr "Offerte verstuurt"
+msgstr "Offerte verstuurd"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
@@ -1747,6 +1748,7 @@ msgstr "E-mail samenstellen wizard"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1770,15 +1772,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Verkooporder"
 
@@ -1813,6 +1812,7 @@ msgid "Followers"
 msgstr "Volgers"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Factuurregels"
@@ -1824,7 +1824,6 @@ msgid "# of Lines"
 msgstr "# Regels"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1898,7 +1897,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1922,6 +1921,8 @@ msgid "Weight"
 msgstr "Gewicht"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Facturen"
@@ -1953,7 +1954,10 @@ msgid "Untaxed Amount"
 msgstr "Netto bedrag"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Vooruitbetalen"
@@ -1994,6 +1998,8 @@ msgid "Email Templates"
 msgstr "Email-sjablonen"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Verkooporders"
@@ -2031,7 +2037,7 @@ msgid "January"
 msgstr "Januari"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Lopende verkooporders"
 
@@ -2210,6 +2216,7 @@ msgid "Quotation N°"
 msgstr "Offerte nr."
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Verzameld"
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index c49a2f0512c..49ccd62f6f5 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: ERP Basing <erp@basing.si>\n"
+"PO-Revision-Date: 2012-12-04 14:05+0000\n"
+"Last-Translator: Vida Potočnik <vida.potocnik@mentis.si>\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-12-04 05:31+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: sale
@@ -57,6 +57,7 @@ msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Prekliči nalog"
 
@@ -99,6 +100,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -297,7 +299,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Prodaja v izjemah"
 
@@ -370,11 +372,11 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "%s %s avans"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -383,7 +385,6 @@ msgstr "Ponudbe"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -408,6 +409,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "V obdelavi"
@@ -496,7 +498,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -598,6 +599,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Postavka prodajnega naročila"
 
@@ -617,7 +619,6 @@ msgid "Order N°"
 msgstr "Naročilo št."
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Postavke naročila"
@@ -715,6 +716,7 @@ msgstr "Datum naročila"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Poslano"
 
@@ -726,7 +728,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -763,7 +764,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -873,6 +874,7 @@ msgid "Your Reference"
 msgstr "Vaš sklic"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Kol."
@@ -884,9 +886,10 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -907,10 +910,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Ustvari račun"
@@ -937,6 +939,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Cena"
 
@@ -1072,6 +1075,7 @@ msgid "Sale Order"
 msgstr "Prodajni nalog"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1139,6 +1143,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Naredite Račun"
 
@@ -1243,7 +1248,7 @@ msgstr "Prodajne Analize"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Ponudba"
@@ -1389,10 +1394,8 @@ msgid "Customer Invoices"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1414,7 +1417,6 @@ msgid "Unit Price"
 msgstr "Cena enote"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1423,10 +1425,8 @@ msgid "Done"
 msgstr "Opravljeno"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Račun"
 
@@ -1502,6 +1502,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ročno v Delu"
@@ -1646,7 +1647,7 @@ msgid "Invoice Exception"
 msgstr "Izjema računa"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Ni določene stranke !"
@@ -1723,6 +1724,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1746,15 +1748,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr ""
 
@@ -1789,6 +1788,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Postavke računa"
@@ -1800,7 +1800,6 @@ msgid "# of Lines"
 msgstr "Število vrstic"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1874,7 +1873,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1898,6 +1897,8 @@ msgid "Weight"
 msgstr "Teža"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr ""
@@ -1929,7 +1930,10 @@ msgid "Untaxed Amount"
 msgstr "Neobdavčen znesek"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Avansni Račun"
@@ -1970,6 +1974,8 @@ msgid "Email Templates"
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Prodajni nalogi"
@@ -2007,7 +2013,7 @@ msgid "January"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Prodajni nalogi v teku"
 
@@ -2180,6 +2186,7 @@ msgid "Quotation N°"
 msgstr "Povpraševanje št."
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Prevzeto"
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 64090fc7903..cec462aff96 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -242,7 +242,7 @@ class sale_order(osv.osv):
         'order_policy': 'manual',
         'state': 'draft',
         'user_id': lambda obj, cr, uid, context: uid,
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
+        'name': lambda obj, cr, uid, context: '/',
         'invoice_quantity': 'order',
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
@@ -321,6 +321,8 @@ class sale_order(osv.osv):
         return {'value': val}
 
     def create(self, cr, uid, vals, context=None):
+        if vals.get('name','/')=='/':
+            vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'sale.order') or '/'
         order =  super(sale_order, self).create(cr, uid, vals, context=context)
         if order:
             self.create_send_note(cr, uid, [order], context=context)
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 28eb7c0f82f..180b2314799 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-03-22 00:30+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 22:27+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:837
 #, python-format
 msgid "Invitation to collaborate about %s"
-msgstr ""
+msgstr "Convite para colaboração sobre %s"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:775
@@ -29,42 +29,45 @@ msgstr ""
 msgid ""
 "The share engine has not been able to fetch a record_id for your invitation."
 msgstr ""
+"O mecanismo de compartilhamento não conseguiu obter um record_id para seu "
+"convite."
 
 #. module: share
 #: view:share.wizard:0
 msgid "Include an Optional Personal Message"
-msgstr ""
+msgstr "Incluir uma Mensagem Pessoal Opcional"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
 msgid "Display title"
-msgstr ""
+msgstr "Titulo para Exibição"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Access granted!"
-msgstr ""
+msgstr "Acesso Permitido!"
 
 #. module: share
 #: field:share.wizard,record_name:0
 msgid "Record name"
-msgstr ""
+msgstr "Nome do registro"
 
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
 "An optional personal message, to be included in the email notification."
 msgstr ""
+"Uma mensagem pessoal opcional, que será incluída na notificação por e-mail."
 
 #. module: share
 #: field:share.wizard,user_type:0
 msgid "Sharing method"
-msgstr ""
+msgstr "Método de compatilhamento"
 
 #. module: share
 #: field:share.wizard,name:0
 msgid "Share Title"
-msgstr ""
+msgstr "Título do compartilhamento"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:843
@@ -76,6 +79,10 @@ msgid ""
 "    %s\n"
 "\n"
 msgstr ""
+"Os documentos não estão anexados, você pode vê-los online diretamente em meu "
+"servidor OpenERP em:\n"
+"    %s\n"
+"\n"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -90,42 +97,48 @@ msgid ""
 "Hello,\n"
 "\n"
 msgstr ""
+"Olá,\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "URL para Acesso ao Compartilhamento"
 
 #. module: share
 #: field:share.wizard,email_1:0
 #: field:share.wizard,email_2:0
 #: field:share.wizard,email_3:0
 msgid "New user email"
-msgstr ""
+msgstr "E-mail para novo usuário"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:882
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
+"Você pode utilizar o seu nome de usuário e senha atuais (%s) para vê-los.\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:616
 #, python-format
 msgid "(Modified)"
-msgstr ""
+msgstr "(Modificado)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:660
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
 msgstr ""
+"Você precisa ser membro do grupo de Compartilhamento/Usuário para utilizar o "
+"assistente de compartilhamento."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:594
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Filtro de compartilhamento criado pelo usuário %s (%s) para o grupo %s"
 
 #. module: share
 #: field:share.wizard,embed_url:0
@@ -138,7 +151,7 @@ msgstr "URL de Compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:876
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "Estas são suas credenciais para acessar esta área protegida:\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -154,7 +167,7 @@ msgstr "Compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:566
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
-msgstr ""
+msgstr "(Duplicado para permissões de compartilhamento modificadas)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:664
@@ -162,11 +175,12 @@ msgstr ""
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
 msgstr ""
+"Indique os e-mails das pessoas com quem deseja compartilhar, uma por linha."
 
 #. module: share
 #: help:share.wizard,domain:0
 msgid "Optional domain for further data filtering"
-msgstr ""
+msgstr "Domínio adicional para filtragem de dados"
 
 #. module: share
 #: view:share.wizard:0
@@ -189,24 +203,24 @@ msgstr "Nome de usuário"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing Options"
-msgstr ""
+msgstr "Opções de Compartilhamento"
 
 #. module: share
 #. openerp-web
 #: code:addons/share/static/src/xml/share.xml:9
 #, python-format
 msgid "Invite"
-msgstr ""
+msgstr "Convidar"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Embedded code options"
-msgstr ""
+msgstr "Opções de código embutido"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuração"
 
 #. module: share
 #: view:share.wizard:0
@@ -214,6 +228,7 @@ msgid ""
 "Please select the action that opens the screen containing the data you want "
 "to share."
 msgstr ""
+"Escolha a ação que abre a janela contendo os dados que deseja compartilhar."
 
 #. module: share
 #: field:res.groups,share:0
@@ -225,7 +240,7 @@ msgstr "Grupo de Compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:861
 #, python-format
 msgid "Email required"
-msgstr "Email obrigatório"
+msgstr "E-mail obrigatório"
 
 #. module: share
 #: view:share.wizard:0
@@ -233,11 +248,13 @@ msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
 msgstr ""
+"Opcionalmente, você pode especificar uma restrição de domínio adicional que "
+"será aplicada aos dados compartilhados."
 
 #. module: share
 #: view:res.groups:0
 msgid "Non-Share Groups"
-msgstr ""
+msgstr "Grupos que não Compartilham"
 
 #. module: share
 #: view:share.wizard:0
@@ -245,12 +262,14 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Um e-mail de notificação com instruções foi enviado para as seguintes "
+"pessoas:"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:77
 #, python-format
 msgid "Direct link or embed code"
-msgstr ""
+msgstr "Link direto ou código embutido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:851
@@ -280,7 +299,7 @@ msgstr "Usuário de Compartilhamento"
 #. module: share
 #: field:share.wizard.result.line,user_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:61
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index defe2805c37..53d2e9d327e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1023,8 +1023,10 @@ class stock_picking(osv.osv):
             partner = self.pool.get('res.partner').browse(cr, uid, partner, context=context)
         if inv_type in ('out_invoice', 'out_refund'):
             account_id = partner.property_account_receivable.id
+            payment_term = partner.property_payment_term.id or False
         else:
             account_id = partner.property_account_payable.id
+            payment_term = partner.property_supplier_payment_term.id or False
         comment = self._get_comment_invoice(cr, uid, picking)
         invoice_vals = {
             'name': picking.name,
@@ -1033,7 +1035,7 @@ class stock_picking(osv.osv):
             'account_id': account_id,
             'partner_id': partner.id,
             'comment': comment,
-            'payment_term': partner.property_payment_term and partner.property_payment_term.id or False,
+            'payment_term': payment_term,
             'fiscal_position': partner.property_account_position.id,
             'date_invoice': context.get('date_inv', False),
             'company_id': picking.company_id.id,
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 168a1c85233..bf9e8011959 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1433,6 +1433,9 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="location_id" invisible="1"/>
+                    <field name="location_dest_id" invisible="1"/>
+                    <field name="create_date" invisible="1"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
                         icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 61ae519f65f..f3801bf9024 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -23,6 +23,7 @@ import time
 from lxml import etree
 from osv import fields, osv
 from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from tools.float_utils import float_compare
 import decimal_precision as dp
 from tools.translate import _
 
@@ -52,7 +53,7 @@ class stock_partial_picking_line(osv.TransientModel):
         'update_cost': fields.boolean('Need cost update'),
         'cost' : fields.float("Cost", help="Unit Cost for this product line"),
         'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", ondelete='CASCADE'),
-        'tracking': fields.function(_tracking, string='Tracking', type='boolean'), 
+        'tracking': fields.function(_tracking, string='Tracking', type='boolean'),
     }
 
     def onchange_product_id(self, cr, uid, ids, product_id, context=None):
@@ -80,7 +81,7 @@ class stock_partial_picking(osv.osv_memory):
         'picking_id': fields.many2one('stock.picking', 'Picking', required=True, ondelete='CASCADE'),
         'hide_tracking': fields.function(_hide_tracking, string='Tracking', type='boolean', help='This field is for internal purpose. It is used to decide if the column production lot has to be shown on the moves or not.'),
      }
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         #override of fields_view_get in order to change the label of the process button and the separator accordingly to the shipping type
         if context is None:
@@ -176,18 +177,18 @@ class stock_partial_picking(osv.osv_memory):
             qty_in_line_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, line_uom.id)
 
             if line_uom.factor and line_uom.factor <> 0:
-                if qty_in_line_uom <> wizard_line.quantity:
+                if float_compare(qty_in_line_uom, wizard_line.quantity, precision_rounding=line_uom.rounding) != 0:
                     raise osv.except_osv(_('Warning!'), _('The unit of measure rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
             if move_id:
                 #Check rounding Quantity.ex.
-                #picking: 1kg, uom kg rounding = 0.01 (rounding to 10g), 
+                #picking: 1kg, uom kg rounding = 0.01 (rounding to 10g),
                 #partial delivery: 253g
                 #=> result= refused, as the qty left on picking would be 0.747kg and only 0.75 is accepted by the uom.
                 initial_uom = wizard_line.move_id.product_uom
                 #Compute the quantity for respective wizard_line in the initial uom
                 qty_in_initial_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, initial_uom.id)
                 without_rounding_qty = (wizard_line.quantity / line_uom.factor) * initial_uom.factor
-                if qty_in_initial_uom <> without_rounding_qty:
+                if float_compare(qty_in_initial_uom, without_rounding_qty, precision_rounding=initial_uom.rounding) != 0:
                     raise osv.except_osv(_('Warning!'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only roundings of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
             else:
                 seq_obj_name =  'stock.picking.' + picking_type
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index c9c511a7efd..aa07c42ff85 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:56+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:44+0000\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
 "X-Generator: Launchpad (build 16335)\n"
 
 #. module: survey
@@ -47,7 +47,7 @@ msgstr "Validation du texte"
 #. module: survey
 #: view:survey:0
 msgid "Answers:"
-msgstr ""
+msgstr "Réponses :"
 
 #. module: survey
 #: view:survey:0
@@ -58,7 +58,7 @@ msgstr "Invité"
 #. module: survey
 #: model:survey.type,name:survey.survey_type1
 msgid "Human Resources"
-msgstr ""
+msgstr "Ressources humaines"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -353,7 +353,7 @@ msgstr "Date de début du sondage"
 #: code:addons/survey/wizard/survey_answer.py:801
 #, python-format
 msgid "You cannot select the same answer more than one time."
-msgstr ""
+msgstr "Vous ne pouvez pas sélectionner la même réponse plusieurs fois."
 
 #. module: survey
 #: field:survey,color:0
diff --git a/addons/web_analytics/static/src/js/web_analytics.js b/addons/web_analytics/static/src/js/web_analytics.js
index 0de8e9e087b..01c7cc2a7a3 100644
--- a/addons/web_analytics/static/src/js/web_analytics.js
+++ b/addons/web_analytics/static/src/js/web_analytics.js
@@ -14,16 +14,17 @@ openerp.web_analytics = function(instance) {
     (function() {
         var ga   = document.createElement('script');
         ga.type  = 'text/javascript';
-        ga.async = true
+        ga.async = true;
         ga.src   = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0];
         s.parentNode.insertBefore(ga,s);
     })();
 
-    if (instance.webclient) {
 
-        // Set the account and domain to start tracking
-        _gaq.push(['_setAccount', 'UA-7333765-1']);    // vta@openerp.com localhost
+    var init_tracker = function() {
+        // initialize tracker
+        _gaq.push(['_setAccount', 'UA-7333765-1']);
+        //_gaq.push(['_setAccount', 'UA-36797757-1']);     // Debug code
         _gaq.push(['_setDomainName', 'none']);  // Change for the real domain
 
         // Track user types
@@ -43,87 +44,120 @@ openerp.web_analytics = function(instance) {
         _gaq.push(['_setCustomVar', 3, 'View Type', 'default', 3]);
 
         _gaq.push(['_trackPageview']);
+    };
 
-        var self = this;
-        instance.webclient.on('state_pushed', self, function(state) {
-            // Track only pages corresponding to a 'normal' view of OpenERP, views
-            // related to client actions are tracked by the action manager
-            if (state.model && state.view_type) {                
-                // Track object usage 
-                _gaq.push(['_setCustomVar', 2, 'Object', state.model, 3]);
-                // Tack view usage
-                _gaq.push(['_setCustomVar', 3, 'View Type', state.view_type, 3]);
-                // Track the page
-                var url = instance.web_analytics.parseUrl({'model': state.model, 'view_type': state.view_type});
+    var on_state_pushed = function(state) {
+        // Track only pages corresponding to a 'normal' view of OpenERP, views
+        // related to client actions are tracked by the action manager
+        if (state.model && state.view_type) {                
+            // Track object usage 
+            _gaq.push(['_setCustomVar', 2, 'Object', state.model, 3]);
+            // Tack view usage
+            _gaq.push(['_setCustomVar', 3, 'View Type', state.view_type, 3]);
+            // Track the page
+            var url = instance.web_analytics.generateUrl({'model': state.model, 'view_type': state.view_type});
+            _gaq.push(['_trackPageview', url]);
+        }
+    };
+
+    var include_tracker = function() {
+        // include the tracker into views and managers
+
+        // Track the events related with the creation and the  modification of records
+        instance.web.FormView = instance.web.FormView.extend({
+            init: function(parent, dataset, view_id, options) {
+                this._super.apply(this, arguments);
+                var self = this;
+                this.on('record_created', self, function(r) {
+                    var url = instance.web_analytics.generateUrl({'model': this.model, 'view_type': 'form'});
+                    _gaq.push(['_trackEvent', this.model, 'on_button_create_save', url]);
+                });
+                this.on('record_saved', self, function(r) {
+                    var url = instance.web_analytics.generateUrl({'model': this.model, 'view_type': 'form'});
+                    _gaq.push(['_trackEvent', this.model, 'on_button_edit_save', url]);
+                });
+            }
+        });
+
+        // Track client actions
+        instance.web.ActionManager.include({
+            ir_actions_client: function (action, options) {
+                var url = instance.web_analytics.generateUrl({'action': action.tag});
                 _gaq.push(['_trackPageview', url]);
+                return this._super.apply(this, arguments);
+            },
+        });
+
+        // Track button events
+        instance.web.View.include({
+            do_execute_action: function(action_data, dataset, record_id, on_closed) {
+                console.log(action_data);
+                var category = this.model || dataset.model || '';
+                var action;
+                if (action_data.name && _.isNaN(action_data.name-0)) {
+                    action = action_data.name;                
+                } else {
+                    action = action_data.string || action_data.special || '';
+                }
+                var label = instance.web_analytics.generateUrl({'model': category, 'view_type': this.view_type});
+                _gaq.push(['_trackEvent', category, action, label]);
+                return this._super.apply(this, arguments);
+            },
+        });
+
+        // Track error events
+        instance.web.CrashManager.include({
+            show_error: function(error) {
+                var hash = window.location.hash;
+                var params = $.deparam(hash.substr(hash.indexOf('#')+1));
+                var options = {};
+                if (params.model && params.view_type) {
+                    options = {'model': params.model, 'view_type': params.view_type};
+                } else {
+                    options = {'action': params.action};
+                }
+                var label = instance.web_analytics.generateUrl(options);
+                if (error.code) {
+                    _gaq.push(['_trackEvent', error.message, error.data.fault_code, label, ,true]);
+                } else {
+                    _gaq.push(['_trackEvent', error.type, error.data.debug, label, ,true]);
+                }
+                this._super.apply(this, arguments);
+            },
+        });
+    };
+
+
+    if (instance.client instanceof instance.web.WebClient) {        // not for embedded clients
+        init_tracker();
+
+        // Set the account and domain to start tracking
+        instance.client.on('state_pushed', this, on_state_pushed);
+
+        include_tracker();
+    } else if (!instance.client) {
+        // client does not already exists, we are in monodb mode
+
+        instance.web.WebClient.include({
+            init: function() {
+                init_tracker();
+                return this._super.apply(this, arguments);
+            },
+            start: function() {
+                var self = this;
+                return this._super.apply(this, arguments).done(function() {
+                    self.on('state_pushed', self, on_state_pushed);
+                    include_tracker();
+                });
             }
         });
     }
 
-    // Track the events related with the creation and the  modification of records
-    instance.web.FormView = instance.web.FormView.extend({
-        init: function(parent, dataset, view_id, options) {
-            this._super.apply(this, arguments);
-            var self = this;
-            this.on('record_created', self, function(r) {
-                var url = instance.web_analytics.parseUrl({'model': this.model, 'view_type': 'form'});
-                _gaq.push(['_trackEvent', this.model, 'on_button_create_save', url]);
-            });
-            this.on('record_saved', self, function(r) {
-                var url = instance.web_analytics.parseUrl({'model': this.model, 'view_type': 'form'});
-                _gaq.push(['_trackEvent', this.model, 'on_button_edit_save', url]);
-            });
-        }
-    });
+    // ----------------------------------------------------------------
+    // utility functions
+    // ----------------------------------------------------------------
 
-    // Track client actions
-    instance.web.ActionManager.include({
-        ir_actions_client: function (action, options) {
-            var url = instance.web_analytics.parseUrl({'action': action.tag});
-            _gaq.push(['_trackPageview', url]);
-            return this._super.apply(this, arguments);
-        },
-    });
-
-    // Track button events
-    instance.web.View.include({
-        do_execute_action: function(action_data, dataset, record_id, on_closed) {
-            console.log(action_data);
-            var category = this.model || dataset.model || '';
-            var action;
-            if (action_data.name && _.isNaN(action_data.name-0)) {
-                action = action_data.name;                
-            } else {
-                action = action_data.string || action_data.special || '';
-            }
-            var label = instance.web_analytics.parseUrl({'model': category, 'view_type': this.view_type});
-            _gaq.push(['_trackEvent', category, action, label]);
-            return this._super.apply(this, arguments);
-        },
-    });
-
-    // Track error events
-    instance.web.CrashManager = instance.web.CrashManager.extend({
-        show_error: function(error) {
-            var hash = window.location.hash;
-            var params = $.deparam(hash.substr(hash.indexOf('#')+1));
-            var options = {};
-            if (params.model && params.view_type) {
-                options = {'model': params.model, 'view_type': params.view_type};
-            } else {
-                options = {'action': params.action};
-            }
-            var label = instance.web_analytics.parseUrl(options);
-            if (error.code) {
-                _gaq.push(['_trackEvent', error.message, error.data.fault_code, label, ,true]);
-            } else {
-                _gaq.push(['_trackEvent', error.type, error.data.debug, label, ,true]);
-            }
-            this._super.apply(this, arguments);
-        },
-    });
-
-    instance.web_analytics.parseUrl = function(options) {
+    instance.web_analytics.generateUrl = function(options) {
         var url = '';
         _.each(options, function(value, key) {
             url += '/' + key + '=' + value;
@@ -131,4 +165,4 @@ openerp.web_analytics = function(instance) {
         return url;
     };
 
-};
\ No newline at end of file
+};
diff --git a/addons/web_linkedin/i18n/fr.po b/addons/web_linkedin/i18n/fr.po
index 76c9859cde7..823792c9017 100644
--- a/addons/web_linkedin/i18n/fr.po
+++ b/addons/web_linkedin/i18n/fr.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: 2012-12-01 08:28+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 10:54+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-02 04:38+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "here:"
-msgstr ""
+msgstr "ici :"
 
 #. module: web_linkedin
 #: field:sale.config.settings,api_key:0
@@ -44,7 +44,7 @@ msgstr "Ok"
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Log into LinkedIn."
-msgstr ""
+msgstr "Se connecter à LinkedIn."
 
 #. module: web_linkedin
 #. openerp-web
@@ -83,14 +83,14 @@ msgstr "clé API"
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Copy the"
-msgstr ""
+msgstr "Copier le"
 
 #. module: web_linkedin
 #. openerp-web
 #: code:addons/web_linkedin/static/src/js/linkedin.js:181
 #, python-format
 msgid "LinkedIn search"
-msgstr ""
+msgstr "Recherche LinkedIn"
 
 #. module: web_linkedin
 #. openerp-web
@@ -101,6 +101,9 @@ msgid ""
 "            Please ask your administrator to configure it in Settings > "
 "Configuration > Sales > Social Network Integration."
 msgstr ""
+"L'accès à LinkedIn n'a pas été activé sur le serveur.\n"
+"            Veuillez contacter votre administrateur pour le configurer dans "
+"Paramètres -> Configuration -> Ventes -> Intégration des réseaux sociaux"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
@@ -108,30 +111,32 @@ msgid ""
 "To use the LinkedIn module with this database, an API Key is required. "
 "Please follow this procedure:"
 msgstr ""
+"Pour utiliser le module LinkedIn avec cette base de données, une clé API est "
+"requise. Veuillez suivre cette procédure :"
 
 #. module: web_linkedin
 #. openerp-web
 #: code:addons/web_linkedin/static/src/js/linkedin.js:82
 #, python-format
 msgid "LinkedIn is not enabled"
-msgstr ""
+msgstr "LinkedIn n'est pas activé"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Add a new application and fill the form:"
-msgstr ""
+msgstr "Ajoutez une nouvelle application et remplissez le formulaire :"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Go to this URL:"
-msgstr ""
+msgstr "Allez à cette adresse :"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "The programming tool is Javascript"
-msgstr ""
+msgstr "L'outil de programmation est Javascript"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "JavaScript API Domain:"
-msgstr ""
+msgstr "Domaine de l'API Javascript :"
diff --git a/addons/web_linkedin/i18n/pt_BR.po b/addons/web_linkedin/i18n/pt_BR.po
index 8b1b777cfad..0590d90bf60 100644
--- a/addons/web_linkedin/i18n/pt_BR.po
+++ b/addons/web_linkedin/i18n/pt_BR.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-11-30 00:10+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"PO-Revision-Date: 2012-12-04 22:11+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
@@ -101,6 +101,9 @@ msgid ""
 "            Please ask your administrator to configure it in Settings > "
 "Configuration > Sales > Social Network Integration."
 msgstr ""
+"O acesso ao LinkedIn não está habilitado neste servidor.\n"
+"            Solicite ao Administradorque o configure em Configurações > "
+"Configuração > Vendas > Integração com Redes Sociais."
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_shortcuts/i18n/de.po b/addons/web_shortcuts/i18n/de.po
new file mode 100644
index 00000000000..9dd1d63342b
--- /dev/null
+++ b/addons/web_shortcuts/i18n/de.po
@@ -0,0 +1,25 @@
+# German 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-12-04 07:22+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"Language-Team: German <de@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-12-05 05:20+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Hinzufügen/Entfernen Lesezeichen ..."