diff --git a/addons/account/account.py b/addons/account/account.py
index 1d3b9b0dc4d..02cb63ca818 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2715,8 +2715,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
                 obj_acc_tax.write(cr, uid, [key], {
-                    'account_collected_id': acc_template_ref[value['account_collected_id']],
-                    'account_paid_id': acc_template_ref[value['account_paid_id']],
+                    'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
+                    'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
                 })
 
         # Creating Journals Sales and Purchase
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 93d2a6fb00d..9942708d5a3 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -428,7 +428,7 @@ class account_bank_statement_line(osv.osv):
     _columns = {
         'name': fields.char('Communication', size=64, required=True),
         'date': fields.date('Date', required=True),
-        'amount': fields.float('Amount'),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
             ('supplier','Supplier'),
             ('customer','Customer'),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 04cc796a644..51f0d43c350 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -302,7 +302,7 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="7" colspan="4" groups="base.group_user">
+                                <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
@@ -310,6 +310,7 @@
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                                    <button name="%(account_invoices)d" string="Invoices" type="action" icon="gtk-print"/>
                                 </group>
                             </group>
                         </page>
@@ -465,7 +466,7 @@
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
-            <field name="name">Customer Refunds</field>
+            <field name="name">Credit Memo</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -473,7 +474,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
+            <field name="help">Credit Memo helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2987b3c69d6..2d9ac7d6b15 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -429,7 +429,7 @@ class account_move_line(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
         'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
-        'partner_id': fields.many2one('res.partner', 'Partner', select=1),
+        'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
         'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
         'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
                                 store = {
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 2b1a403e461..bf17e607e24 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -18,7 +18,8 @@
             rml="account/report/account_print_invoice.rml"
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
-            attachment_use="1"/>
+            attachment_use="1"
+            multi="True"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0980e5ef6d7..d4a731fb3b7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1170,7 +1170,7 @@
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
+                        <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter
                             icon="terp-dolar_ok!"
@@ -1216,6 +1216,7 @@
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_posted': 1}</field>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
         </record>
@@ -2445,7 +2446,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_extended"/>
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6b151e7a05a..606ec0abb2d 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-27 14:31+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 12:28+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: 2010-11-28 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -99,6 +99,13 @@ msgstr "Überfällige Rechnungen bis heute"
 msgid "Include Reconciled Entries"
 msgstr "Inklusive Ausgeglichener Rechnungen"
 
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
@@ -165,6 +172,13 @@ msgstr "Referenz"
 msgid "Choose Fiscal Year "
 msgstr "Wähle Geschäftsjahr "
 
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
@@ -510,6 +524,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: view:account.entries.report:0
 #: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
 #: view:account.invoice:0
 #: field:account.invoice,journal_id:0
 #: view:account.invoice.report:0
@@ -527,6 +542,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
@@ -542,6 +558,11 @@ msgstr "Bestätige die ausgewählten Rechnungen"
 msgid "Parent target"
 msgstr "Oberkonto"
 
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
 #: help:account.balance.report,chart_account_id:0
@@ -661,6 +682,11 @@ msgstr "Steuern Zuordnung"
 msgid "Centralized Journal"
 msgstr "Zentraljournal"
 
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
@@ -800,11 +826,6 @@ msgstr "Referenz des Partners für diese Rechnung."
 msgid "Unreconciliation"
 msgstr "Storno Ausgleich Offene Posten"
 
-#. module: account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
@@ -951,6 +972,11 @@ msgstr "Konsolidierung"
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
@@ -1017,6 +1043,7 @@ msgstr "Kein Analytisches Journal!"
 
 #. module: account
 #: report:account.partner.balance:0
+#: view:account.partner.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_balance
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
@@ -1090,7 +1117,6 @@ msgstr "GuV (Aufwendungen)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.journal.period.print:0
 #: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1194,12 +1220,6 @@ msgstr "Referenz des Rechnungsdokuments"
 msgid "Others"
 msgstr "Sonstige"
 
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "UnknownError"
-msgstr "UnbekannterFehler"
-
 #. module: account
 #: view:account.account:0
 #: report:account.account.balance:0
@@ -1212,6 +1232,7 @@ msgstr "UnbekannterFehler"
 #: field:account.invoice.line,account_id:0
 #: field:account.invoice.report,account_id:0
 #: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
 #: field:account.model.line,account_id:0
 #: view:account.move.line:0
 #: field:account.move.line,account_id:0
@@ -1246,6 +1267,7 @@ msgstr "Ebene"
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -1338,11 +1360,9 @@ msgid "Account Receivable"
 msgstr "Debitorenkonto"
 
 #. module: account
-#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
-#: field:wizard.multi.charts.accounts,config_logo:0
-msgid "Image"
-msgstr "Bild"
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Zentrales Journal"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1528,6 +1548,12 @@ msgstr "Gehe zu nächstem Partner"
 msgid "Search Bank Statements"
 msgstr "Suche Bankauszug"
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
@@ -1589,14 +1615,6 @@ msgstr "Geschäftsjahr Sequenz"
 msgid "Separated Journal Sequences"
 msgstr "Unterschiedliche Journal Sequenzer"
 
-#. module: account
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
@@ -1683,6 +1701,13 @@ msgstr ""
 msgid "Values"
 msgstr "Werte"
 
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
@@ -1766,6 +1791,11 @@ msgstr "Sie können kein Konto mit vorhandenen Buchungen deaktivieren."
 msgid "Credit amount"
 msgstr "Betrag Haben"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -1781,6 +1811,11 @@ msgstr ""
 msgid "Reserve And Profit/Loss Account"
 msgstr "Vorläufiger Gewinn / Verlust"
 
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
@@ -1788,11 +1823,6 @@ msgstr "Vorläufiger Gewinn / Verlust"
 msgid "Invoices Analysis"
 msgstr "Statistik Rechnungen"
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "A/c No."
-msgstr "Nummer"
-
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
@@ -1834,6 +1864,11 @@ msgstr "Zwischensumme"
 msgid "Treasury Analysis"
 msgstr "Analyse Liquidität"
 
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
@@ -1925,14 +1960,11 @@ msgid "Account Profit And Loss"
 msgstr "GuV Konto"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-msgid "Payable Accounts"
-msgstr "Kreditorenkonten"
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr "Bild"
 
 #. module: account
 #: view:account.account:0
@@ -1955,6 +1987,13 @@ msgstr "Abgebrochen"
 msgid "Untaxed Amount"
 msgstr "Nettobetrag"
 
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: help:account.bank.statement,name:0
 msgid ""
@@ -2031,7 +2070,7 @@ msgstr "Prüfvorgänge"
 #. module: account
 #: model:account.journal,name:account.close_journal
 msgid "End of Year"
-msgstr ""
+msgstr "Jahresende"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2152,7 +2191,6 @@ msgid "Accounting Properties"
 msgstr "Finanzbuchhaltung Eigenschaften"
 
 #. module: account
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2418,6 +2456,17 @@ msgstr ""
 "Die Steuerzuor‏dnung legt Steuern und Konten für diesen Partner, in Form "
 "einer Überleitungstabelle fest."
 
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
@@ -2476,6 +2525,11 @@ msgstr ""
 "Sie können das zugewiesene Unternehmen bei einem Journal nicht ändern, da es "
 "bereits abhängige Daten in vorhandenen Journalen gibt."
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
@@ -2500,7 +2554,10 @@ msgstr "Rabatt (%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Ref"
 msgstr "Referenz"
 
@@ -2511,11 +2568,6 @@ msgstr ""
 "Das Steuerkonto kann entweder einen Steuergrundwert (Netto) oder eine Steuer "
 "repräsentieren."
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
@@ -2579,6 +2631,13 @@ msgstr "Saldo Partner nach Alter"
 msgid "Accounting entries"
 msgstr "Buchungen"
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"given a period and a journal, the sum of debit will always be equal to the "
+"sum of credit, so there is no point to display it"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
@@ -2623,11 +2682,6 @@ msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
 msgid "No sequence defined on the journal !"
 msgstr "Kein Sequenzer für dieses Journal definiert !"
 
-#. module: account
-#: report:account.invoice:0
-msgid "Cancelled Invoice"
-msgstr "Stornierte Rechnung"
-
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/account_bank_statement.py:0
@@ -2728,7 +2782,14 @@ msgstr "Aufwandskonto"
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "Keinen Wert eintragen für das Datum der Rechnung"
+msgstr ""
+"Keinen Wert eintragen, wenn das Datum der Rechnung verwendet werden soll"
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2757,6 +2818,7 @@ msgid "Financial Accounting"
 msgstr "Finanzbuchhaltung"
 
 #. module: account
+#: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
 msgstr "Gewinn und Verlust"
@@ -3045,20 +3107,20 @@ msgstr "Leer lassen um Aufwandskonto zu verwenden"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
-#: report:account.general.ledger:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
 #: field:account.partner.ledger,journal_ids:0
 #: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
 #: field:account.print.journal,journal_ids:0
 #: field:account.report.general.ledger,journal_ids:0
 #: field:account.vat.declaration,journal_ids:0
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.ui.menu,name:account.menu_account_print_journal
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
 msgstr "Buchungsjournale"
@@ -3272,6 +3334,16 @@ msgstr ""
 "Sie können den Kontentyp nicht von '%s' auf '%s' ändern , da bereits "
 "Buchungen für dieses Konto vorhanden sind !"
 
+#. module: account
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Rechnungsdaten"
+
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
@@ -3505,11 +3577,6 @@ msgstr "Anzuwendender Typ (if type=code)"
 msgid "Qty"
 msgstr "Menge"
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Move/Entry label"
-msgstr "Buchungstext"
-
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
@@ -3535,6 +3602,8 @@ msgstr "Kreditorenkonto"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Sie können keine Buchung in verschiedenen Perioden/Journalen durch einen "
+"Buchungssatz erstellen"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3670,11 +3739,6 @@ msgstr ""
 "Drucke Auswertung / Report mit der Spalte Währung für den Fall dass sich die "
 "Währung der Rechnung von der Standardwährung des Unternehmens unterscheidet"
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Entry No"
-msgstr "Buchung Nr."
-
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
@@ -3723,6 +3787,11 @@ msgstr "Anzeige Partner"
 msgid "Validate"
 msgstr "Validieren"
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
 msgid ""
@@ -3787,6 +3856,7 @@ msgstr "Konfiguration"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
 msgstr "30 Tage bis zum Ende des Monats"
 
@@ -3803,6 +3873,13 @@ msgstr "Saldo Analyt. Konto"
 msgid "Net Loss"
 msgstr "Jahresfehlbetrag"
 
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -3830,6 +3907,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: view:account.balance.report:0
 #: model:ir.actions.act_window,name:account.action_account_balance_menu
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
@@ -4028,7 +4106,7 @@ msgstr "Anzeigemodus"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Import von Rechnung oder Zahlungsvorschlag"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4069,14 +4147,10 @@ msgid "Reconcile Writeoff"
 msgstr "Storniere Abschreibung"
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
-msgstr ""
-"Steuergrundlage ist unterschiedlich ! \n"
-"Klicken Sie auf Berechnen um die Steuergrundlage upzudaten."
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Fälligkeitstermin"
 
 #. module: account
 #: view:account.account.template:0
@@ -4164,6 +4238,7 @@ msgstr "Basiert auf"
 
 #. module: account
 #: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
 msgstr "Steuer Inklusive"
 
@@ -4279,9 +4354,9 @@ msgid "Confirmed"
 msgstr "Bestätigt"
 
 #. module: account
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erzeugen!"
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr "Stornierte Rechnung"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -4301,15 +4376,6 @@ msgstr ""
 "Alternativwährung beim Konto \"%s - %s\".Löschen Sie dort den Eintrag der "
 "alternativen Währung, wenn Sie auch alle anderen Währungen buchen wollen."
 
-#. module: account
-#: help:account.payment.term,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the payment "
-"term without removing it."
-msgstr ""
-"Durch Aktivierung dieser Option, kann die Ansicht dieser Zahlungsbedingung "
-"verhindert werden ohne sie zu löschen."
-
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
@@ -4482,6 +4548,7 @@ msgstr "Drittwelt (Land)"
 
 #. module: account
 #: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
 #: code:addons/account/account_move_line.py:0
 #: code:addons/account/report/common_report_header.py:0
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -4698,6 +4765,12 @@ msgstr "Zahlungsbedingungen"
 msgid "Column Name"
 msgstr "Spalte Bezeichnung"
 
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,year:0
 #: view:account.invoice.report:0
@@ -4746,11 +4819,6 @@ msgstr "Journal Buchung \"%s\" ist ungültig"
 msgid "Description on invoices"
 msgstr "Text auf Rechnung"
 
-#. module: account
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
@@ -4765,9 +4833,10 @@ msgstr "Steuerkonto"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation result"
-msgstr "Abstimmung Ergebnis"
+msgstr "Ergebnis Kontoabstimmung"
 
 #. module: account
+#: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
 msgid "Balance Sheet"
@@ -4866,6 +4935,12 @@ msgstr ""
 msgid "Tax on Children"
 msgstr "Steuer auf untergeordnete Datensätze"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/wizard/account_use_model.py:0
@@ -4951,11 +5026,9 @@ msgid "Bank Journal "
 msgstr "Bank Journal "
 
 #. module: account
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
 
 #. module: account
 #: view:account.journal:0
@@ -5261,9 +5334,9 @@ msgid "Valid Up to"
 msgstr "Gültig bis zu"
 
 #. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
-msgstr "Rechnungsdaten"
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5507,15 +5580,6 @@ msgstr ""
 "Buchungen sind nicht identisch mit den bisherigen Konten oder sie sind "
 "bereits ausgeglichen! "
 
-#. module: account
-#: help:account.tax,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the tax "
-"without removing it."
-msgstr ""
-"Wenn dieses Feld aktiviert ist , kann eine definierte Steuer ausgeblendet "
-"werden, ohne diese vollständig zu entfernen."
-
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
@@ -5736,6 +5800,11 @@ msgstr "Erstelle ein Konto auf Basis der Vorlage"
 msgid "Reporting Configuration"
 msgstr "Konfiguration Auswertungen"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
@@ -6065,15 +6134,6 @@ msgstr "Lieferanten Gutschrift"
 msgid "Dashboard"
 msgstr "Pinnwand"
 
-#. module: account
-#: help:account.journal.period,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the journal "
-"period without removing it."
-msgstr ""
-"Durch Aktivierung dieser Option, kann die Anzeige dieses Journals verhindert "
-"werden ohne das Journal zu löschen."
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -6123,8 +6183,6 @@ msgstr "Mengeneinheit"
 
 #. module: account
 #: constraint:account.payment.term.line:0
-#: code:addons/account/account.py:0
-#, python-format
 msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
@@ -6179,11 +6237,6 @@ msgstr "Barzahlungen"
 msgid "Invoice is already reconciled"
 msgstr "Die Rechnung ist bereits ausgeglichen"
 
-#. module: account
-#: view:board.board:0
-msgid "Aged receivables"
-msgstr "Überfällige Debitoren"
-
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
@@ -6318,11 +6371,18 @@ msgstr "Ihre Bank und Kasse Konten"
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #: code:addons/account/wizard/account_use_model.py:0
-#: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "Error !"
 msgstr "Fehler !"
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
+msgstr ""
+
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -6382,9 +6442,12 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Kontoauszug mit einem Partner pro Seite"
 
 #. module: account
-#: view:account.state.open:0
-msgid "Yes"
-msgstr "Ja"
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:0
@@ -6415,6 +6478,12 @@ msgstr "Ausgewählte Buchungen haben keine Buchungen im Status Entwurf"
 msgid "All Entries"
 msgstr "Alle erstellten Buchungen"
 
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
@@ -6438,6 +6507,7 @@ msgstr "Steuern Zuordnung"
 
 #. module: account
 #: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
 #: model:ir.ui.menu,name:account.menu_general_ledger
@@ -6449,6 +6519,15 @@ msgstr "Umsätze nach Konten und Perioden"
 msgid "The payment order is sent to the bank."
 msgstr "Der Zahlungsauftrag wurde an Bank versendet."
 
+#. module: account
+#: view:account.balance.report:0
+#: view:account.bs.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
 #. module: account
 #: help:account.move,to_check:0
 msgid ""
@@ -6731,12 +6810,6 @@ msgstr "Möchten Sie die Anzeige der Journalbuchungen wirklich öffnen?"
 msgid "Are you sure you want to open this invoice ?"
 msgstr "Sind Sie sicher, daß Sie diese Rechnung öffnen wollen?"
 
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_central_journal
-#: model:ir.ui.menu,name:account.menu_account_central_journal
-msgid "Central Journals"
-msgstr "Erstelle  Journale"
-
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
@@ -7042,15 +7115,14 @@ msgstr ""
 "Sie können keine zwei offenen Kassenbücher in einem einzigen Journal "
 "verwalten."
 
-#. module: account
-#: code:addons/account/account_cash_statement.py:0
-#, python-format
-msgid "You cannot create a bank or cash register without a journal!"
-msgstr ""
-
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
+msgstr "  Tag des Monats= -1"
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: account
@@ -7163,11 +7235,6 @@ msgstr "Keine Stückzahl!"
 msgid "Expenses Journal - (test)"
 msgstr "Aufwendungen Journal - (test)"
 
-#. module: account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
-
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
@@ -7211,6 +7278,16 @@ msgstr "Storno ausgewählter Rechnungen"
 msgid "May"
 msgstr "Mai"
 
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr "Kreditorenkonten"
+
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
@@ -7277,12 +7354,18 @@ msgstr "Auswertung Bilanz"
 
 #. module: account
 #: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
 "Aktivieren, wenn der Preis bei Produkt und Rechnung die Steuer beinhaltet"
 
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Ja"
+
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
@@ -7358,9 +7441,11 @@ msgid "CashBox Line"
 msgstr "Barkasse Buchungen"
 
 #. module: account
+#: view:account.partner.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
 msgstr "Partner Kontoauszug"
@@ -7433,11 +7518,6 @@ msgstr ""
 msgid "Partner"
 msgstr "Partner"
 
-#. module: account
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fehler! Sie können keine rekursiven Konten definieren."
-
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
@@ -7529,6 +7609,11 @@ msgstr "Rechnung '%s' wurde bezahlt."
 msgid "Automatic entry"
 msgstr "Automatische Buchung"
 
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
@@ -7623,11 +7708,6 @@ msgstr "Rechnungsstatus ist Offen"
 msgid "Cost Ledger"
 msgstr "Auszug Aufwandsbuchungen"
 
-#. module: account
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
@@ -7902,10 +7982,7 @@ msgstr "Journal Gutschriften"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Filter By"
 msgstr "Filter nach"
 
@@ -7985,6 +8062,8 @@ msgstr "Lieferanten"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Sie können nicht mehr als eine Buchung pro Periode und Konto bei Anwendung "
+"eines zentralen Gegenkontos erstellen."
 
 #. module: account
 #: view:account.journal:0
@@ -8540,11 +8619,6 @@ msgstr ""
 msgid "Best regards."
 msgstr "Viele Grüsse."
 
-#. module: account
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
@@ -8567,6 +8641,11 @@ msgstr ""
 msgid "Document: Customer account statement"
 msgstr "Dokument: Kundenkontoauszug"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
@@ -8613,7 +8692,6 @@ msgstr "Leer lassen um das Erlöskonto zu nutzen"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
-#: report:account.journal.period.print:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8632,7 +8710,6 @@ msgstr "Händisch oder automatisch im System erfasst."
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger:0
 msgid "Display Account"
 msgstr "Anzeige Konten"
 
@@ -8733,7 +8810,10 @@ msgid "Receiver's Signature"
 msgstr "Empfänger Unterschrift"
 
 #. module: account
+#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filter nch"
 
@@ -8745,6 +8825,7 @@ msgstr "Händische Buchung"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
@@ -8774,11 +8855,6 @@ msgstr ""
 "Erzeugt ein Konto auf Basis der ausgewählten Vorlage unterhalb des "
 "existierenden Basiskontos."
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Der Name des Moduls muss eindeutig sein."
-
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
@@ -8899,10 +8975,14 @@ msgid "Account Subscription"
 msgstr "Konto Automatische Buchung"
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+"Steuergrundlage ist unterschiedlich ! \n"
+"Klicken Sie auf Berechnen um die Steuergrundlage upzudaten."
 
 #. module: account
 #: view:account.subscription:0
@@ -8999,15 +9079,6 @@ msgstr "Abrechnen von Analyt. Buchungen"
 msgid "Suppliers Payment Management"
 msgstr "Zahlungsvorschläge für Lieferantenrechnungen"
 
-#. module: account
-#: help:account.analytic.journal,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the analytic "
-"journal without removing it."
-msgstr ""
-"Durch Aktivierung dieser Option, kann die Ansicht dieser analytischen "
-"Journale verhindert werden ohne diese komplett zu löschen."
-
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
@@ -9027,6 +9098,12 @@ msgstr "Kurz/Datum"
 msgid "Active"
 msgstr "Aktiv"
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -9109,7 +9186,7 @@ msgid "Through :"
 msgstr "Durch:"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_general_journal
+#: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
 msgstr "Journalübersicht"
@@ -9272,6 +9349,13 @@ msgstr "Zeitraum"
 msgid "Remove Lines"
 msgstr "Entferne Buchung"
 
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
@@ -9355,6 +9439,7 @@ msgstr "Ende Datum"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
 msgstr "Abbrechen Buchen Jahreseröffnung"
 
@@ -9394,11 +9479,7 @@ msgstr ""
 "Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-msgid "Partner Other Ledger"
-msgstr "Kontoauszug Partner"
-
-#. module: account
+#: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JNRL"
@@ -9431,15 +9512,6 @@ msgstr "Status"
 msgid "Total"
 msgstr "Bruttobetrag"
 
-#. module: account
-#: help:account.account,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the account "
-"without removing it."
-msgstr ""
-"Wenn diese Option aktiviert wird, kann das Konto derart zur Weiterverwendung "
-"von Prezi genutzt werden."
-
 #. module: account
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
@@ -9638,6 +9710,11 @@ msgstr ""
 "Dieses Konto wird gebucht bei Rechnungspositionen zu Produkten aus der "
 "aktuellen Produktkategorie"
 
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
@@ -9832,6 +9909,7 @@ msgstr "Anzahl der Perioden"
 
 #. module: account
 #: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr "Journal Sachkonten"
 
@@ -9906,11 +9984,6 @@ msgstr "Suche nach Kontenplan Vorlage"
 msgid "Manual Invoice Taxes"
 msgstr "Manuelle Berechnung Steuer"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_low_level
-msgid "Low Level"
-msgstr "Basiskonfiguration"
-
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9934,6 +10007,7 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
 #: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
 #: field:account.partner.ledger,result_selection:0
@@ -9949,10 +10023,15 @@ msgstr "Partner"
 msgid "Fiscal Years"
 msgstr "Geschäftsjahr"
 
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.analytic.line,ref:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -10351,6 +10430,9 @@ msgstr ""
 #~ msgid "To Be Verified"
 #~ msgstr "Zu validieren"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "          Start date"
 #~ msgstr "          Start Datum"
 
@@ -10566,9 +10648,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Zahle Rechnung / OP Ausgleich"
 
-#~ msgid "Central Journal"
-#~ msgstr "Zentrales Journal"
-
 #~ msgid "Balance brought forward"
 #~ msgstr "Saldenliste anzeigen"
 
@@ -10697,6 +10776,12 @@ msgstr ""
 #~ "Analytische Kosten für die Weiterberechnung von Ausgaben, "
 #~ "Zeitaufzeichnungen, ..."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Name of the fiscal year as displayed in reports."
 #~ msgstr "Bezeichnung des Wirtschaftsjahres für Auswertungen."
 
@@ -10823,6 +10908,9 @@ msgstr ""
 #~ msgid "Date payment"
 #~ msgstr "Zahlungsdaten"
 
+#~ msgid "A/c No."
+#~ msgstr "Nummer"
+
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Summen und Salden nach Journal (Akt. Monat)"
 
@@ -11172,6 +11260,9 @@ msgstr ""
 #~ "errechnete Steuer. Wenn im Steuerkonto ein Steuermessebetrag angezeigt wird "
 #~ "beinhaltet das Feld den Steuermesswert auf den die Steuer berechnet wird."
 
+#~ msgid "Partner Other Ledger"
+#~ msgstr "Kontoauszug Partner"
+
 #~ msgid "Overdue Payment Report Message"
 #~ msgstr "Text Zahlungserinnerung"
 
@@ -11403,3 +11494,86 @@ msgstr ""
 
 #~ msgid "Fiscal Mappings"
 #~ msgstr "Steuer Umschlüsselung"
+
+#, python-format
+#~ msgid "UnknownError"
+#~ msgstr "UnbekannterFehler"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die ID für das Zertifikat des Moduls sollte eindeutig sein !"
+
+#~ msgid "Move/Entry label"
+#~ msgstr "Buchungstext"
+
+#~ msgid "Entry No"
+#~ msgstr "Buchung Nr."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen!"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the payment "
+#~ "term without removing it."
+#~ msgstr ""
+#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser Zahlungsbedingung "
+#~ "verhindert werden ohne sie zu löschen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the tax "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn dieses Feld aktiviert ist , kann eine definierte Steuer ausgeblendet "
+#~ "werden, ohne diese vollständig zu entfernen."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the journal "
+#~ "period without removing it."
+#~ msgstr ""
+#~ "Durch Aktivierung dieser Option, kann die Anzeige dieses Journals verhindert "
+#~ "werden ohne das Journal zu löschen."
+
+#~ msgid "Central Journals"
+#~ msgstr "Erstelle  Journale"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Grösse des Feldes darf nie kleiner als 1 sein !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Der Name des Moduls muss eindeutig sein."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the analytic "
+#~ "journal without removing it."
+#~ msgstr ""
+#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser analytischen "
+#~ "Journale verhindert werden ohne diese komplett zu löschen."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the account "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn diese Option aktiviert wird, kann das Konto derart zur Weiterverwendung "
+#~ "von Prezi genutzt werden."
+
+#~ msgid "Low Level"
+#~ msgstr "Basiskonfiguration"
+
+#~ msgid "Aged receivables"
+#~ msgstr "Überfällige Debitoren"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 1618ebf1d30..f986c21b451 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.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: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-29 07:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 17:47+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -52,7 +52,7 @@ msgstr "Συμψηφηστική εγγραφή Ημερολογίου"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Διαχείριση παραστατικών"
 
 #. module: account
 #: view:account.account:0
@@ -99,6 +99,13 @@ msgstr "Παλαιωμένα εισπρακτέα μέχρι σήμερα"
 msgid "Include Reconciled Entries"
 msgstr "Να συμπεριληφθούν Συμφωνημένες Εγγραφές"
 
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
@@ -162,6 +169,13 @@ msgstr "Παραπομπή"
 msgid "Choose Fiscal Year "
 msgstr "Επιλογή Οικονομικού Έτους "
 
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
@@ -290,7 +304,7 @@ msgstr "Κλείσιμο Οικονομικού Έτους"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Επιτρέψτε διαγραφή"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -396,7 +410,7 @@ msgstr "Επιστροφή Αγοράς"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Άνοιγμα / Κλείσιμο Κατάστασης"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -481,6 +495,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: view:account.entries.report:0
 #: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
 #: view:account.invoice:0
 #: field:account.invoice,journal_id:0
 #: view:account.invoice.report:0
@@ -498,6 +513,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
@@ -513,6 +529,11 @@ msgstr "Επιβεβαίωση των επιλεγμένων τιμολογίω
 msgid "Parent target"
 msgstr "Γονικός Στόχος"
 
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
 #: help:account.balance.report,chart_account_id:0
@@ -631,6 +652,11 @@ msgstr "Χαρτογράφηση Φόρων"
 msgid "Centralized Journal"
 msgstr "Συγκεντρωτικό Ημερολόγιο"
 
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
@@ -769,11 +795,6 @@ msgstr "Παραπομπή συνεργατη για το τιμολόγιο"
 msgid "Unreconciliation"
 msgstr "Ακύρωση Συμφωνίας"
 
-#. module: account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
@@ -914,6 +935,11 @@ msgstr "Ενοποίηση"
 msgid "Extended Filters..."
 msgstr "Εκτεταμένα Φίλτρα..."
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
@@ -976,6 +1002,7 @@ msgstr "Δεν ορίστηκε Αναλυτικό Ημερολόγιο!"
 
 #. module: account
 #: report:account.partner.balance:0
+#: view:account.partner.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_balance
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
@@ -1046,7 +1073,6 @@ msgstr "Κέρδη & Ζημίες(Λογαριασμοί Εξόδων)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.journal.period.print:0
 #: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1149,12 +1175,6 @@ msgstr "Παραπομπή στο έγγραφο που δημιούργησε 
 msgid "Others"
 msgstr "Άλλα"
 
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "UnknownError"
-msgstr "Άγνωστο Λάθος"
-
 #. module: account
 #: view:account.account:0
 #: report:account.account.balance:0
@@ -1167,6 +1187,7 @@ msgstr "Άγνωστο Λάθος"
 #: field:account.invoice.line,account_id:0
 #: field:account.invoice.report,account_id:0
 #: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
 #: field:account.model.line,account_id:0
 #: view:account.move.line:0
 #: field:account.move.line,account_id:0
@@ -1201,6 +1222,7 @@ msgstr "Επίπεδο"
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -1293,11 +1315,9 @@ msgid "Account Receivable"
 msgstr "Λογαριασμός Εισπρακτέος"
 
 #. module: account
-#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
-#: field:wizard.multi.charts.accounts,config_logo:0
-msgid "Image"
-msgstr "Εικόνα"
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Κεντρικό Ημερολόγιο"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1436,7 +1456,7 @@ msgstr "Πρότυπο για Φορολογική Θέση"
 #. module: account
 #: model:account.tax.code,name:account.account_tax_code_0
 msgid "Tax Code Test"
-msgstr ""
+msgstr "Τεστ Φορολογικού Κώδικα"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1472,11 +1492,17 @@ msgstr "Αφορολόγητο"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Πήγαινετε στον επόμενο έταιρο"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
+msgstr "Αναζήτηση στην κατάσταση κινήσεων Λογαριασμού Τραπέζης"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
 
 #. module: account
@@ -1528,7 +1554,7 @@ msgstr "Παραστατικό"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Αναλυτικό κόστος προς τιμολόγιση"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1540,13 +1566,6 @@ msgstr ""
 msgid "Separated Journal Sequences"
 msgstr "Διαχωρισμένες Ιεραρχήσεις Ημερολογίου"
 
-#. module: account
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
@@ -1595,7 +1614,7 @@ msgstr "Άθροισμα Έτους"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Εκτύπωση παραστατικού"
 
 #. module: account
 #: view:account.change.currency:0
@@ -1626,6 +1645,13 @@ msgstr ""
 msgid "Values"
 msgstr "Τιμές"
 
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
@@ -1655,7 +1681,7 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Όλοι οι έταιροι"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -1696,19 +1722,24 @@ msgstr "Πρόχειρη κίνηση"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Φορολογική Δήλωση:Πιστωτικά Σημειώματα"
 
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr ""
+msgstr "Δεν μπορείτε να απενεργοποιήσετε έναν λογαριασμό που έχει κινηθεί"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
 msgstr "Ποσό πίστωσης"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -1722,6 +1753,11 @@ msgstr ""
 msgid "Reserve And Profit/Loss Account"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
@@ -1729,11 +1765,6 @@ msgstr ""
 msgid "Invoices Analysis"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "A/c No."
-msgstr "Αρ. Λογ."
-
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
@@ -1758,23 +1789,28 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Εγγραφή Ημερολογίου"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Φορολογική Δήλωση :Τιμολόγια"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "Υποσύνολο"
 
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
 msgstr ""
 
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Σφάλμα! Υπάρχει εταιρεία με την ίδια περιγραφή"
+
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
@@ -1796,12 +1832,12 @@ msgstr "Έγκυρο"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Εκτύπωση Ημερολογίου Λογαριασμού"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Κατηγορία Προϊόντος"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1822,7 +1858,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Σύγκριση μεταξύ λογιστικών εγγραφών και εγγραφών πληρωμής"
 
 #. module: account
 #: view:account.tax:0
@@ -1861,14 +1897,11 @@ msgid "Account Profit And Loss"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-msgid "Payable Accounts"
-msgstr "Λογαριασμοί Πληρωτέοι"
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr "Εικόνα"
 
 #. module: account
 #: view:account.account:0
@@ -1883,7 +1916,7 @@ msgstr "Λογαριασμοί Εισπρακτέοι"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Ακυρώθηκε"
 
 #. module: account
 #: view:account.invoice:0
@@ -1891,6 +1924,13 @@ msgstr ""
 msgid "Untaxed Amount"
 msgstr "Αφορολόγητο Ποσό"
 
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: help:account.bank.statement,name:0
 msgid ""
@@ -1932,7 +1972,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Λογαριασμοί για Εκκαθάριση"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -1942,7 +1982,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Εισαγωγή από τιμολόγιο"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1951,22 +1991,22 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Ιανουάριος"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Επικυρώσεις"
 
 #. module: account
 #: model:account.journal,name:account.close_journal
 msgid "End of Year"
-msgstr ""
+msgstr "Τέλος του Έτους"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Αυτό το  ΟΙΚ.Έτος"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -1994,7 +2034,7 @@ msgstr "Pro-forma"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Ημερολόγιο"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -2072,7 +2112,6 @@ msgid "Accounting Properties"
 msgstr "Λογιστικά Χαρακτηριστικά"
 
 #. module: account
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2081,17 +2120,17 @@ msgstr "Εγγραφές Ταξινομημένες Ανά"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Αλλαγή σε"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "# από Προίόντα Ποσ "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Πρότυπο Προϊόντος"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2266,7 +2305,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Ημέρα"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
@@ -2313,7 +2352,7 @@ msgstr "Επιλέξτε περίοδο"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Καταστάσεις Αποτελεσμάτων"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2327,6 +2366,17 @@ msgid ""
 "partner."
 msgstr ""
 
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Σφάλμα! Υπάρχει κατηγορία με την ίδια περιγραφή."
+
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
@@ -2355,7 +2405,7 @@ msgstr "Λογαριασμός Αναλυτικής"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Λογαριασμοί"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -2367,7 +2417,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Μέση Τιμή"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -2383,6 +2433,11 @@ msgid ""
 "Entry Lines"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr "Ετικέτα"
+
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
@@ -2407,7 +2462,10 @@ msgstr "Εκπτ.(%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Ref"
 msgstr "Παραπομπή"
 
@@ -2416,11 +2474,6 @@ msgstr "Παραπομπή"
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
@@ -2455,7 +2508,7 @@ msgstr "Αληθές"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Dates"
-msgstr ""
+msgstr "Ημερομηνίες"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2481,6 +2534,13 @@ msgstr "Ενηλικιωμένο ισοζύγιο Συνεργάτη"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
+msgstr "Λογιστικές Εγγραφές"
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"given a period and a journal, the sum of debit will always be equal to the "
+"sum of credit, so there is no point to display it"
 msgstr ""
 
 #. module: account
@@ -2522,11 +2582,6 @@ msgstr ""
 msgid "No sequence defined on the journal !"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Cancelled Invoice"
-msgstr ""
-
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/account_bank_statement.py:0
@@ -2608,7 +2663,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Γραμμή 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2628,6 +2683,12 @@ msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
 "Αφήστε το κενό για να χρησιμοποιήσετε την περίοδο της ημερομηνίας επικύρωσης."
 
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -2652,6 +2713,7 @@ msgid "Financial Accounting"
 msgstr "Οικονομική Λογιστική"
 
 #. module: account
+#: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
 msgstr ""
@@ -2923,20 +2985,20 @@ msgstr "Διατηρήστε κενό για να χρησιμοποιήσετε
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
-#: report:account.general.ledger:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
 #: field:account.partner.ledger,journal_ids:0
 #: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
 #: field:account.print.journal,journal_ids:0
 #: field:account.report.general.ledger,journal_ids:0
 #: field:account.vat.declaration,journal_ids:0
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.ui.menu,name:account.menu_account_print_journal
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
 msgstr "Ημερολόγια"
@@ -3143,6 +3205,16 @@ msgid ""
 "account entries!"
 msgstr ""
 
+#. module: account
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
@@ -3368,11 +3440,6 @@ msgstr "Applicable Code (if type=code)"
 msgid "Qty"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Move/Entry label"
-msgstr ""
-
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
@@ -3526,11 +3593,6 @@ msgid ""
 "company currency"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Entry No"
-msgstr ""
-
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
@@ -3579,6 +3641,11 @@ msgstr ""
 msgid "Validate"
 msgstr "Επικύρωση"
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
 msgid ""
@@ -3638,6 +3705,7 @@ msgstr "Ρυθμίσεις"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
 msgstr "30 Ημέρες Τέλος Μήνα"
 
@@ -3654,6 +3722,13 @@ msgstr "Αναλυτικό Ισοζύγιο"
 msgid "Net Loss"
 msgstr ""
 
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -3680,6 +3755,7 @@ msgstr "Δεν έωουν οριστεί Γραμμές Υπολογισμού 
 
 #. module: account
 #: report:account.account.balance:0
+#: view:account.balance.report:0
 #: model:ir.actions.act_window,name:account.action_account_balance_menu
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
@@ -3904,12 +3980,10 @@ msgid "Reconcile Writeoff"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
-msgstr ""
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Ημερ/νία Λήξης"
 
 #. module: account
 #: view:account.account.template:0
@@ -3993,6 +4067,7 @@ msgstr ""
 
 #. module: account
 #: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
 msgstr "Ο Φόρος Περιέχεται στην Τιμή"
 
@@ -4108,8 +4183,8 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: account
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
@@ -4127,13 +4202,6 @@ msgid ""
 "definition if you want to accept all currencies."
 msgstr ""
 
-#. module: account
-#: help:account.payment.term,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the payment "
-"term without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
@@ -4304,6 +4372,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
 #: code:addons/account/account_move_line.py:0
 #: code:addons/account/report/common_report_header.py:0
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -4504,6 +4573,12 @@ msgstr "Όροι Πληρωμής"
 msgid "Column Name"
 msgstr "Όνομα Στήλης"
 
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,year:0
 #: view:account.invoice.report:0
@@ -4552,11 +4627,6 @@ msgstr ""
 msgid "Description on invoices"
 msgstr "Περιγραφή των τιμολογίων"
 
-#. module: account
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
@@ -4574,6 +4644,7 @@ msgid "Reconciliation result"
 msgstr "Αποτελέσματα Εκκαθάρισης"
 
 #. module: account
+#: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
 msgid "Balance Sheet"
@@ -4670,6 +4741,12 @@ msgstr ""
 msgid "Tax on Children"
 msgstr "Φόροι σε Υποκατηγορίες"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/wizard/account_use_model.py:0
@@ -4753,8 +4830,8 @@ msgid "Bank Journal "
 msgstr "Ημερολόγιο Τράπεζας "
 
 #. module: account
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
 
 #. module: account
@@ -5044,8 +5121,8 @@ msgid "Valid Up to"
 msgstr ""
 
 #. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
+#: view:board.board:0
+msgid "Aged Receivables"
 msgstr ""
 
 #. module: account
@@ -5272,13 +5349,6 @@ msgstr "Αδύνατη η χρήση ανενεργού λογαριασμού"
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Οι εγγραφές δεν είναι του ίδιου λογαριασμού ή έχουν ήδη συμφωνηθεί! "
 
-#. module: account
-#: help:account.tax,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the tax "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
@@ -5486,6 +5556,11 @@ msgstr ""
 msgid "Reporting Configuration"
 msgstr ""
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
@@ -5801,13 +5876,6 @@ msgstr "Επιστροφή Χρημάτων από Προμηθευτή"
 msgid "Dashboard"
 msgstr ""
 
-#. module: account
-#: help:account.journal.period,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the journal "
-"period without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -5857,8 +5925,6 @@ msgstr "Μονάδα Μέτρησης"
 
 #. module: account
 #: constraint:account.payment.term.line:0
-#: code:addons/account/account.py:0
-#, python-format
 msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
@@ -5911,11 +5977,6 @@ msgstr ""
 msgid "Invoice is already reconciled"
 msgstr "Το τιμολόγιο είναι ήδη συμφωνημένο"
 
-#. module: account
-#: view:board.board:0
-msgid "Aged receivables"
-msgstr "Παλαιωμένα εισπρακτέα"
-
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
@@ -6043,11 +6104,18 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #: code:addons/account/wizard/account_use_model.py:0
-#: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα !"
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
+msgstr ""
+
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -6101,9 +6169,12 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: view:account.state.open:0
-msgid "Yes"
-msgstr "Ναι"
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:0
@@ -6134,6 +6205,12 @@ msgstr ""
 msgid "All Entries"
 msgstr "Όλες οι Εγγραφές"
 
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
@@ -6157,6 +6234,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
 #: model:ir.ui.menu,name:account.menu_general_ledger
@@ -6168,6 +6246,15 @@ msgstr "Γενικό Καθολικό"
 msgid "The payment order is sent to the bank."
 msgstr ""
 
+#. module: account
+#: view:account.balance.report:0
+#: view:account.bs.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
 #. module: account
 #: help:account.move,to_check:0
 msgid ""
@@ -6407,12 +6494,6 @@ msgstr ""
 msgid "Are you sure you want to open this invoice ?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε αυτό το τιμολόγιο;"
 
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_central_journal
-#: model:ir.ui.menu,name:account.menu_account_central_journal
-msgid "Central Journals"
-msgstr ""
-
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
@@ -6679,14 +6760,13 @@ msgid "You can not have two open register for the same journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:0
-#, python-format
-msgid "You cannot create a bank or cash register without a journal!"
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month= -1"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: account
@@ -6787,11 +6867,6 @@ msgstr ""
 msgid "Expenses Journal - (test)"
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
@@ -6835,6 +6910,16 @@ msgstr ""
 msgid "May"
 msgstr ""
 
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr "Λογαριασμοί Πληρωτέοι"
+
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
@@ -6901,11 +6986,17 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr "Επιλέξτε το αν η τιμή τιμολόγησης προϊόντος περιέχει αυτό το φόρο."
 
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Ναι"
+
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
@@ -6980,9 +7071,11 @@ msgid "CashBox Line"
 msgstr ""
 
 #. module: account
+#: view:account.partner.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
 msgstr "Βιβλίο Συνεργατών"
@@ -7055,12 +7148,6 @@ msgstr ""
 msgid "Partner"
 msgstr "Συνεργάτης"
 
-#. module: account
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-"Σφάλμα! Δεν μπορείτε να δημιουργήσετε ανάδρομους αναλυτικούς λογαριασμούς."
-
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
@@ -7144,6 +7231,11 @@ msgstr ""
 msgid "Automatic entry"
 msgstr ""
 
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
@@ -7235,11 +7327,6 @@ msgstr ""
 msgid "Cost Ledger"
 msgstr "Βιβλίο Κόστους"
 
-#. module: account
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
@@ -7500,10 +7587,7 @@ msgstr "Ημερολόγιο Επιστροφών"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Filter By"
 msgstr ""
 
@@ -8084,11 +8168,6 @@ msgstr ""
 msgid "Best regards."
 msgstr "Με εκτίμηση"
 
-#. module: account
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
@@ -8107,6 +8186,11 @@ msgstr ""
 msgid "Document: Customer account statement"
 msgstr "Έγγραφο: Λογιστική κατάσταση πελάτη"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
@@ -8153,7 +8237,6 @@ msgstr "Διατηρήστε το κενό για να χρησιμοποιηθ
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
-#: report:account.journal.period.print:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8172,7 +8255,6 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger:0
 msgid "Display Account"
 msgstr ""
 
@@ -8262,7 +8344,10 @@ msgid "Receiver's Signature"
 msgstr ""
 
 #. module: account
+#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
 
@@ -8274,6 +8359,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
@@ -8303,11 +8389,6 @@ msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
@@ -8426,10 +8507,12 @@ msgid "Account Subscription"
 msgstr "Προεγγραφή λογαριασμού"
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Ημερ/νία Λήξης"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
@@ -8517,13 +8600,6 @@ msgstr ""
 msgid "Suppliers Payment Management"
 msgstr ""
 
-#. module: account
-#: help:account.analytic.journal,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the analytic "
-"journal without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
@@ -8543,6 +8619,12 @@ msgstr "Κωδικός/ Ημερομ."
 msgid "Active"
 msgstr "Ενεργό"
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -8616,7 +8698,7 @@ msgid "Through :"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_general_journal
+#: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
 msgstr ""
@@ -8771,6 +8853,13 @@ msgstr "Λογιστική περίοδος"
 msgid "Remove Lines"
 msgstr "Αφαίρεση Γραμμών"
 
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
@@ -8854,6 +8943,7 @@ msgstr "Ημερομηνία Λήξης"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
 msgstr "Ακύρωση Εγγραφών Ανοίγματος"
 
@@ -8892,11 +8982,7 @@ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-msgid "Partner Other Ledger"
-msgstr "Άλλο καθολικό συνεργάτη"
-
-#. module: account
+#: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JNRL"
@@ -8929,13 +9015,6 @@ msgstr "Καταστάσεις"
 msgid "Total"
 msgstr "Σύνολο"
 
-#. module: account
-#: help:account.account,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the account "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
@@ -9127,6 +9206,11 @@ msgid ""
 "product category"
 msgstr ""
 
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
@@ -9320,6 +9404,7 @@ msgstr "Αριθμός Περιόδων"
 
 #. module: account
 #: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr "Γενικό Ημερολόγιο"
 
@@ -9393,11 +9478,6 @@ msgstr ""
 msgid "Manual Invoice Taxes"
 msgstr "Μη Αυτόματοι Φόροι Τιμολόγησης"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_low_level
-msgid "Low Level"
-msgstr ""
-
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9421,6 +9501,7 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
 #: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
 #: field:account.partner.ledger,result_selection:0
@@ -9436,10 +9517,15 @@ msgstr ""
 msgid "Fiscal Years"
 msgstr "Λογιστικές Χρήσεις"
 
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.analytic.line,ref:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Παρ."
 
@@ -9751,6 +9837,9 @@ msgstr ""
 #~ msgid "          Start date"
 #~ msgstr "          Ημερομηνία έναρξης"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
+
 #~ msgid "Analytic Journal Report"
 #~ msgstr "Αναφορά Αναλυτικού Ημερολογίου"
 
@@ -10272,9 +10361,6 @@ msgstr ""
 #~ msgid "Pay and reconcile"
 #~ msgstr "Πληρωμή και συμφωνία"
 
-#~ msgid "Central Journal"
-#~ msgstr "Κεντρικό Ημερολόγιο"
-
 #~ msgid "Balance brought forward"
 #~ msgstr "Υπόλοιπο από μεταφορά"
 
@@ -10370,6 +10456,11 @@ msgstr ""
 #~ msgid "Search Entries"
 #~ msgstr "Αναζήτηση Εγγραφών"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
+
 #~ msgid ""
 #~ "This field is used for payable and receivable entries. You can put the limit "
 #~ "date for the payment of this entry line."
@@ -10546,6 +10637,9 @@ msgstr ""
 #~ msgid "General Credit"
 #~ msgstr "Γενική Πίστωση"
 
+#~ msgid "A/c No."
+#~ msgstr "Αρ. Λογ."
+
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Κόστος και έσοδα λογαριασμού ανά ημερολόγιο (Τρέχων Μήνας)"
 
@@ -10687,6 +10781,9 @@ msgstr ""
 #~ "πωληθέντων προϊόντων. Η ποσότητα δεν είναι υποχρεωτική από το νόμο, αλλά "
 #~ "είναι πολύ χρήσιη για κάποιες αναφορές."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+
 #~ msgid "Specify The Message for the Overdue Payment Report."
 #~ msgstr "Καθορίστε το μήνυμα της αναφοράς καθυστερημένης πληρωμής."
 
@@ -10720,6 +10817,10 @@ msgstr ""
 #~ msgid "Print Aged Trial Balance"
 #~ msgstr "Εκτύπωση ενηλικιωμένου δοκιμαστικού ισοζυγίου"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr ""
+#~ "Σφάλμα! Δεν μπορείτε να δημιουργήσετε ανάδρομους αναλυτικούς λογαριασμούς."
+
 #~ msgid "to :"
 #~ msgstr "σε :"
 
@@ -10801,6 +10902,9 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Ισοζύγιση κίνησης"
 
+#~ msgid "Partner Other Ledger"
+#~ msgstr "Άλλο καθολικό συνεργάτη"
+
 #~ msgid "The Account can either be a base tax code or tax code account."
 #~ msgstr ""
 #~ "Ο λογαριασμός μπορεί να είναι είτε λογαριασμός βάσης του φόρου ή  "
@@ -10829,6 +10933,9 @@ msgstr ""
 #~ msgid "Costs to invoice"
 #~ msgstr "Κόστη για τιμολόγηση"
 
+#~ msgid "Aged receivables"
+#~ msgstr "Παλαιωμένα εισπρακτέα"
+
 #~ msgid "Board for accountant"
 #~ msgstr "Πίνακας Λογιστηρίου"
 
@@ -11021,3 +11128,7 @@ msgstr ""
 
 #~ msgid "Fiscal Mappings"
 #~ msgstr "Οικονομικές Απεικονίσεις"
+
+#, python-format
+#~ msgid "UnknownError"
+#~ msgstr "Άγνωστο Λάθος"
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index aa931e3fd58..79bda561e34 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 11:21+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -128,6 +129,9 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Si rompe la conciliación de transacciones, también debe verificar todas la "
+"acciones que están relacionadas con esas transacciones porqué no serán "
+"deshabilitadas."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -339,6 +343,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Instala el plan contable de la localización que satisface las necesidades "
+"contables de su compañía basadas en su país."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:0
@@ -1769,7 +1775,7 @@ msgstr "Importe haber"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento sobre una cuenta cerrada."
+msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1789,7 +1795,7 @@ msgstr "Cuenta de reservas y pérdidas/ganancias"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "¡Valor crédito o débito erróneo en apunte contable!"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1842,7 +1848,7 @@ msgstr "Análisis de tesorería"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1968,6 +1974,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Si el campo activo está desmarcardo, le permitirá ocultar el impuesto sin "
+"eliminarlo."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -4017,6 +4025,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Cuando se crea un nuevo apunte, el estado será 'Borrador'.\n"
+"* Cuando se realicen todos los pagos, el estado será 'Válido'"
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -6205,6 +6215,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Marque esta opción si quiere permitir la cancelación de asientos "
+"relacionados con este diario o de la factura relacionada con este diario."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7279,7 +7291,7 @@ msgstr "Calcular asientos periódicos"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Amount (in words) :"
-msgstr "Importe (en palabras) :"
+msgstr "Importe (en palabras):"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_other
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 94267e96008..9295339a453 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 09:51+0000\n"
+"PO-Revision-Date: 2010-12-06 13:41+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: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -173,6 +173,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Le rapport des pertes et profits résume sur un seul document les bénéfices "
+"et les pertes de votre société."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -616,7 +618,7 @@ msgstr "Cible parent"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Compte utilisé dans ce journal"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -1041,7 +1043,7 @@ msgstr "Relevé bancaire"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Ligne de mouvement"
+msgstr "Ligne d'écriture"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1909,7 +1911,7 @@ msgstr "Analyse de trésorerie"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2021,7 +2023,7 @@ msgstr "Comptes clients créditeurs"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Annulé(e)"
 
 #. module: account
 #: view:account.invoice:0
@@ -8981,7 +8983,7 @@ msgstr "Période"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Supprimer lignes"
+msgstr "Supprimer des lignes"
 
 #. module: account
 #: view:account.report.general.ledger:0
@@ -9579,7 +9581,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Valider les lignes d'écriture"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 5f575b845a6..b5bcb17f3f7 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-05 00:46+0000\n"
-"Last-Translator: Balint (eSolve) <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 088d2c315e7..924344e53f3 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:39+0000\n"
+"PO-Revision-Date: 2010-12-06 14:15+0000\n"
 "Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -416,12 +416,12 @@ msgstr "Data de criação"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Nota de Crédito de compras"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situação Abertura/Encerramento"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -439,6 +439,7 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Este campo contém informaçoes sobre a numeração dos lançamentos deste diário."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -458,7 +459,7 @@ msgstr "Positivo"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "Abrir para desreconciliar"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -543,7 +544,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Conta usada neste diário"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -562,7 +563,7 @@ msgstr ""
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Selecione o Plano de Contas"
 
 #. module: account
 #: view:product.product:0
@@ -572,7 +573,7 @@ msgstr "Impostos de compras"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Estornar fatura"
 
 #. module: account
 #: report:account.overdue:0
@@ -588,7 +589,7 @@ msgstr "Transacções não reconciliadas"
 #: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "O saldo de caixa não combina com o saldo calculado!"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -611,7 +612,7 @@ msgstr "Fechar um Ano Fiscal"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "O contabilista confirma o extrato"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -627,7 +628,7 @@ msgstr "Todos"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Nome do endereço de faturação"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -661,7 +662,7 @@ msgstr "Mapeamento de impostos"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Diário centralizado"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -721,7 +722,7 @@ msgstr "Erro! Não pode criar contas recursivas"
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Balancete geral"
 
 #. module: account
 #: view:account.invoice:0
@@ -736,12 +737,12 @@ msgstr "De certeza que quer criar os movimentos?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Cheque"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Parceiros reconciliados hoje"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -765,7 +766,7 @@ msgstr "Gráficos"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Lançamentos analíticos por linha"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -808,17 +809,17 @@ msgstr "Anular reconciliação"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Diário da contabilidade analítica"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Reconciliação automática"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "Cálculo da data de vencimento"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -852,6 +853,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Não pode %s facturas liquidadas, a fatura deve ser desreconciliada primeiro. "
+"Pode apenas estornar a fatura."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -946,22 +949,22 @@ msgstr "Consolidação"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Diário centralizador"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Nota de crédito de vendas"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Extrato bancário"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1020,7 +1023,7 @@ msgstr "Sem Diário Analítico !"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr ""
+msgstr "Balancete de terceiros"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1066,7 +1069,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Opções de aplicabilidade"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1082,7 +1085,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "Ganhos & Perdas (Conta de gastos)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1115,7 +1118,7 @@ msgstr "Início do período"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Confirmar extrato"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1217,14 +1220,14 @@ msgstr "Conta"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Incluido no valor base"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Análise de lançamentos"
 
 #. module: account
 #: field:account.account,level:0
@@ -1250,7 +1253,7 @@ msgstr "Impostos"
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Slecione os períodos de início e de fim"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1260,7 +1263,7 @@ msgstr "Modelos para contas"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Procurar modelos de impostos"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1284,7 +1287,7 @@ msgstr "Saldo de abertura"
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Voltar a rascunho"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1300,7 +1303,7 @@ msgstr "Opções de relatório"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Análise das linhas de lançamento do diário"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -1385,7 +1388,7 @@ msgstr "Nº de dígitos"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Saltar o estado \"Rascunho\" para lançamentos manuais"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1406,7 +1409,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Tabela temporária usada para o painel"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1436,6 +1439,8 @@ msgid ""
 "customers. OpenERP generates draft of invoices automatically so that you "
 "only have to confirm them before sending them to your customers."
 msgstr ""
+"Faturas de clientes, permite criar e gerir as faturas emitidas aos clientes. "
+"O openERP gera faturas em rascunho, que só terá de confirmar."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
@@ -1456,7 +1461,7 @@ msgstr "Fechado"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Lançamentos recurrentes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1564,7 +1569,7 @@ msgstr "Factura"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Custos da analítica por faturar"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1597,6 +1602,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Cancelar fatura: Cria uma nota de crédito, valida e liquida-a conta a fatura "
+"actual, para a anular."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1704,7 +1711,7 @@ msgstr "Plano de contas analítico"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Os meus lançamentos"
 
 #. module: account
 #: report:account.overdue:0
@@ -1746,7 +1753,7 @@ msgstr "Montante do crédito"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Não pode criar linhas de movimentos em contas fechadas."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1773,12 +1780,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Análise de faturas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Fechar período"
 
 #. module: account
 #: view:account.installer:0
@@ -1788,7 +1795,7 @@ msgstr "Configurar o ano fiscal"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Lançamentos por linha"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1799,12 +1806,12 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Lançamento de diário"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Declaração de impostos: faturas"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
@@ -1814,12 +1821,12 @@ msgstr "Subtotal"
 #. module: account
 #: view:account.account:0
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Análise de tesouraria"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Não pode criar companhias recursivamente."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1857,7 +1864,7 @@ msgstr "/"
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Ganhos & Perdas / Conta de gastos"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -1868,7 +1875,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Comparação entre lançamentos contabilistícos e pagamentos"
 
 #. module: account
 #: view:account.tax:0
@@ -1899,6 +1906,8 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Se marcado, então não aceitará movimentos com data fora do intervalo de "
+"datas do período"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
@@ -1925,13 +1934,13 @@ msgstr "Contas a receber"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Canceled"
-msgstr ""
+msgstr "Candelado"
 
 #. module: account
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Valor sem Impostos"
 
 #. module: account
 #: help:account.tax,active:0
@@ -1939,6 +1948,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Ao desmarcar o campo 'ativo' permite-lhe esconder o imposto sem ter de o "
+"eliminar."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2005,17 +2016,17 @@ msgstr "janeiro"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Validações"
 
 #. module: account
 #: model:account.journal,name:account.close_journal
 msgid "End of Year"
-msgstr ""
+msgstr "Fim de ano"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Este ano"
 
 #. module: account
 #: view:account.tax.chart:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index fcf6f25c65f..85963b2d6f2 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-24 09:33+0000\n"
-"Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-09 03:25+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -70,7 +70,7 @@ msgstr "Residual"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Defina uma sequencia para o diário"
 
 #. module: account
 #: constraint:account.period:0
@@ -85,7 +85,7 @@ msgstr "Moeda da conta"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definição de descendentes"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -97,6 +97,15 @@ msgstr "Recebíveis Vencidos até Hoje"
 msgid "Include Reconciled Entries"
 msgstr "Incluir Lançamentos Reconciliados"
 
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+"A Demonstração de Resultados, dá uma visão dos ganhos e perdas da empresa "
+"num único documento."
+
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
@@ -162,6 +171,15 @@ msgstr "Referência"
 msgid "Choose Fiscal Year "
 msgstr "Escolha o Ano Fiscal "
 
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+"Ao desactivar o campo 'activo', permite-lhe ocultar as condições de "
+"pagamento sem as remover."
+
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
@@ -190,6 +208,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Dá o tipo de diário analítico. Quando precisar de criar lançamentos "
+"analíticos, para um documento (ex.fatura) oOpenERP vai procurar um diário "
+"deste tipo."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -205,7 +226,7 @@ msgstr "fornecedor"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "Expenses Credit Notes Journal - (test)"
-msgstr ""
+msgstr "Diário de Notas de Crédito de despesas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -225,7 +246,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Selecionar linhas de movimentos para conciliar"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -259,7 +280,7 @@ msgstr "Os registros contábeis são uma entrada da reconciliação."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr ""
+msgstr "Relatórios belgas"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -304,6 +325,8 @@ msgstr "St."
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
+"A companhia da conta da linha da fatura, não corresponde à companhia da "
+"fatura."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -316,6 +339,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Instala um plano de contas local, correspondente às necessidades das "
+"empresas baseadas no seu país."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:0
@@ -477,6 +502,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: view:account.entries.report:0
 #: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
 #: view:account.invoice:0
 #: field:account.invoice,journal_id:0
 #: view:account.invoice.report:0
@@ -494,6 +520,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
@@ -509,6 +536,11 @@ msgstr "Confirmar as faturas selecionadas"
 msgid "Parent target"
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
 #: help:account.balance.report,chart_account_id:0
@@ -628,6 +660,11 @@ msgstr "Maper taxas"
 msgid "Centralized Journal"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
@@ -765,11 +802,6 @@ msgstr "A referência do parceiro nesta fatura."
 msgid "Unreconciliation"
 msgstr "Não conciliado"
 
-#. module: account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
@@ -913,6 +945,11 @@ msgstr "Consolidação"
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
@@ -975,6 +1012,7 @@ msgstr "Nenum diário analítico !"
 
 #. module: account
 #: report:account.partner.balance:0
+#: view:account.partner.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_balance
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
@@ -1045,7 +1083,6 @@ msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.journal.period.print:0
 #: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1148,12 +1185,6 @@ msgstr "Referencia ao documento que produziu esta fatura."
 msgid "Others"
 msgstr "Outros"
 
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "UnknownError"
-msgstr ""
-
 #. module: account
 #: view:account.account:0
 #: report:account.account.balance:0
@@ -1166,6 +1197,7 @@ msgstr ""
 #: field:account.invoice.line,account_id:0
 #: field:account.invoice.report,account_id:0
 #: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
 #: field:account.model.line,account_id:0
 #: view:account.move.line:0
 #: field:account.move.line,account_id:0
@@ -1200,6 +1232,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -1292,11 +1325,9 @@ msgid "Account Receivable"
 msgstr "Conta de recebimento"
 
 #. module: account
-#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
-#: field:wizard.multi.charts.accounts,config_logo:0
-msgid "Image"
-msgstr ""
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Diário Central"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1476,6 +1507,12 @@ msgstr ""
 msgid "Search Bank Statements"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
@@ -1537,14 +1574,6 @@ msgstr ""
 msgid "Separated Journal Sequences"
 msgstr "Sequências de diário separadas"
 
-#. module: account
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
@@ -1622,6 +1651,13 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
@@ -1705,6 +1741,11 @@ msgstr ""
 msgid "Credit amount"
 msgstr "Valor do credito"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -1718,6 +1759,11 @@ msgstr ""
 msgid "Reserve And Profit/Loss Account"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
@@ -1725,11 +1771,6 @@ msgstr ""
 msgid "Invoices Analysis"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "A/c No."
-msgstr "Ct nº."
-
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
@@ -1771,6 +1812,11 @@ msgstr ""
 msgid "Treasury Analysis"
 msgstr ""
 
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
@@ -1856,14 +1902,11 @@ msgid "Account Profit And Loss"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-msgid "Payable Accounts"
-msgstr "Contas a pagar"
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -1886,6 +1929,13 @@ msgstr ""
 msgid "Untaxed Amount"
 msgstr "Valor sem Impostos"
 
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: help:account.bank.statement,name:0
 msgid ""
@@ -2067,7 +2117,6 @@ msgid "Accounting Properties"
 msgstr "Propriedades da conta"
 
 #. module: account
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2321,6 +2370,17 @@ msgid ""
 "partner."
 msgstr ""
 
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
@@ -2377,6 +2437,11 @@ msgid ""
 "Entry Lines"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
@@ -2401,7 +2466,10 @@ msgstr "Desc.(%)"
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Ref"
 msgstr "Ref"
 
@@ -2410,11 +2478,6 @@ msgstr "Ref"
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
@@ -2477,6 +2540,13 @@ msgstr "Saldo anterior do Parceiro"
 msgid "Accounting entries"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"given a period and a journal, the sum of debit will always be equal to the "
+"sum of credit, so there is no point to display it"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
@@ -2516,11 +2586,6 @@ msgstr ""
 msgid "No sequence defined on the journal !"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Cancelled Invoice"
-msgstr ""
-
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/account_bank_statement.py:0
@@ -2619,6 +2684,12 @@ msgstr "Conta de Despesas"
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr "Deixe em branco para usar a data do prazo de validação (fatura)"
 
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -2643,6 +2714,7 @@ msgid "Financial Accounting"
 msgstr "Conta financeira"
 
 #. module: account
+#: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
 msgstr ""
@@ -2911,20 +2983,20 @@ msgstr "Deixe vazio para usar a conta de despesas"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
-#: report:account.general.ledger:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
 #: field:account.partner.ledger,journal_ids:0
 #: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
 #: field:account.print.journal,journal_ids:0
 #: field:account.report.general.ledger,journal_ids:0
 #: field:account.vat.declaration,journal_ids:0
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.ui.menu,name:account.menu_account_print_journal
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
 msgstr "Diários"
@@ -3130,6 +3202,16 @@ msgid ""
 "account entries!"
 msgstr ""
 
+#. module: account
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
@@ -3354,11 +3436,6 @@ msgstr "Código aplicável (se tipo=código)"
 msgid "Qty"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Move/Entry label"
-msgstr ""
-
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
@@ -3512,11 +3589,6 @@ msgid ""
 "company currency"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Entry No"
-msgstr ""
-
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
@@ -3565,6 +3637,11 @@ msgstr ""
 msgid "Validate"
 msgstr "Validar"
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
 msgid ""
@@ -3623,6 +3700,7 @@ msgstr "Configuração"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
 msgstr "30 Dias Fim do Mês"
 
@@ -3639,6 +3717,13 @@ msgstr "Saldo Analítico"
 msgid "Net Loss"
 msgstr ""
 
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -3665,6 +3750,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: view:account.balance.report:0
 #: model:ir.actions.act_window,name:account.action_account_balance_menu
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
@@ -3889,12 +3975,10 @@ msgid "Reconcile Writeoff"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
-msgstr ""
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Data de vencimento"
 
 #. module: account
 #: view:account.account.template:0
@@ -3978,6 +4062,7 @@ msgstr ""
 
 #. module: account
 #: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
 msgstr "Taxa incluida no preço"
 
@@ -4093,8 +4178,8 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: account
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
@@ -4112,13 +4197,6 @@ msgid ""
 "definition if you want to accept all currencies."
 msgstr ""
 
-#. module: account
-#: help:account.payment.term,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the payment "
-"term without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
@@ -4287,6 +4365,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
 #: code:addons/account/account_move_line.py:0
 #: code:addons/account/report/common_report_header.py:0
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -4486,6 +4565,12 @@ msgstr "Formas de Pagamento"
 msgid "Column Name"
 msgstr "Nome da Coluna"
 
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,year:0
 #: view:account.invoice.report:0
@@ -4534,11 +4619,6 @@ msgstr ""
 msgid "Description on invoices"
 msgstr "Descrição nas faturas"
 
-#. module: account
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação"
-
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
@@ -4556,6 +4636,7 @@ msgid "Reconciliation result"
 msgstr "Resultado da conciliação"
 
 #. module: account
+#: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
 msgid "Balance Sheet"
@@ -4652,6 +4733,12 @@ msgstr ""
 msgid "Tax on Children"
 msgstr "Imposto nas sub-contas"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/wizard/account_use_model.py:0
@@ -4735,8 +4822,8 @@ msgid "Bank Journal "
 msgstr "Diário Bancário "
 
 #. module: account
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
 
 #. module: account
@@ -5026,8 +5113,8 @@ msgid "Valid Up to"
 msgstr ""
 
 #. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
+#: view:board.board:0
+msgid "Aged Receivables"
 msgstr ""
 
 #. module: account
@@ -5254,13 +5341,6 @@ msgstr "Voce não pode usar uma conta inativa!"
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! "
 
-#. module: account
-#: help:account.tax,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the tax "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
@@ -5468,6 +5548,11 @@ msgstr ""
 msgid "Reporting Configuration"
 msgstr ""
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
@@ -5783,13 +5868,6 @@ msgstr "Reembolso a fornecedor"
 msgid "Dashboard"
 msgstr ""
 
-#. module: account
-#: help:account.journal.period,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the journal "
-"period without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -5839,8 +5917,6 @@ msgstr "Unidade de medida"
 
 #. module: account
 #: constraint:account.payment.term.line:0
-#: code:addons/account/account.py:0
-#, python-format
 msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
@@ -5893,11 +5969,6 @@ msgstr ""
 msgid "Invoice is already reconciled"
 msgstr "Fatura já está reconciliada"
 
-#. module: account
-#: view:board.board:0
-msgid "Aged receivables"
-msgstr "Recebíveis vencidos"
-
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
@@ -6029,6 +6100,14 @@ msgstr ""
 msgid "Error !"
 msgstr "Erro !"
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
+msgstr ""
+
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -6082,9 +6161,12 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: view:account.state.open:0
-msgid "Yes"
-msgstr "Sim"
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:0
@@ -6115,6 +6197,12 @@ msgstr ""
 msgid "All Entries"
 msgstr "Todos lançamentos"
 
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
@@ -6138,6 +6226,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
 #: model:ir.ui.menu,name:account.menu_general_ledger
@@ -6149,6 +6238,15 @@ msgstr "Livro Razão"
 msgid "The payment order is sent to the bank."
 msgstr ""
 
+#. module: account
+#: view:account.balance.report:0
+#: view:account.bs.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
 #. module: account
 #: help:account.move,to_check:0
 msgid ""
@@ -6388,12 +6486,6 @@ msgstr ""
 msgid "Are you sure you want to open this invoice ?"
 msgstr "Você tem a certeza que pretende abrir esta factura?"
 
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_central_journal
-#: model:ir.ui.menu,name:account.menu_account_central_journal
-msgid "Central Journals"
-msgstr ""
-
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
@@ -6664,6 +6756,11 @@ msgstr ""
 msgid "  day of the month= -1"
 msgstr ""
 
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: account
 #: help:account.journal,type:0
 msgid ""
@@ -6762,11 +6859,6 @@ msgstr "Nenhum número da parte!"
 msgid "Expenses Journal - (test)"
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
@@ -6810,6 +6902,16 @@ msgstr ""
 msgid "May"
 msgstr ""
 
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr "Contas a pagar"
+
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
@@ -6876,6 +6978,7 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
@@ -6883,6 +6986,11 @@ msgstr ""
 "Marque se o preço que você utiliza no produto e nas faturas inclui este "
 "imposto."
 
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Sim"
+
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
@@ -6957,9 +7065,11 @@ msgid "CashBox Line"
 msgstr ""
 
 #. module: account
+#: view:account.partner.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
 msgstr "Livro-razão relacionado"
@@ -7032,11 +7142,6 @@ msgstr ""
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: account
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Você não pode criar contas analíticas recursivas"
-
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
@@ -7119,6 +7224,11 @@ msgstr ""
 msgid "Automatic entry"
 msgstr ""
 
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
@@ -7210,11 +7320,6 @@ msgstr ""
 msgid "Cost Ledger"
 msgstr "Livro de custos"
 
-#. module: account
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
@@ -7473,10 +7578,7 @@ msgstr "Diário de reembolso"
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Filter By"
 msgstr ""
 
@@ -8056,11 +8158,6 @@ msgstr ""
 msgid "Best regards."
 msgstr "atenciosamente."
 
-#. module: account
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
@@ -8079,6 +8176,11 @@ msgstr ""
 msgid "Document: Customer account statement"
 msgstr "Documento: demonstrativo da conta cliente"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
@@ -8125,7 +8227,6 @@ msgstr "Manter vazio para usar a conta de receita"
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
-#: report:account.journal.period.print:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8144,7 +8245,6 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger:0
 msgid "Display Account"
 msgstr ""
 
@@ -8234,7 +8334,10 @@ msgid "Receiver's Signature"
 msgstr ""
 
 #. module: account
+#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
 
@@ -8246,6 +8349,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
@@ -8274,11 +8378,6 @@ msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
@@ -8395,10 +8494,12 @@ msgid "Account Subscription"
 msgstr "Inscriçãoda conta"
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Data de vencimento"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
@@ -8486,13 +8587,6 @@ msgstr ""
 msgid "Suppliers Payment Management"
 msgstr ""
 
-#. module: account
-#: help:account.analytic.journal,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the analytic "
-"journal without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
@@ -8512,6 +8606,12 @@ msgstr "Código/Data"
 msgid "Active"
 msgstr "Ativo"
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -8585,7 +8685,7 @@ msgid "Through :"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_general_journal
+#: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
 msgstr ""
@@ -8740,6 +8840,13 @@ msgstr "Período da conta"
 msgid "Remove Lines"
 msgstr "Remover linhas"
 
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
@@ -8823,6 +8930,7 @@ msgstr "Data de Término"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
 msgstr "Cancelar lançamentos iniciais"
 
@@ -8861,11 +8969,7 @@ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-msgid "Partner Other Ledger"
-msgstr "Outros Razões Parceiros"
-
-#. module: account
+#: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JNRL"
@@ -8898,13 +9002,6 @@ msgstr "Estado"
 msgid "Total"
 msgstr "Total"
 
-#. module: account
-#: help:account.account,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the account "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
@@ -9096,6 +9193,11 @@ msgid ""
 "product category"
 msgstr ""
 
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
@@ -9284,6 +9386,7 @@ msgstr "Número de períodos"
 
 #. module: account
 #: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr "Diário geral"
 
@@ -9357,11 +9460,6 @@ msgstr ""
 msgid "Manual Invoice Taxes"
 msgstr "Impostos de fatura manual"
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_low_level
-msgid "Low Level"
-msgstr ""
-
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9385,6 +9483,7 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
 #: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
 #: field:account.partner.ledger,result_selection:0
@@ -9400,10 +9499,15 @@ msgstr ""
 msgid "Fiscal Years"
 msgstr "Anos fiscais"
 
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.analytic.line,ref:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -9579,9 +9683,6 @@ msgstr ""
 #~ msgid "Partner Accounts"
 #~ msgstr "Contas de Parceiros"
 
-#~ msgid "Central Journal"
-#~ msgstr "Diário Central"
-
 #~ msgid "Journal code"
 #~ msgstr "Código do diário"
 
@@ -9689,6 +9790,9 @@ msgstr ""
 #~ msgid "Reconcile entries"
 #~ msgstr "Reconciliar lançamentos"
 
+#~ msgid "A/c No."
+#~ msgstr "Ct nº."
+
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Custo e receita da conta por diário (Este mês)"
 
@@ -9959,6 +10063,9 @@ msgstr ""
 #~ msgid "Sort by:"
 #~ msgstr "Ordenar por"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
 #~ msgid "          Start date"
 #~ msgstr "          Data de início"
 
@@ -10099,6 +10206,12 @@ msgstr ""
 #~ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 #~ msgstr "Custos analíticos para fatura de compra, planilhas, ..."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
 #~ msgid "Name of the fiscal year as displayed in reports."
 #~ msgstr "Nome do ano fiscal para relatórios"
 
@@ -10620,6 +10733,12 @@ msgstr ""
 #~ msgid "Account Code"
 #~ msgstr "Código da Conta"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Erro! Você não pode criar contas analíticas recursivas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+
 #~ msgid "Specify The Message for the Overdue Payment Report."
 #~ msgstr "Definir uma mensagem para o Relatório de Pagamentos em Atraso"
 
@@ -10679,6 +10798,9 @@ msgstr ""
 #~ "Esta conta será usada em vez da padrão para calcular o valor do estoque de "
 #~ "saída para o produto atual"
 
+#~ msgid "Partner Other Ledger"
+#~ msgstr "Outros Razões Parceiros"
+
 #~ msgid ""
 #~ "If the Tax account is tax code account, this field will contain the taxed "
 #~ "amount.If the tax account is base tax code,                    this field "
@@ -10741,6 +10863,9 @@ msgstr ""
 #~ msgid "Costs to invoice"
 #~ msgstr "Custos a faturar"
 
+#~ msgid "Aged receivables"
+#~ msgstr "Recebíveis vencidos"
+
 #~ msgid "Show Comparision in %"
 #~ msgstr "Mostrar comparação em %"
 
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index d4b64cc492b..531a8438607 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:19+0000\n"
+"PO-Revision-Date: 2010-12-05 07:16+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 4827885a5c6..989ed4dd1f5 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.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: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-01 08:42+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 11:40+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -96,10 +96,17 @@ msgstr ""
 msgid "Include Reconciled Entries"
 msgstr ""
 
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Import z faktúry alebo platby"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -157,6 +164,13 @@ msgstr ""
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
+msgstr "Vyberte fiškálny rok "
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
 msgstr ""
 
 #. module: account
@@ -464,6 +478,7 @@ msgstr ""
 #: report:account.central.journal:0
 #: view:account.entries.report:0
 #: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
 #: view:account.invoice:0
 #: field:account.invoice,journal_id:0
 #: view:account.invoice.report:0
@@ -481,6 +496,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
@@ -496,6 +512,11 @@ msgstr "Potvrdiť vybrané faktúry"
 msgid "Parent target"
 msgstr ""
 
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
 #: help:account.balance.report,chart_account_id:0
@@ -612,6 +633,11 @@ msgstr ""
 msgid "Centralized Journal"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
@@ -749,11 +775,6 @@ msgstr ""
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
@@ -892,6 +913,11 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
@@ -954,6 +980,7 @@ msgstr ""
 
 #. module: account
 #: report:account.partner.balance:0
+#: view:account.partner.balance:0
 #: model:ir.actions.act_window,name:account.action_account_partner_balance
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
@@ -1024,7 +1051,6 @@ msgstr "Výkaz ziskov a strát (účty nákladov)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.journal.period.print:0
 #: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1126,12 +1152,6 @@ msgstr "Odkaz na dokument, ktorý vytvoril túto faktúru."
 msgid "Others"
 msgstr ""
 
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "UnknownError"
-msgstr ""
-
 #. module: account
 #: view:account.account:0
 #: report:account.account.balance:0
@@ -1144,6 +1164,7 @@ msgstr ""
 #: field:account.invoice.line,account_id:0
 #: field:account.invoice.report,account_id:0
 #: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
 #: field:account.model.line,account_id:0
 #: view:account.move.line:0
 #: field:account.move.line,account_id:0
@@ -1178,6 +1199,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+#: view:account.invoice.line:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -1270,10 +1292,8 @@ msgid "Account Receivable"
 msgstr "Účet pohľadávky"
 
 #. module: account
-#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
-#: field:wizard.multi.charts.accounts,config_logo:0
-msgid "Image"
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
 msgstr ""
 
 #. module: account
@@ -1454,6 +1474,12 @@ msgstr ""
 msgid "Search Bank Statements"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
@@ -1515,12 +1541,6 @@ msgstr ""
 msgid "Separated Journal Sequences"
 msgstr ""
 
-#. module: account
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
@@ -1598,6 +1618,13 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
@@ -1681,6 +1708,11 @@ msgstr ""
 msgid "Credit amount"
 msgstr ""
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -1694,6 +1726,11 @@ msgstr ""
 msgid "Reserve And Profit/Loss Account"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
@@ -1701,11 +1738,6 @@ msgstr ""
 msgid "Invoices Analysis"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "A/c No."
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
@@ -1747,6 +1779,11 @@ msgstr ""
 msgid "Treasury Analysis"
 msgstr ""
 
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
@@ -1830,13 +1867,10 @@ msgid "Account Profit And Loss"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-msgid "Payable Accounts"
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
 msgstr ""
 
 #. module: account
@@ -1860,6 +1894,13 @@ msgstr ""
 msgid "Untaxed Amount"
 msgstr ""
 
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: help:account.bank.statement,name:0
 msgid ""
@@ -2039,7 +2080,6 @@ msgid "Accounting Properties"
 msgstr ""
 
 #. module: account
-#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
@@ -2287,6 +2327,17 @@ msgid ""
 "partner."
 msgstr ""
 
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
@@ -2343,6 +2394,11 @@ msgid ""
 "Entry Lines"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
@@ -2367,7 +2423,10 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Ref"
 msgstr ""
 
@@ -2376,11 +2435,6 @@ msgstr ""
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
@@ -2443,6 +2497,13 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"given a period and a journal, the sum of debit will always be equal to the "
+"sum of credit, so there is no point to display it"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
@@ -2482,11 +2543,6 @@ msgstr ""
 msgid "No sequence defined on the journal !"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Cancelled Invoice"
-msgstr ""
-
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/account_bank_statement.py:0
@@ -2585,6 +2641,12 @@ msgstr ""
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
 
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -2609,6 +2671,7 @@ msgid "Financial Accounting"
 msgstr ""
 
 #. module: account
+#: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
 msgid "Profit And Loss"
 msgstr ""
@@ -2870,20 +2933,20 @@ msgstr ""
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
-#: report:account.general.ledger:0
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
 #: field:account.partner.ledger,journal_ids:0
 #: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
 #: field:account.print.journal,journal_ids:0
 #: field:account.report.general.ledger,journal_ids:0
 #: field:account.vat.declaration,journal_ids:0
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.ui.menu,name:account.menu_account_print_journal
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
 msgstr ""
@@ -3089,6 +3152,16 @@ msgid ""
 "account entries!"
 msgstr ""
 
+#. module: account
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
@@ -3309,11 +3382,6 @@ msgstr ""
 msgid "Qty"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Move/Entry label"
-msgstr ""
-
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
@@ -3465,11 +3533,6 @@ msgid ""
 "company currency"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "Entry No"
-msgstr ""
-
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
@@ -3518,6 +3581,11 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
 msgid ""
@@ -3576,6 +3644,7 @@ msgstr "Konfigurácia"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
 msgstr ""
 
@@ -3592,6 +3661,13 @@ msgstr ""
 msgid "Net Loss"
 msgstr ""
 
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
@@ -3618,6 +3694,7 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: view:account.balance.report:0
 #: model:ir.actions.act_window,name:account.action_account_balance_menu
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
@@ -3841,11 +3918,9 @@ msgid "Reconcile Writeoff"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
 msgstr ""
 
 #. module: account
@@ -3930,6 +4005,7 @@ msgstr ""
 
 #. module: account
 #: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
 msgstr "DPH zahrnuté v cene"
 
@@ -4043,8 +4119,8 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: account
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
@@ -4062,13 +4138,6 @@ msgid ""
 "definition if you want to accept all currencies."
 msgstr ""
 
-#. module: account
-#: help:account.payment.term,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the payment "
-"term without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
@@ -4237,6 +4306,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
 #: code:addons/account/account_move_line.py:0
 #: code:addons/account/report/common_report_header.py:0
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -4433,6 +4503,12 @@ msgstr ""
 msgid "Column Name"
 msgstr ""
 
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,year:0
 #: view:account.invoice.report:0
@@ -4481,11 +4557,6 @@ msgstr ""
 msgid "Description on invoices"
 msgstr "Popis na faktúrach"
 
-#. module: account
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Neplatný názov modelu v akcii definície."
-
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
@@ -4503,6 +4574,7 @@ msgid "Reconciliation result"
 msgstr ""
 
 #. module: account
+#: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
 msgid "Balance Sheet"
@@ -4599,6 +4671,12 @@ msgstr ""
 msgid "Tax on Children"
 msgstr ""
 
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/wizard/account_use_model.py:0
@@ -4679,8 +4757,8 @@ msgid "Bank Journal "
 msgstr ""
 
 #. module: account
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
 
 #. module: account
@@ -4964,8 +5042,8 @@ msgid "Valid Up to"
 msgstr ""
 
 #. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
+#: view:board.board:0
+msgid "Aged Receivables"
 msgstr ""
 
 #. module: account
@@ -5192,13 +5270,6 @@ msgstr ""
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
 
-#. module: account
-#: help:account.tax,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the tax "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
@@ -5406,6 +5477,11 @@ msgstr ""
 msgid "Reporting Configuration"
 msgstr "Konfigurácia reportingu"
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
@@ -5718,13 +5794,6 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#. module: account
-#: help:account.journal.period,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the journal "
-"period without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
@@ -5774,8 +5843,6 @@ msgstr ""
 
 #. module: account
 #: constraint:account.payment.term.line:0
-#: code:addons/account/account.py:0
-#, python-format
 msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
@@ -5828,11 +5895,6 @@ msgstr ""
 msgid "Invoice is already reconciled"
 msgstr ""
 
-#. module: account
-#: view:board.board:0
-msgid "Aged receivables"
-msgstr ""
-
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
@@ -5958,11 +6020,18 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #: code:addons/account/wizard/account_invoice_refund.py:0
 #: code:addons/account/wizard/account_use_model.py:0
-#: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "Error !"
 msgstr ""
 
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
+msgstr ""
+
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -6016,8 +6085,11 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: view:account.state.open:0
-msgid "Yes"
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
 msgstr ""
 
 #. module: account
@@ -6049,6 +6121,12 @@ msgstr ""
 msgid "All Entries"
 msgstr ""
 
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
@@ -6072,6 +6150,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
 #: model:ir.ui.menu,name:account.menu_general_ledger
@@ -6083,6 +6162,15 @@ msgstr ""
 msgid "The payment order is sent to the bank."
 msgstr ""
 
+#. module: account
+#: view:account.balance.report:0
+#: view:account.bs.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
 #. module: account
 #: help:account.move,to_check:0
 msgid ""
@@ -6322,12 +6410,6 @@ msgstr ""
 msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_central_journal
-#: model:ir.ui.menu,name:account.menu_account_central_journal
-msgid "Central Journals"
-msgstr ""
-
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
@@ -6588,14 +6670,13 @@ msgid "You can not have two open register for the same journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:0
-#, python-format
-msgid "You cannot create a bank or cash register without a journal!"
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month= -1"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: account
@@ -6696,11 +6777,6 @@ msgstr ""
 msgid "Expenses Journal - (test)"
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
@@ -6744,6 +6820,16 @@ msgstr ""
 msgid "May"
 msgstr ""
 
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr ""
+
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
@@ -6810,11 +6896,17 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
 
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
@@ -6886,9 +6978,11 @@ msgid "CashBox Line"
 msgstr ""
 
 #. module: account
+#: view:account.partner.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
 msgstr "Účtovná kniha partnera"
@@ -6961,11 +7055,6 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
-#. module: account
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Chyba! Nemôžete vytvárať rekurzívne analytické účty."
-
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
@@ -7048,6 +7137,11 @@ msgstr ""
 msgid "Automatic entry"
 msgstr ""
 
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
@@ -7137,11 +7231,6 @@ msgstr ""
 msgid "Cost Ledger"
 msgstr ""
 
-#. module: account
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
@@ -7399,10 +7488,7 @@ msgstr ""
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
-#: report:account.general.ledger:0
 #: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Filter By"
 msgstr ""
 
@@ -7977,11 +8063,6 @@ msgstr ""
 msgid "Best regards."
 msgstr ""
 
-#. module: account
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
@@ -8000,6 +8081,11 @@ msgstr ""
 msgid "Document: Customer account statement"
 msgstr ""
 
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
@@ -8046,7 +8132,6 @@ msgstr ""
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
-#: report:account.journal.period.print:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8065,7 +8150,6 @@ msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger:0
 msgid "Display Account"
 msgstr ""
 
@@ -8155,7 +8239,10 @@ msgid "Receiver's Signature"
 msgstr ""
 
 #. module: account
+#: report:account.general.ledger:0
 #: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
 
@@ -8167,6 +8254,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.journal.period.print:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
@@ -8194,11 +8282,6 @@ msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
 
-#. module: account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
@@ -8315,9 +8398,11 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
 msgstr ""
 
 #. module: account
@@ -8406,13 +8491,6 @@ msgstr ""
 msgid "Suppliers Payment Management"
 msgstr ""
 
-#. module: account
-#: help:account.analytic.journal,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the analytic "
-"journal without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
@@ -8432,6 +8510,12 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
@@ -8503,7 +8587,7 @@ msgid "Through :"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_general_journal
+#: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
 msgstr ""
@@ -8658,6 +8742,13 @@ msgstr ""
 msgid "Remove Lines"
 msgstr ""
 
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
@@ -8741,6 +8832,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
 msgstr ""
 
@@ -8779,11 +8871,7 @@ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-msgid "Partner Other Ledger"
-msgstr ""
-
-#. module: account
+#: report:account.general.ledger:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JNRL"
@@ -8816,13 +8904,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#. module: account
-#: help:account.account,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the account "
-"without removing it."
-msgstr ""
-
 #. module: account
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
@@ -9014,6 +9095,11 @@ msgid ""
 "product category"
 msgstr ""
 
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
@@ -9202,6 +9288,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr ""
 
@@ -9275,11 +9362,6 @@ msgstr ""
 msgid "Manual Invoice Taxes"
 msgstr ""
 
-#. module: account
-#: model:ir.ui.menu,name:account.menu_low_level
-msgid "Low Level"
-msgstr ""
-
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9303,6 +9385,7 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
 #: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
 #: field:account.partner.ledger,result_selection:0
@@ -9318,10 +9401,15 @@ msgstr ""
 msgid "Fiscal Years"
 msgstr ""
 
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
 #. module: account
 #: field:account.analytic.line,ref:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -9424,12 +9512,21 @@ msgstr ""
 #~ msgid "Move line select"
 #~ msgstr "Presunúť vybraný riadok"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Chyba! Nemôžete vytvárať rekurzívne analytické účty."
+
 #~ msgid "Total entries"
 #~ msgstr "Položky spolu"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Neplatný názov modelu v akcii definície."
+
 #~ msgid "Account Num."
 #~ msgstr "Číslo účtu"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
+
 #~ msgid "Analytic accounts to close"
 #~ msgstr "Zatvoriť analytické účty"
 
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index f368c9a3e23..9a5cfa7f229 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -6,165 +6,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-07 18:05+0000\n"
+"Last-Translator: Matjaž Godec <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
-#: field:account.tax.template,description:0
-msgid "Internal Name"
-msgstr "Interni naziv"
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "Sistemsko plačilo"
 
 #. module: account
-#: field:account.partner.balance,result_selection:0
-#: field:account.aged.trial.balance,result_selection:0
-#: field:account.partner.ledger,result_selection:0
-msgid "Partner's"
-msgstr ""
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr "Ostale nastavitve"
 
 #. module: account
-#: model:ir.ui.menu,name:account.next_id_22
-msgid "Partners"
-msgstr ""
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#, python-format
+msgid "No journal for ending writing has been defined for the fiscal year"
+msgstr "Manjka dnevnik zaključnih vpisov za poslovno leto"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_account_pl_report
-msgid "Profit And Loss"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_account_bs_report
-msgid "Balance Sheet"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_general_Balance_report
-msgid  "Trial Balance"
-msgstr ""
-
-#. module: account
-#: view:account.tax.code:0
-msgid "Account Tax Code"
-msgstr "Davčna stopnja"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree9
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
-msgid "Unpaid Supplier Invoices"
-msgstr "Neplačani računi dobaviteljem"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_entries
-msgid "Entries Encoding"
-msgstr "Knjiženje"
-
-#. module: account
-#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
-msgid "Specify The Message for the Overdue Payment Report."
-msgstr "Določite besedilo opomina za zapadla plačila."
-
-#. module: account
-#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
-msgid "Confirm statement from draft"
-msgstr "Potrdite predlog izpiska."
-
-#. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Asset"
-msgstr "Delovno sredstvo"
-
-#. module: account
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
-#. module: account
-#: help:account.journal,currency:0
-msgid "The currency used to enter statement"
-msgstr "Valuta za vnos izkaza"
-
-#. module: account
-#: wizard_view:account_use_models,init_form:0
-msgid "Select Message"
-msgstr "Izberi sporočilo"
-
-#. module: account
-#: help:product.category,property_account_income_categ:0
+#: code:addons/account/account.py:0
+#, python-format
 msgid ""
-"This account will be used to value incoming stock for the current product "
-"category"
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
 msgstr ""
-"Ta konto bo uporabljen za vrednotenje prevzetih zalog za izbrano kategorijo "
-"proizvodov."
+"Konto, ki je uporabljen kot lastnost pri kateremkoli poslovnem partnerju ne "
+"morete odstraniti/deaktivirati"
 
 #. module: account
-#: help:account.invoice,period_id:0
-msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
-"Pustite prazno, če želite uporabiti obdobje potrditve datum (računa) ."
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr "Uskladi dnevniški zapis"
 
 #. module: account
-#: wizard_view:account.automatic.reconcile,reconcile:0
-msgid "Reconciliation result"
-msgstr "Izid usklajevanja"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
-msgid "Unreconciled entries"
-msgstr "Neusklajene vknjižbe"
-
-#. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
-#: field:account.tax.template,base_code_id:0
-msgid "Base Code"
-msgstr "Osnovna stopnja"
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "Upravljanje vavčerjev"
 
 #. module: account
 #: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
 msgid "Account Statistics"
 msgstr "Statistike konta"
 
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_vat_declaration
-#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
-msgid "Print Taxes Report"
-msgstr "Natisni davčno poročilo"
-
-#. module: account
-#: field:account.account,parent_id:0
-msgid "Parent"
-msgstr "Nadrejeni"
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Journal Voucher"
-msgstr "Dnevnik za kupone."
-
 #. module: account
 #: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
 msgid "Residual"
 msgstr "Preostali"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
-#: field:account.tax.template,base_sign:0
-#: field:account.tax.template,ref_base_sign:0
-msgid "Base Code Sign"
-msgstr "Predznak osnove"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
-#: model:ir.ui.menu,name:account.menu_unreconcile_select
-msgid "Unreconcile entries"
-msgstr "Prekliči uskladitev vknjižb"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Prosim definirajte zaporedje za dnevnik računov"
 
 #. module: account
 #: constraint:account.period:0
@@ -172,115 +78,41 @@ msgid "Error ! The duration of the Period(s) is/are invalid. "
 msgstr "Napaka! Trajanje obdobja/obdobij je nepravilno. "
 
 #. module: account
-#: view:account.bank.statement.reconcile:0
-#: field:account.bank.statement.reconcile,line_ids:0
-#: field:account.move,line_id:0
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
-#: model:ir.actions.act_window,name:account.action_move_line_form
-#: model:ir.ui.menu,name:account.menu_action_move_line_form
-msgid "Entries"
-msgstr "Vknjižbe"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-msgid "Debit Centralisation"
-msgstr "Skupna raba 'V breme'"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
-msgid "Confirm draft invoices"
-msgstr "Potrdi okvirne račune"
-
-#. module: account
-#: help:account.payment.term.line,days2:0
-msgid ""
-"Day of the month, set -1 for the last day of the current month. If it's "
-"positive, it gives the day of the next month. Set 0 for net days (otherwise "
-"it's based on the beginning of the month)."
-msgstr ""
-"Dan v mesecu, -1 za zadnji dan tekočega meseca. Če pozitiven, bo pomenil dan "
-"v naslednjem mesecu. izberite 0 za točno število dni (drugače se izračuna od "
-"začetka meseca)."
-
-#. module: account
-#: view:account.move:0
-msgid "Total Credit"
-msgstr "Skupaj dobro"
-
-#. module: account
-#: field:account.config.wizard,charts:0
-msgid "Charts of Account"
-msgstr "Kontni načrt"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_move_line_select
-msgid "Move line select"
-msgstr "Izberite knjižbo."
-
-#. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "Entry label"
-msgstr "Označba vknjižbe"
-
-#. module: account
-#: model:ir.model,name:account.model_account_model_line
-msgid "Account Model Entries"
-msgstr "Postavke modela konta"
-
-#. module: account
-#: field:account.tax.code,sum_period:0
-msgid "Period Sum"
-msgstr "Seštevek obdobja"
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Valuta konta"
 
 #. module: account
 #: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Compute Code (if type=code)"
-msgstr "Izračunaj stopnjo"
+msgid "Children Definition"
+msgstr "Definicija otroka"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Account Entry Line"
-msgstr "Vnosna vrstica konta"
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Zastarane terjatve do danes"
 
 #. module: account
-#: wizard_view:account.aged.trial.balance,init:0
-msgid "Aged Trial Balance"
-msgstr "Izpis po zapadlosti"
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Vključi usklajene vnose"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
-msgid "Recurrent Entries"
-msgstr "Ponavljajoče se knjižbe"
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr "Bilanca uspeha omogoča pregled dobička in izgube v enotnem dokumentu"
 
 #. module: account
-#: field:account.analytic.line,amount:0
-#: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
-msgid "Amount"
-msgstr "Znesek"
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr "Uvozi iz računa ali plačila"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
-#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
-#: model:ir.ui.menu,name:account.menu_third_party_ledger
-msgid "Partner Ledger"
-msgstr "Saldakonti"
-
-#. module: account
-#: field:product.template,supplier_taxes_id:0
-msgid "Supplier Taxes"
-msgstr "Davki dobavitelja"
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: view:account.move:0
@@ -288,130 +120,59 @@ msgid "Total Debit"
 msgstr "Skupaj breme"
 
 #. module: account
-#: rml:account.tax.code.entries:0
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
 msgstr "Računovodske knjižbe"
 
 #. module: account
-#: help:account.journal,view_id:0
-msgid ""
-"Gives the view used when writing or browsing entries in this journal. The "
-"view tell Open ERP which fields should be visible, required or readonly and "
-"in which order. You can create your own view for a faster encoding in each "
-"journal."
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
-msgid ""
-"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."
-msgstr ""
-
-#. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
-msgid "Fixed"
-msgstr "Stalno"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
-msgid "Overdue Payments"
-msgstr "Zamujena plačila"
-
-#. module: account
-#: wizard_view:account.account.balance.report,checktype:0
-#: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
-#: wizard_view:account.analytic.account.cost_ledger.report,init:0
-#: wizard_view:account.analytic.account.inverted.balance.report,init:0
-#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
-#: wizard_view:account.vat.declaration,init:0
-msgid "Select period"
-msgstr "Izberi obdobje"
-
-#. module: account
-#: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Izvor"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-msgid "Move Name"
-msgstr "Ime premika"
+#: view:account.account:0
+#: field:account.account,reconcile:0
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Reconcile"
+msgstr "Uskladi"
 
 #. module: account
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
 msgid "Reference"
 msgstr "Sklic"
 
 #. module: account
-#: wizard_view:account.subscription.generate,init:0
-msgid "Subscription Compute"
-msgstr "Izračun naročnine"
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "Izberi poslovno leto "
 
 #. module: account
-#: rml:account.central.journal:0
-msgid "Account Num."
-msgstr "Številka konta"
-
-#. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "Delta Debit"
-msgstr "Razlika breme"
-
-#. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
-#: field:account.move.line,account_tax_id:0
-msgid "Tax"
-msgstr "Davek"
-
-#. module: account
-#: rml:account.general.journal:0
-msgid "Debit Trans."
-msgstr "Transakcije v breme"
-
-#. module: account
-#: field:account.analytic.line,account_id:0
-#: field:account.invoice.line,account_analytic_id:0
-#: field:account.move.line,analytic_account_id:0
-#: field:report.hr.timesheet.invoice.journal,account_id:0
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
-msgid "Tax on Children"
-msgstr "Izračunaj davke po podrejenih zapisih"
-
-#. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
-#: field:account.journal,name:0
-msgid "Journal Name"
-msgstr "Naziv dnevnika"
-
-#. module: account
-#: view:account.payment.term:0
-msgid "Description on invoices"
-msgstr "Opis na računih"
-
-#. module: account
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
-
-#. module: account
-#: field:account.bank.statement.reconcile,total_entry:0
-msgid "Total entries"
-msgstr "Vknjižbe skupaj"
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -419,31 +180,15 @@ msgstr "Vknjižbe skupaj"
 msgid "Account Source"
 msgstr "Vir konta"
 
-#. module: account
-#: field:account.journal,update_posted:0
-msgid "Allow Cancelling Entries"
-msgstr "Omogoči storniranje vknjižb"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_paymentorderbank0
-#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
-msgid "Payment Reconcilation"
-msgstr "Zapiranje plačil"
-
-#. module: account
-#: model:account.journal,name:account.expenses_journal
-msgid "Journal de frais"
-msgstr "Dnevnik provizij"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
 msgstr "Vsa stroškovna mesta"
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Date:"
-msgstr "Datum:"
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Računi narejeni v zadnjih 15-ih dneh"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -451,108 +196,12 @@ msgid "Negative"
 msgstr "Negativno"
 
 #. module: account
-#: rml:account.partner.balance:0
-msgid "(Account/Partner) Name"
-msgstr "Ime partnerja"
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Contra"
-msgstr "Nasproti"
-
-#. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.subscription:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree13
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
-msgid "Unpaid Supplier Refunds"
-msgstr "Neplačani dobropisi dobaviteljev"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Special Computation"
-msgstr "Poseben izračun"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
-msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Na podlagi osnutka potrdite izpisek z ali brez zapiranja plačil"
-
-#. module: account
-#: wizard_view:account.move.bank.reconcile,init:0
-#: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
-#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
-msgid "Bank reconciliation"
-msgstr "Uskladitev izpiska"
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
-#: field:account.subscription,ref:0
-msgid "Ref"
-msgstr "Sklic"
-
-#. module: account
-#: field:account.tax.template,type_tax_use:0
-msgid "Tax Use In"
-msgstr "Uporaba davka v"
-
-#. module: account
-#: help:account.tax.template,include_base_amount:0
+#: help:account.analytic.journal,type:0
 msgid ""
-"Set if the amount of tax must be included in the base amount before "
-"computing the next taxes."
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
 msgstr ""
-"Izberite če je potrebno davek vključiti v osnovo pred obračunom naslednjih "
-"davkov."
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr "Periodična obdelava"
-
-#. module: account
-#: view:report.hr.timesheet.invoice.journal:0
-msgid "Analytic Entries Stats"
-msgstr "Statistika stroškovnih mest"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
-msgid "Tax Code Templates"
-msgstr "Predloge davčnih šifer"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Supplier invoice"
-msgstr "Račun dobavitelja"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_reconcilepaid0
-#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
-msgid "Reconcile Paid"
-msgstr "Zapri plačano"
-
-#. module: account
-#: wizard_field:account.chart,init,target_move:0
-msgid "Target Moves"
-msgstr "Ciljni premik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -561,77 +210,34 @@ msgid "Tax Templates"
 msgstr "Predloge davka"
 
 #. module: account
-#: field:account.invoice,reconciled:0
-msgid "Paid/Reconciled"
-msgstr "Plaćano/usklajeno"
+#: view:account.invoice.report:0
+msgid "supplier"
+msgstr "dobavitelj"
 
 #. module: account
-#: field:account.account.type,close_method:0
-msgid "Deferral Method"
-msgstr "Metoda zaključevanja"
-
-#. module: account
-#: field:account.tax.template,include_base_amount:0
-msgid "Include in Base Amount"
-msgstr "Vključiti v osnovo"
-
-#. module: account
-#: field:account.tax,ref_base_code_id:0
-#: field:account.tax.template,ref_base_code_id:0
-msgid "Refund Base Code"
-msgstr "Šifra osnove za vračilo"
-
-#. module: account
-#: view:account.invoice.line:0
-msgid "Line"
-msgstr "Postavka"
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-msgid "J.C. or Move name"
+#: model:account.journal,name:account.refund_expenses_journal
+msgid "Expenses Credit Notes Journal - (test)"
 msgstr ""
 
-#. module: account
-#: selection:account.tax,applicable_type:0
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr "Dejanski"
-
-#. module: account
-#: help:account.payment.term.line,days:0
-msgid ""
-"Number of days to add before computation of the day of month.If Date=15/01, "
-"Number of Days=22, Day of Month=-1, then the due date is 28/02."
-msgstr ""
-"Število dni, ki jih je potrebno dodati pred izračunom dneva v mesecu. Če je "
-"Datum=15.1, Število dni=22, Dan v mesecu=-1, potem to pomeni, da je datum "
-"zapadlosti 28.2.."
-
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
 msgstr "account.tax"
 
 #. module: account
-#: rml:account.central.journal:0
-msgid "Printing Date"
-msgstr "Datum izpisa"
-
-#. module: account
-#: rml:account.general.ledger:0
-msgid "Mvt"
-msgstr "Premik"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
-#: model:ir.ui.menu,name:account.menu_aged_trial_balance
-msgid "Aged Partner Balance"
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
 msgstr ""
+"Za ta datum %s še ni ustvarjeno obdobje !\n"
+"Prosim ustvari poslovno leto"
 
 #. module: account
-#: view:account.journal:0
-msgid "Entry Controls"
-msgstr "Mehanizem vknjiženja"
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr ""
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -643,123 +249,72 @@ msgstr ""
 "manjših k večjim."
 
 #. module: account
-#: wizard_view:account.analytic.account.chart,init:0
-#: wizard_view:account.analytic.line,init:0
-msgid "(Keep empty to open the current situation)"
-msgstr "(Postite prazno da se odpre terenutno stanje)"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account
-msgid "Accounts Fiscal Mapping"
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,contact_id:0
-msgid "Contact"
-msgstr "Stik"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
 
 #. module: account
-#: selection:account.model.line,date:0
-#: selection:account.model.line,date_maturity:0
-msgid "Partner Payment Term"
-msgstr "Partnerjevi plačilni pogoji"
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
 
 #. module: account
-#: view:account.move.reconcile:0
-msgid "Account Entry Reconcile"
-msgstr "Uskladi vknjižbo"
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
 
 #. module: account
-#: wizard_button:account.move.bank.reconcile,init,open:0
-msgid "Open for bank reconciliation"
-msgstr "Odpri za uskladitev z izpiski"
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "V zaprtem dnevniku ne morete dodajati/spreminjati postavk."
 
 #. module: account
-#: field:account.invoice.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr ""
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
-#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
-msgid "Write-Off amount"
-msgstr "Znesek odpisa"
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+#: model:ir.actions.act_window,name:account.action_view_account_use_model
+#: model:ir.ui.menu,name:account.menu_action_manual_recurring
+msgid "Manual Recurring"
+msgstr ""
 
 #. module: account
-#: help:account.fiscalyear,company_id:0
-msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr "Postite prazno, če poslovno leto pripada večim podjetjem"
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr "Zapri poslovno leto"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_analytic_accounting
-msgid "Analytic Accounting"
-msgstr "Analitično knjigovodstvo"
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr "Dovoli odpis"
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Sub-Total :"
-msgstr "Vmesna vsota:"
-
-#. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
-#: model:ir.ui.menu,name:account.next_id_41
-msgid "Analytic Entries"
-msgstr "Analitične vknjižbe"
-
-#. module: account
-#: selection:account.subscription,period_type:0
-msgid "month"
-msgstr "mesec"
-
-#. module: account
-#: field:account.analytic.account,partner_id:0
-msgid "Associated Partner"
-msgstr "Pridružen partner"
-
-#. module: account
-#: field:account.invoice,comment:0
-msgid "Additional Information"
-msgstr "Dodatni podatki"
-
-#. module: account
-#: selection:account.invoice,type:0
-msgid "Customer Refund"
-msgstr "Dobropis kupcu"
-
-#. module: account
-#: wizard_view:account.analytic.account.chart,init:0
+#: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
 msgstr "Izberite obdobje analize"
 
-#. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
-#: field:account.tax.template,ref_tax_sign:0
-#: field:account.tax.template,tax_sign:0
-msgid "Tax Code Sign"
-msgstr "Predznak davčne stopnje"
-
-#. module: account
-#: help:res.partner,credit:0
-msgid "Total amount this customer owes you."
-msgstr "Skupni znesek, ki vam ga dolguje ta stranka."
-
 #. module: account
 #: view:account.move.line:0
 msgid "St."
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_tax_code_line_open
-msgid "account.move.line"
-msgstr "account.move.line"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_supplieranalyticcost0
-msgid "Analytic Invoice"
-msgstr "Analitični račun"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -767,15 +322,26 @@ msgid "Field Name"
 msgstr "Naziv polja"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
-msgid "Sign for parent"
-msgstr "Podpiši za nadrejenega"
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,end_journal_period_id:0
-msgid "End of Year Entries Journal"
-msgstr "Dnevnik knjižb za zaključek leta"
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
 
 #. module: account
 #: view:product.product:0
@@ -784,110 +350,34 @@ msgid "Purchase Properties"
 msgstr "Lastnosti nakupa"
 
 #. module: account
-#: model:process.node,note:account.process_node_paymententries0
-msgid "Can be draft or validated"
-msgstr "Lahko je osnutek ali preverjen"
-
-#. module: account
-#: wizard_button:account.invoice.pay,init,reconcile:0
-msgid "Partial Payment"
-msgstr "Delno plačilo"
-
-#. module: account
-#: wizard_view:account_use_models,create:0
-msgid "Move Lines Created."
-msgstr "Ustvarejne postavke prenosa."
-
-#. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
-msgid "Status"
-msgstr "Stanje"
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Period to"
-msgstr "Obdobje do"
-
-#. module: account
-#: field:account.account.type,partner_account:0
-msgid "Partner account"
-msgstr "Partnerjev račun"
-
-#. module: account
-#: wizard_view:account.subscription.generate,init:0
-msgid "Generate entries before:"
-msgstr "Ustvari vknjižbe pred:"
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
-#: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
-msgid "Cost Ledger"
-msgstr "Stroškovna glavna knjiga"
-
-#. module: account
-#: wizard_view:account.account.balance.report,checktype:0
-#: wizard_view:account.general.ledger.report,checktype:0
-#: wizard_view:account.partner.balance.report,init:0
-#: wizard_view:account.third_party_ledger.report,init:0
-msgid "(Keep empty for all open fiscal years)"
-msgstr "(Prazno za vsa odprta davčna leta)"
-
-#. module: account
-#: field:account.invoice,move_lines:0
-msgid "Move Lines"
-msgstr "Postavke knjižb"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
-#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
-msgid "Account cost and revenue by journal"
-msgstr "Odhodki in prihodki po dnevnikih"
-
-#. module: account
-#: help:account.account.template,user_type:0
+#: help:account.account.type,sign:0
 msgid ""
-"These types are defined according to your country. The type contain more "
-"information about the account and it's specificities."
+"Allows you to change the sign of the balance amount displayed in the "
+"reports, so that you can see positive figures instead of negative ones in "
+"expenses accounts."
 msgstr ""
-"Tipi so določeni glede na državo. Tip vsebuje več informacij o kontu in "
-"njegovih posebnostih."
 
 #. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "6"
-msgstr "6"
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr "junij"
 
 #. module: account
-#: model:ir.ui.menu,name:account.next_id_30
-msgid "Bank Reconciliation"
-msgstr "Uskladitev z izpiski"
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_account_template
-msgid "Templates for Accounts"
-msgstr "Predloge za konte"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
-#: model:ir.model,name:account.model_account_analytic_account
-#: model:ir.ui.menu,name:account.account_analytic_def_account
-msgid "Analytic Accounts"
-msgstr "Stroškovna mesta"
-
-#. module: account
-#: wizard_view:account.print.journal.report,init:0
-#: model:ir.actions.wizard,name:account.wizard_print_journal
-#: model:ir.ui.menu,name:account.menu_print_journal
-msgid "Print Journal"
-msgstr "Natisni dnevnik"
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -901,89 +391,31 @@ msgid "Creation date"
 msgstr "Datum nastanka"
 
 #. module: account
-#: wizard_button:account.invoice.refund,init,cancel_invoice:0
-msgid "Cancel Invoice"
-msgstr "Prekliči račun"
-
-#. module: account
-#: field:account.journal.column,required:0
-msgid "Required"
-msgstr "Obvezno"
-
-#. module: account
-#: field:product.category,property_account_expense_categ:0
-#: field:product.template,property_account_expense:0
-msgid "Expense Account"
-msgstr "Konto stroškov"
-
-#. module: account
-#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
-msgid "Write-Off Journal"
-msgstr "Dnevnik odpisov"
-
-#. module: account
-#: field:account.model.line,amount_currency:0
-#: field:account.move.line,amount_currency:0
-msgid "Amount Currency"
-msgstr "Valuta zneska"
-
-#. module: account
-#: field:account.chart.template,property_account_expense_categ:0
-msgid "Expense Category Account"
-msgstr "Konto vrste stroškov"
-
-#. module: account
-#: wizard_field:account.fiscalyear.close,init,fy2_id:0
-msgid "New Fiscal Year"
-msgstr "Novo poslovno leto"
-
-#. module: account
-#: help:account.tax,tax_group:0
-msgid ""
-"If a default tax is given in the partner it only overrides taxes from "
-"accounts (or products) in the same group."
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr "Valuta za vnos izkaza"
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
 msgstr "Poslovno leto za odpret"
 
 #. module: account
-#: view:account.config.wizard:0
-msgid "Select Chart of Accounts"
-msgstr "Izberite kontni načrt"
-
-#. module: account
-#: field:account.analytic.account,quantity:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
-#: field:account.move.line,quantity:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,date_to:0
-#: wizard_field:account.general.ledger.report,checktype,date_to:0
-#: wizard_field:account.partner.balance.report,init,date2:0
-#: wizard_field:account.third_party_ledger.report,init,date2:0
-msgid "End date"
-msgstr "Datum konca"
-
-#. module: account
-#: field:account.invoice.tax,base_amount:0
-msgid "Base Code Amount"
-msgstr "Znesek osnove"
-
-#. module: account
-#: help:account.journal,user_id:0
-msgid "The user responsible for this journal"
-msgstr "Uporabnik, odgovoren za ta denevnik"
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -991,151 +423,20 @@ msgid "Default Debit Account"
 msgstr "Privzeti breme konto"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Entries by Statements"
-msgstr "Vknjižbe po izpiskih"
+#: view:account.move:0
+msgid "Total Credit"
+msgstr "Skupaj dobro"
 
 #. module: account
-#: model:process.transition,name:account.process_transition_analyticinvoice0
-msgid "analytic Invoice"
-msgstr "Analitični račun"
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr "Pozitiven"
 
 #. module: account
-#: wizard_field:account.automatic.reconcile,init,period_id:0
-#: field:account.bank.statement,period_id:0
-#: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
-#: wizard_field:account.general.journal.report,init,period_id:0
-#: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
-#: wizard_field:account.move.journal,init,period_id:0
-#: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
-#: wizard_field:account.print.journal.report,init,period_id:0
-#: field:account.subscription,period_nbr:0
-msgid "Period"
-msgstr "Obdobje"
-
-#. module: account
-#: rml:account.partner.balance:0
-msgid "Grand total"
-msgstr "Skupni seštevek"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_accounting
-msgid "Financial Accounting"
-msgstr "Finačno računovodstvo"
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Net Total:"
-msgstr "Skupaj (brez davkov):"
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
-#: field:account.fiscal.position.account,position_id:0
-#: field:account.fiscal.position.account.template,position_id:0
-#: field:account.fiscal.position.tax,position_id:0
-#: field:account.fiscal.position.tax.template,position_id:0
-#: view:account.fiscal.position.template:0
-#: field:account.invoice,fiscal_position:0
-#: model:ir.model,name:account.model_account_fiscal_position
-#: field:res.partner,property_account_position:0
-msgid "Fiscal Mapping"
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
 msgstr ""
 
-#. module: account
-#: field:account.analytic.line,product_uom_id:0
-#: field:account.move.line,product_uom_id:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: account
-#: wizard_field:account.third_party_ledger.report,init,page_split:0
-msgid "One Partner Per Page"
-msgstr "En partner na stran"
-
-#. module: account
-#: field:account.account,child_parent_ids:0
-#: field:account.account.template,child_parent_ids:0
-msgid "Children"
-msgstr "Otroci"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax
-msgid "Taxes Fiscal Mapping"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
-msgid "New Supplier Invoice"
-msgstr "Nov račun dobavitelja"
-
-#. module: account
-#: wizard_field:account.invoice.pay,init,amount:0
-msgid "Amount paid"
-msgstr "Plačan znesek"
-
-#. module: account
-#: selection:account.invoice,type:0
-#: model:process.transition,name:account.process_transition_customerinvoice0
-#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
-msgid "Customer Invoice"
-msgstr "Izdan račun"
-
-#. module: account
-#: wizard_view:account.open_closed_fiscalyear,init:0
-msgid "Choose Fiscal Year"
-msgstr "Izberi poslovno leto"
-
-#. module: account
-#: field:account.sequence.fiscalyear,sequence_main_id:0
-msgid "Main Sequence"
-msgstr "Glavno zaporedje"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
-#: model:ir.ui.menu,name:account.account_analytic_journal_print
-msgid "Print Analytic Journals"
-msgstr "Izpiši dnevnik analitike"
-
-#. module: account
-#: rml:account.tax.code.entries:0
-msgid "Voucher Nb"
-msgstr "Kupon Nb"
-
-#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid ""
-"The sequence field is used to order the payment term lines from the lowest "
-"sequences to the higher ones"
-msgstr ""
-"Polje zaporedne številke se uporablja za naraščajoče razvrstitev postavk "
-"plačilnih pogojev"
-
-#. module: account
-#: field:account.bank.statement.reconcile,total_new:0
-msgid "Total write-off"
-msgstr "Odpis skupaj"
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Koda izračuna za davke v cenah"
-
-#. module: account
-#: view:account.invoice.tax:0
-#: model:ir.actions.act_window,name:account.action_tax_code_list
-#: model:ir.ui.menu,name:account.menu_action_tax_code_list
-msgid "Tax codes"
-msgstr "Davčne stopnje"
-
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
@@ -1143,53 +444,2323 @@ msgstr "Davčne stopnje"
 msgid "Chart Template"
 msgstr "Predloga kontnega načrta"
 
-#. module: account
-#: field:account.chart.template,property_account_income_categ:0
-msgid "Income Category Account"
-msgstr "Konto kategorije prihodkov"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.analytic_account_form
-#: model:ir.ui.menu,name:account.account_analytic_form
-msgid "New Analytic Account"
-msgstr "Nov analitičen konto"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
-msgid "Fiscal Mapping Templates"
-msgstr ""
-
-#. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena enote"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-msgid "Period from :"
-msgstr "Obdobje od:"
-
-#. module: account
-#: model:ir.model,name:account.model_wizard_multi_charts_accounts
-msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
-
-#. module: account
-#: model:account.journal,name:account.sales_journal
-msgid "Journal de vente"
-msgstr "Dnevnik prodaje"
-
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
 msgstr "Znesek izražen v poljubni drugi valuti"
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit. OpenERP creates automatically one journal entry per "
+"accounting document: invoices, refund, supplier payment, bank statements, "
+"etc."
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it comes to 'Printed' state. When all transactions are done, it comes in "
+"'Done' state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.bs.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.pl.report,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "Davek od nabave"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr "Neusklajene transakcije"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr "Preslikava davkov"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr "Zapri poslovno leto"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Vse"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
+"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr "Zaporedja"
+
 #. module: account
 #: view:account.fiscal.position.template:0
-#: field:account.fiscal.position.template,name:0
-msgid "Fiscal Mapping Template"
+msgid "Taxes Mapping"
+msgstr "Preslikava davkov"
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr "Znesek davčne stopnje"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr "Zapri obdobje"
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr "Obdobje za otvoritve"
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Napaka! Ne morete krerati rekurzivnih kontov."
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr "Znova odpri"
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr "prosim potrdite knjiženje"
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr "Odstotek"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr "Načrti"
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:0
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr "Sklicna številka partnerja na tem računu."
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr "Preklic uskladitve"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr "dni"
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr "Izračun"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry ! Please note that you "
+"can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr "Načrt davkov"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr "Ustvari tromesečna obdobja"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr "Zapadlo"
+
+#. module: account
+#: report:account.overdue:0
+msgid ""
+"Exception made of a mistake of our side, it seems that the following bills "
+"stay unpaid. Please, take appropriate measures in order to carry out this "
+"payment in the next 8 days."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Skupni znesek"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr "Zgoščeno"
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.entries.report:0
+#: view:account.invoice.report:0
+#: view:account.move.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr "Postavka prenosa"
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr "Oznaka"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Ni analitičnega dnevnika!"
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_reserve_and_surplus_account:0
+#: field:res.company,property_reserve_and_surplus_account:0
+msgid "Reserve and Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Teden v letu"
+
+#. module: account
+#: field:account.bs.report,display_type:0
+#: field:account.pl.report,display_type:0
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr "Ležeče"
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Bilanzkonten - Passiva - Kapitalkonten"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account,user_type:0
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr "V sporu"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
+#: model:ir.ui.menu,name:account.journal_cash_move_lines
+msgid "Cash Registers"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.move.voucher:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr "-"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr "Začetek obdobja"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr "Davčna stopnja"
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr "Prenos te postavke vknjižbe"
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr "Številka transakcije"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr "Drugi"
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr "Davki"
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Predloge za konte"
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr "Uskladi vknjižbe"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr "Zamujena plačila"
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr "Možnosti poročila"
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr "Bančni izpisek"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr "Lastnik bančnega računa"
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr "Konto terjatev"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr "Glavni dnevnik"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr "S stanjem različnim od 0"
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr "Ustvari vknjižbe"
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr "Največji znesek odpisa"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr "Izračunaj davke"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr "# mest (števila)"
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Entry encoding"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr "Dobropisi dobaviteljev"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"Customer Invoices allows you create and manage invoices issued to your "
+"customers. OpenERP generates draft of invoices automatically so that you "
+"only have to confirm them before sending them to your customers."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Zaprt"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr "Usklajene transakcije"
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr "Stolpci"
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr "."
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr "in dnevniki"
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr "Skupine"
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr "Neobdavčeno"
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr "Konto obveznosti"
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr "Postavke izpiska"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr "Splošni konto"
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr "Mejni zapadli znesek"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "Vmesna vsota:"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr "Vključi začetna stanja"
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr "Letni seštevek"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr "Terjatve in obveznosti"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Ref. :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr "Sklic kupca"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr "Znesek v dobro"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr "Analitični konto"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr "Veljavno"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr "/"
+
+#. module: account
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr "Definicija davka"
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr ""
+
+#. module: account
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+msgid "Receivable Accounts"
+msgstr "Konti terjatev"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Neobdavčen znesek"
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr "Prekliči uskladitev vknjižb"
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr "Delne postavke vknjižbe"
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr "Poslovno leto"
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr "Odprte postavke"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"A vendor refund is a credit note from your supplier indicating that he "
+"refunds part or totality of the invoice sent to you."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.close_journal
+msgid "End of Year"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr "Predračun"
+
+#. module: account
+#: code:addons/account/installer.py:0
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr "V teku"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr "Konto prijhodkov"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Lastnosti računovodstva"
+
+#. module: account
+#: report:account.journal.period.print:0
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted By"
+msgstr "Vnosi urejeni po"
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr "Poslovno leto"
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.bs.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.pl.report,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr "Vknjižba"
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr "Glavno zaporedje"
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr "Plačilni pogoj"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr "Okljukaj to polje"
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr "Filtri"
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr "Davčna stopnja"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr "Osnovna stopnja"
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr "Predznak osnove"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr "Skupna raba 'V breme'"
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Postavke modela konta"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr "Davki dobavitelja"
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr "Izberi obdobje"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr "Ime premika"
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the "
+"partner."
+msgstr ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Davek"
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+#: report:account.overdue:0
+msgid "Date:"
+msgstr "Datum:"
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr "Poseben izračun"
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr "Uskladitev izpiska"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr "Sklic"
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr "Plaćano/usklajeno"
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr "Šifra osnove za vračilo"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr "Dejanski"
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr "Nadrejeni davčni konto"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"given a period and a journal, the sum of debit will always be equal to the "
+"sum of credit, so there is no point to display it"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
+msgid "New Company Financial Setting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr "Davčne stopnje"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr "Obdobje do"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "Pričakovano stanje (%.2f) je različno od izračunanega (%.2f)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Number:"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Številka sklica"
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr "Obvezno"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr "Konto stroškov"
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+"Pustite prazno, če želite uporabiti obdobje potrditve datum (računa) ."
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr "Znesek osnove"
+
+#. module: account
+#: model:account.account.type,name:account.account_type_view
+msgid "Ansicht"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr "Finačno računovodstvo"
+
+#. module: account
+#: view:account.pl.report:0
+#: model:ir.ui.menu,name:account.menu_account_pl_report
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr "Davčna pozicija"
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Entries"
+msgstr "Analitične vknjižbe"
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr "Izdan račun"
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+"Izberite če je potrebno davek vključiti v osnovo pred obračunom naslednjih "
+"davkov."
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr "Uporabnik, odgovoren za ta denevnik"
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
 msgstr ""
 
 #. module: account
@@ -1198,25 +2769,9 @@ msgid "Terms"
 msgstr "Pogoji"
 
 #. module: account
-#: rml:account.vat.declaration:0
-msgid "Tax Report"
-msgstr "Davčno poročilo"
-
-#. module: account
-#: wizard_button:account.analytic.account.chart,init,open:0
-#: wizard_button:account.chart,init,open:0
-msgid "Open Charts"
-msgstr "Odpri načrte"
-
-#. module: account
-#: wizard_view:account.fiscalyear.close.state,init:0
-msgid "Are you sure you want to close the fiscal year ?"
-msgstr "Ali ste prepričani da želite zapreti davčno leto?"
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Bank Receipt"
-msgstr "Bančni prejemek"
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
@@ -1228,16 +2783,6 @@ msgstr "Bančni račun"
 msgid "Tax Template List"
 msgstr "Seznam davčnih predlog"
 
-#. module: account
-#: model:process.transition,name:account.process_transition_invoiceimport0
-msgid "Invoice import"
-msgstr "Uvoz računa"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
-msgid "Standard entry"
-msgstr "Običajna vknjižba"
-
 #. module: account
 #: help:account.account,currency_mode:0
 msgid ""
@@ -1248,166 +2793,68 @@ msgid ""
 "always use the rate at date."
 msgstr ""
 
-#. module: account
-#: field:account.account,company_currency_id:0
-msgid "Company Currency"
-msgstr "Valute družba"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Template Account Fiscal Mapping"
-msgstr ""
-
-#. module: account
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
-msgstr "Nadrejeni analitični konto"
-
-#. module: account
-#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
-msgid "Reconcile With Write-Off"
-msgstr "Zapri z odpisom"
-
-#. module: account
-#: field:account.move.line,tax_amount:0
-msgid "Tax/Base Amount"
-msgstr "Znesek davka/osnove"
-
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
 msgstr "Število mest za konto"
 
-#. module: account
-#: field:account.bank.statement,balance_end_real:0
-msgid "Ending Balance"
-msgstr "Končni saldo"
-
-#. module: account
-#: view:product.product:0
-msgid "Purchase Taxes"
-msgstr "Davek od nabave"
-
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
 msgstr "Naziv postavke"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-msgid "Fixed Amount"
-msgstr "Določen znesek"
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "Analytic Credit"
-msgstr "Dobro - analitično"
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
 
 #. module: account
-#: field:account.move.line,reconcile_partial_id:0
-#: wizard_button:account.move.line.reconcile,init_partial,partial:0
-msgid "Partial Reconcile"
-msgstr "Delno uskladi"
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
 
 #. module: account
-#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
-msgid "Not reconciled transactions"
-msgstr "Neusklajene transakcije"
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
-#: field:account.fiscal.position.template,tax_ids:0
-msgid "Tax Mapping"
-msgstr "Preslikava davkov"
-
-#. module: account
-#: view:account.config.wizard:0
-msgid "Continue"
-msgstr "Nadaljuj"
-
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: account
-#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
-#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
 msgstr "Konto odpisov"
 
 #. module: account
 #: field:account.model.line,model_id:0
+#: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
 #. module: account
-#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
-#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
-msgid "Close a Fiscal Year"
-msgstr "Zapri poslovno leto"
-
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised counterpart"
-msgstr "Skupen protikonto"
-
-#. module: account
-#: view:wizard.company.setup:0
-msgid "Message"
-msgstr "Sporočilo"
-
-#. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Select invoices you want to pay and manages advances"
-msgstr "Izbere račune, ki jih želite plačati in upravlja z avansi"
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.entries.report,type:0
 msgid "View"
 msgstr "Pogled:"
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
-#: selection:account.tax,type_tax_use:0
-#: selection:account.tax.template,type_tax_use:0
-msgid "All"
-msgstr "Vse"
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "BNK"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
-#: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
 msgstr "Analitične vrstice"
 
-#. module: account
-#: help:account.tax,type:0
-msgid "The computation method for the tax amount."
-msgstr "Metoda izračuna za znesek davka"
-
-#. module: account
-#: model:process.node,note:account.process_node_accountingentries0
-#: model:process.node,note:account.process_node_supplieraccountingentries0
-msgid "Validated accounting entries."
-msgstr "Potrjene knjižbe"
-
-#. module: account
-#: wizard_view:account.move.line.unreconcile,init:0
-#: wizard_view:account.reconcile.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
-"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
-
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
@@ -1419,149 +2866,43 @@ msgid "Customer Credit"
 msgstr "Dobro - Stranka"
 
 #. module: account
-#: field:account.invoice,tax_line:0
-msgid "Tax Lines"
-msgstr "Davčne postavke"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Vzorec davčnih šifer"
 
 #. module: account
-#: field:ir.sequence,fiscal_ids:0
-msgid "Sequences"
-msgstr "Zaporedja"
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_type_form
-#: model:ir.ui.menu,name:account.menu_action_account_type_form
-msgid "Account Types"
-msgstr "Vrste kontov"
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
 
 #. module: account
-#: wizard_field:account.automatic.reconcile,init,journal_id:0
-#: field:account.bank.statement,journal_id:0
-#: wizard_field:account.central.journal.report,init,journal_id:0
-#: wizard_field:account.general.journal.report,init,journal_id:0
-#: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
-#: field:account.move,journal_id:0
-#: wizard_field:account.move.bank.reconcile,init,journal_id:0
-#: wizard_field:account.move.journal,init,journal_id:0
-#: field:account.move.line,journal_id:0
-#: wizard_field:account.move.validate,init,journal_id:0
-#: wizard_field:account.print.journal.report,init,journal_id:0
-#: field:fiscalyear.seq,journal_id:0
-#: model:ir.actions.report.xml,name:account.account_journal
-#: model:ir.model,name:account.model_account_journal
-#: wizard_field:populate_statement_from_inv,init,journal_id:0
-#: field:report.hr.timesheet.invoice.journal,journal_id:0
-msgid "Journal"
-msgstr "Dnevnik"
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
-msgid "Child Accounts"
-msgstr "Podrejeni konti"
-
-#. module: account
-#: field:account.account,check_history:0
-msgid "Display History"
-msgstr "Zgodovina prikazov"
-
-#. module: account
-#: wizard_field:account.third_party_ledger.report,init,date1:0
-msgid "        Start date"
-msgstr "        Začetni datum"
-
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,display_account:0
-#: wizard_field:account.general.ledger.report,checktype,display_account:0
-msgid "Display accounts "
-msgstr "Prikaži konte "
-
-#. module: account
-#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
-msgid "Statement reconcile line"
-msgstr "Postavka uskladitve izpiska"
-
-#. module: account
-#: view:account.tax:0
 #: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Pustite prazno v primeru konta prihodkov"
+msgid "Tax Declaration"
+msgstr "Davčna napoved"
 
 #. module: account
-#: view:account.bank.statement.reconcile:0
-#: field:account.bank.statement.reconcile,line_new_ids:0
-#: wizard_view:account.move.line.reconcile,init_full:0
-#: wizard_view:account.move.line.reconcile,init_partial:0
-msgid "Write-Off"
-msgstr "Odpis"
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
 
 #. module: account
-#: help:account.invoice,partner_bank:0
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
 msgid ""
-"The partner bank account to pay\n"
-"Keep empty to use the default"
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Partnerjev bančni račun\n"
-"Pustite prazno za privzeti račun"
-
-#. module: account
-#: field:res.partner,debit:0
-msgid "Total Payable"
-msgstr "Skupaj obveznosti"
-
-#. module: account
-#: wizard_button:account.fiscalyear.close.state,init,close:0
-msgid "Close states"
-msgstr "Zaprta stanja"
-
-#. module: account
-#: model:ir.model,name:account.model_wizard_company_setup
-msgid "wizard.company.setup"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
-msgid "account.analytic.line.extended"
-msgstr "account.analytic.line.extended"
-
-#. module: account
-#: field:account.journal,refund_journal:0
-msgid "Refund Journal"
-msgstr "Dnevnik vračil"
-
-#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Income"
-msgstr "Prihodki"
-
-#. module: account
-#: selection:account.bank.statement.line,type:0
-msgid "Supplier"
-msgstr "Dobavitelj"
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: account
-#: field:account.invoice.tax,tax_amount:0
-msgid "Tax Code Amount"
-msgstr "Znesek davčne stopnje"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Positive"
-msgstr "Pozitiven"
-
-#. module: account
-#: wizard_view:account.general.journal.report,init:0
-#: model:ir.actions.wizard,name:account.wizard_general_journal
-#: model:ir.ui.menu,name:account.menu_general_journal
-msgid "Print General Journal"
-msgstr "Natisni splošni dnevnik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1569,49 +2910,29 @@ msgstr "Natisni splošni dnevnik"
 msgid "Chart of Accounts Templates"
 msgstr "Predloge kontnih načrtov"
 
-#. module: account
-#: field:account.invoice,move_id:0
-msgid "Invoice Movement"
-msgstr "Prenos računa"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-#: model:ir.ui.menu,name:account.menu_wizard
-#: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
 msgstr "Generiraj kontni načrt iz predloge"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_finance_legal_statement
-msgid "Legal Statements"
-msgstr "Pravna izjava"
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
 
 #. module: account
-#: field:account.tax.code,parent_id:0
-#: field:account.tax.code.template,parent_id:0
-msgid "Parent Code"
-msgstr "Stopnja naddavka"
-
-#. module: account
-#: wizard_button:account.move.line.reconcile.select,init,open:0
-msgid "Open for reconciliation"
-msgstr "Odpri za uskladitev"
-
-#. module: account
-#: model:account.journal,name:account.bilan_journal
-msgid "Journal d'ouverture"
-msgstr "Dnevnik otvoritve"
-
-#. module: account
-#: selection:account.tax,tax_group:0
-#: selection:account.tax.template,tax_group:0
-msgid "VAT"
-msgstr "DDV"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-msgid "Account n°"
-msgstr "Konto št."
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
@@ -1620,22 +2941,40 @@ msgid "Keep empty to use the expense account"
 msgstr "Pusti prazno v primeru stroškovnega konta"
 
 #. module: account
-#: wizard_field:account.automatic.reconcile,init,account_ids:0
-msgid "Account to reconcile"
-msgstr "Konto za uskladit"
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.bs.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: field:account.vat.declaration,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr "Dnevniki"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
-#: field:account.move.line,partner_id:0
-msgid "Partner Ref."
-msgstr "Sklic partnerja"
-
-#. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
-msgid "Receivable and Payable Accounts"
-msgstr "Konti terjatev in obveznosti"
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
@@ -1645,42 +2984,25 @@ msgstr "Postavke naročnine"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
+#: view:account.journal:0
 #: selection:account.journal,type:0
+#: view:account.model:0
 #: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
 msgstr "Nabava"
 
 #. module: account
-#: view:account.analytic.line:0
-msgid "Total quantity"
-msgstr "Skupna količina"
+#: model:ir.actions.act_window,name:account.action_account_installer
+msgid "Accounting Application Configuration"
+msgstr ""
 
 #. module: account
-#: field:account.invoice,date_due:0
-msgid "Due Date"
-msgstr "Zapade dne"
-
-#. module: account
-#: wizard_view:account.period.close,init:0
-#: wizard_button:account.period.close,init,close:0
-msgid "Close Period"
-msgstr "Zapri obdobje"
-
-#. module: account
-#: rml:account.overdue:0
-msgid "Due"
-msgstr "Zapadlo"
-
-#. module: account
-#: rml:account.journal.period.print:0
-msgid "Third party"
-msgstr "Tretja stanka"
-
-#. module: account
-#: view:account.journal:0
-msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Dovoljene vrste kontov (prazno - brez kontrole)"
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Računovodska pregledna plošča"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -1688,179 +3010,81 @@ msgid "Starting Balance"
 msgstr "Začetni saldo"
 
 #. module: account
-#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
-#: view:account.journal.period:0
-#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
-#: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
-msgid "Journals"
-msgstr "Dnevniki"
-
-#. module: account
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Max Qty:"
-msgstr "Največja količina:"
-
-#. module: account
-#: wizard_button:account.invoice.refund,init,refund:0
-msgid "Refund Invoice"
-msgstr "Dobropis"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Partner Defined !"
+msgstr "Partner ni izbran!"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
-#: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
 msgstr "Zapri obdobje"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
-msgid "Costs & Revenues"
-msgstr "Odhodki in prihodki"
-
-#. module: account
-#: constraint:account.account:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "Napaka! Ne morete krerati rekurzivnih kontov."
-
-#. module: account
-#: rml:account.tax.code.entries:0
-msgid "Account Number"
-msgstr "Številka konta"
-
-#. module: account
-#: view:account.config.wizard:0
-msgid "Skip"
-msgstr "Preskoči"
-
-#. module: account
-#: field:account.invoice,period_id:0
-msgid "Force Period"
-msgstr "Vsili obdobje"
-
-#. module: account
-#: help:account.account.type,sequence:0
-msgid "Gives the sequence order when displaying a list of account types."
-msgstr "Določa zaporedno številko pri prikazovanju seznama kontnih tipov."
-
-#. module: account
-#: view:account.invoice:0
-msgid "Re-Open"
-msgstr "Znova odpri"
-
-#. module: account
-#: wizard_view:account.fiscalyear.close,init:0
-msgid "Are you sure you want to create entries?"
-msgstr "prosim potrdite knjiženje"
-
-#. module: account
-#: field:account.tax,include_base_amount:0
-msgid "Include in base amount"
-msgstr "Vključen v znesek osnove"
-
-#. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "Delta Credit"
-msgstr "Razlika - dobro"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
-#: model:ir.actions.wizard,name:account.wizard_unreconcile
-msgid "Unreconcile Entries"
-msgstr "Prekliči uskladitev vknjižb"
-
-#. module: account
-#: model:process.node,note:account.process_node_supplierdraftinvoices0
-msgid "Pre-generated invoice from control"
-msgstr "Predgeneriran račun iz kontrole"
-
-#. module: account
-#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
-msgid "Cost Legder for period"
-msgstr "Knjga odhodkov za obdobje"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
-msgid "New Statement"
-msgstr "Nov izpisek"
-
-#. module: account
-#: wizard_field:account.analytic.account.chart,init,from_date:0
-#: wizard_field:account.analytic.line,init,from_date:0
-msgid "From"
-msgstr "Od"
-
-#. module: account
-#: model:process.node,note:account.process_node_reconciliation0
-#: model:process.node,note:account.process_node_supplierreconciliation0
-msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr "Zapiranje računov in plačil"
-
-#. module: account
-#: wizard_view:account.central.journal.report,init:0
-#: model:ir.actions.wizard,name:account.wizard_central_journal
-#: model:ir.ui.menu,name:account.menu_central_journal
-msgid "Print Central Journal"
-msgstr "Natisni glavni dnevnik"
-
-#. module: account
-#: wizard_field:account.aged.trial.balance,init,period_length:0
-msgid "Period length (days)"
-msgstr "Dolžina obdobja (dni)"
-
-#. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
-msgid "Percent"
-msgstr "Odstotek"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_charts
-msgid "Charts"
-msgstr "Načrti"
-
-#. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
-#: selection:account.tax,type_tax_use:0
-#: selection:account.tax.template,type_tax_use:0
-msgid "Sale"
-msgstr "Prodaja"
-
-#. module: account
-#: wizard_button:account.account.balance.report,account_selection,checktype:0
-#: wizard_button:account.general.ledger.report,account_selection,checktype:0
-msgid "Next"
-msgstr "Naslednji"
-
-#. module: account
-#: help:res.partner,property_account_position:0
-msgid ""
-"The fiscal mapping will determine taxes and the accounts used for the "
-"partner."
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.cost_ledger:0
-msgid "Date or Code"
-msgstr "Datum ali šifra"
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr "DDV:"
 
 #. module: account
-#: field:account.analytic.account,user_id:0
-msgid "Account Manager"
-msgstr "Odgovorni za stranko"
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-msgid "to :"
-msgstr "za:"
+#: report:account.move.voucher:0
+msgid "Journal:"
+msgstr ""
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,init_full,debit:0
-#: wizard_field:account.move.line.reconcile,init_partial,debit:0
-msgid "Debit amount"
-msgstr "Znesek v breme"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: report:account.move.voucher:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr "Ne bo izpisano na računu"
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -1868,123 +3092,27 @@ msgid "year"
 msgstr "leto"
 
 #. module: account
-#: wizard_button:account.account.balance.report,checktype,report:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
-#: wizard_button:account.analytic.account.balance.report,init,report:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
-#: wizard_button:account.analytic.account.journal.report,init,report:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
-#: wizard_button:account.central.journal.report,init,print:0
-#: wizard_button:account.general.journal.report,init,print:0
-#: wizard_button:account.general.ledger.report,checktype,checkreport:0
-#: wizard_button:account.partner.balance.report,init,report:0
-#: wizard_button:account.print.journal.report,init,print:0
-#: wizard_button:account.third_party_ledger.report,init,checkreport:0
-msgid "Print"
-msgstr "Natisni"
-
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
-msgstr "Datum začetka"
-
-#. module: account
-#: model:account.journal,name:account.refund_expenses_journal
-msgid "x Expenses Credit Notes Journal"
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
-msgid "Type"
-msgstr "Vrsta"
-
-#. module: account
-#: view:account.journal:0
-msgid "Accounts Allowed (empty for no control)"
-msgstr "Dovoljeni konti (prazno - ni kontrole)"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Untaxed amount"
-msgstr "Neobdavčen znese"
-
-#. module: account
-#: field:account.tax,account_collected_id:0
-#: field:account.tax.template,account_collected_id:0
-msgid "Invoice Tax Account"
-msgstr "Konto zaračunanega davka"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Analytic Lines"
-msgstr "Analitične vrstice"
-
-#. module: account
-#: wizard_view:account.invoice.pay,init:0
-#: model:ir.actions.wizard,name:account.wizard_invoice_pay
-msgid "Pay invoice"
-msgstr "Plačaj račun"
-
-#. module: account
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree5
-#: model:ir.ui.menu,name:account.menu_invoice_draft
-msgid "Draft Customer Invoices"
-msgstr "Pripravljeni računi za izdajo"
-
-#. module: account
-#: model:ir.model,name:account.model_account_subscription_line
-msgid "Account Subscription Line"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,state:0
-#: selection:account.general.ledger.report,checktype,state:0
-#: selection:account.partner.balance.report,init,state:0
-#: selection:account.third_party_ledger.report,init,state:0
-msgid "No Filter"
-msgstr "Ni filtra"
-
-#. module: account
-#: field:account.payment.term.line,days:0
-msgid "Number of Days"
-msgstr "Število dni"
-
-#. module: account
-#: help:account.invoice,reference:0
-msgid "The partner reference of this invoice."
-msgstr "Sklicna številka partnerja na tem računu."
-
-#. module: account
-#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
-msgid "Sort by:"
-msgstr "Razvrsti po:"
-
-#. module: account
-#: field:account.move,to_check:0
-msgid "To Be Verified"
-msgstr "Mora biti preverjeno"
-
-#. module: account
-#: help:res.partner,debit:0
-msgid "Total amount you have to pay to this supplier."
-msgstr "Skupni znesek za plačilo temu dobavitelju."
-
-#. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "7"
-msgstr "7"
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr "Skupaj:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -1992,61 +3120,29 @@ msgid "Transfers"
 msgstr "Prenosi"
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Li."
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.chart,init:0
+#: view:account.chart:0
 msgid "Account charts"
 msgstr "Kontni načrti"
 
 #. module: account
-#: help:account.tax,name:0
-msgid "This name will be displayed on reports"
-msgstr "To ime bo izpisano na poročilih"
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Printing date"
-msgstr "Datum izpisa"
-
-#. module: account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: account
-#: wizard_field:account.partner.balance.report,init,date1:0
-msgid "          Start date"
-msgstr "          Začetni datum"
-
-#. module: account
-#: wizard_view:account.analytic.account.journal.report,init:0
-msgid "Analytic Journal Report"
-msgstr "Poročilo analitičnega dnevnika"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree3
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
-msgid "Customer Refunds"
-msgstr "Izdani dobropisi"
-
-#. module: account
-#: rml:account.vat.declaration:0
+#: report:account.vat.declaration:0
 msgid "Tax Amount"
 msgstr "Znesek davka"
 
 #. module: account
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "J.C./Move name"
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
 msgstr ""
 
 #. module: account
-#: field:account.journal.period,name:0
-msgid "Journal-Period Name"
-msgstr "Naziv obdobja dnevnika"
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2055,181 +3151,66 @@ msgid "Tax Case Name"
 msgstr "Naziv davčne stopnje"
 
 #. module: account
-#: help:account.journal,entry_posted:0
-msgid ""
-"Check this box if you don't want new account moves to pass through the "
-"'draft' state and instead goes directly to the 'posted state' without any "
-"manual validation."
-msgstr ""
-"Odkljukajte ta kvadratek, če ne želite, da bo za vknjižbe na tem kontu "
-"potrebna dodatna ročna potrditev prehoda statusa iz \"osnutka\" v "
-"\"knjiženo\" (status \"knjiženo\" bodo pridobile avtomatično)."
-
-#. module: account
-#: field:account.bank.statement.line,partner_id:0
-#: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
-#: field:account.move,partner_id:0
-#: wizard_field:account.partner.balance.report,init,result_selection:0
-#: wizard_field:account.third_party_ledger.report,init,result_selection:0
-#: field:wizard.company.setup,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account
-#: help:account.invoice,number:0
-msgid ""
-"Unique number of the invoice, computed automatically when the invoice is "
-"created."
-msgstr ""
-"Zaporedna številka računa, izračunana avtomatično ob kreiranju računa."
-
-#. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
 msgstr "Osnutek računa"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_expense
-msgid "Expense"
-msgstr "Strošek"
-
-#. module: account
-#: field:account.journal,invoice_sequence_id:0
-msgid "Invoice Sequence"
-msgstr "Zaporedje računa"
-
-#. module: account
-#: wizard_view:account.automatic.reconcile,init:0
-msgid "Options"
-msgstr "Možnosti"
-
-#. module: account
-#: model:process.process,name:account.process_process_invoiceprocess0
-msgid "Customer Invoice Process"
-msgstr "Proces računa stranke"
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Fiscal Mapping Remark :"
+#: code:addons/account/wizard/account_invoice_state.py:0
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.fiscalyear.close,init,period_id:0
-msgid "Opening Entries Period"
-msgstr "Obdobje za otvoritve"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
-#: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
-#: model:ir.ui.menu,name:account.menu_validate_account_moves
-msgid "Validate Account Moves"
-msgstr "Preveri kontne prenose"
-
-#. module: account
-#: selection:account.subscription,period_type:0
-msgid "days"
-msgstr "dni"
-
-#. module: account
-#: selection:account.aged.trial.balance,init,direction_selection:0
-msgid "Past"
-msgstr "Pretekli"
-
-#. module: account
-#: field:account.analytic.account,company_currency_id:0
-#: field:account.bank.accounts.wizard,currency_id:0
-#: field:account.bank.statement,currency:0
-#: field:account.bank.statement.reconcile,total_currency:0
-#: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
-#: field:account.move.line,currency_id:0
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
-msgid "Unpaid invoices"
-msgstr "Naplačani računi"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_paymentreconcile0
-msgid "Payment Reconcile"
-msgstr "Zapiranje plačil"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
-#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
-msgid "Statements reconciliation"
-msgstr "Uskladitev izpiskov"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form_new
-#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
-msgid "New Subscription"
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term:0
-msgid "Computation"
-msgstr "Izračun"
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-msgid "Analytic Entry"
-msgstr "Analitičen vnos"
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
-msgid "Overdue Payments Message"
-msgstr "Sporočilo za opomin za zapadle postavke"
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_tax_code_tree
-#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
-msgid "Chart of Taxes"
-msgstr "Načrt davkov"
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
 
 #. module: account
-#: field:account.payment.term.line,value_amount:0
-msgid "Value Amount"
-msgstr "Znesek vrednosti"
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Narration"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
-msgid "Reconciled entries"
-msgstr "Usklajene vknjižbe"
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
 
 #. module: account
-#: field:account.invoice,address_contact_id:0
-msgid "Contact Address"
-msgstr "Naslov stika"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Create 3 Months Periods"
-msgstr "Ustvari tromesečna obdobja"
-
-#. module: account
-#: view:account.invoice:0
-msgid "(keep empty to use the current period)"
-msgstr "(pustite prazno v primeru trenutnega obdobja)"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree8
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
-msgid "Draft Supplier Invoices"
-msgstr "Pripravljeni računi dobaviteljev"
-
-#. module: account
-#: wizard_field:account.invoice.refund,init,period:0
-msgid "Force period"
-msgstr "Vsili obdobje"
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -2237,151 +3218,102 @@ msgid "Detail"
 msgstr "Podrobno"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-msgid "Consolidation"
-msgstr "Zgoščeno"
-
-#. module: account
-#: field:account.chart.template,account_root_id:0
-msgid "Root Account"
-msgstr "Osnovni konto"
-
-#. module: account
-#: rml:account.overdue:0
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
 msgid ""
-"Exception made of a mistake of our side, it seems that the following bills "
-"stay unpaid. Please, take appropriate measures in order to carry out this "
-"payment in the next 8 days."
+"Supplier Invoices allows you to enter and manage invoices issued by your "
+"suppliers. OpenERP generates draft of supplier invoices automatically so "
+"that you can control what you received from your supplier according to what "
+"you purchased or received."
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
 msgid "VAT :"
 msgstr "DDV:"
 
 #. module: account
-#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
+#: field:account.installer,charts:0
+#: model:ir.actions.act_window,name:account.action_account_chart
 #: model:ir.actions.act_window,name:account.action_account_tree
-#: model:ir.actions.wizard,name:account.wizard_account_chart
-#: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
 msgstr "Kontni načrti"
 
 #. module: account
-#: model:account.journal,name:account.check_journal
-msgid "x Checks Journal"
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.wizard,name:account.wizard_generate_subscription
-#: model:ir.ui.menu,name:account.menu_generate_subscription
-msgid "Create subscription entries"
-msgstr "Kreiraj periodične vnose"
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "Skupen protikonto"
 
 #. module: account
-#: wizard_field:account.fiscalyear.close,init,journal_id:0
-msgid "Opening Entries Journal"
-msgstr "Dnevnik otvoritev"
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
 
 #. module: account
-#: view:account.config.wizard:0
-msgid "Create a Fiscal Year"
-msgstr "Kreiraj poslovno leto"
-
-#. module: account
-#: field:product.template,taxes_id:0
-msgid "Customer Taxes"
-msgstr "Izhodni davki"
-
-#. module: account
-#: field:account.invoice,date_invoice:0
-msgid "Date Invoiced"
-msgstr "Datum računa"
-
-#. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
-msgid "All periods if empty"
-msgstr "Če prazno, potem vsa obdobja"
-
-#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Liability"
-msgstr "Odgovornost"
-
-#. module: account
-#: selection:account.automatic.reconcile,init,power:0
+#: selection:account.automatic.reconcile,power:0
 msgid "2"
 msgstr "2"
 
 #. module: account
-#: wizard_view:account.chart,init:0
+#: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr "( Če ne izberete poslovnega leta bo izbrano tekoče poslovno leto)"
 
 #. module: account
-#: help:account.invoice.tax,base_code_id:0
-msgid "The account basis of the tax declaration."
-msgstr ""
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
-#: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: view:account.move:0
 #: field:account.move,date:0
-#: rml:account.overdue:0
-#: wizard_field:account.subscription.generate,init,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.generate,date:0
 #: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: selection:account.vat.declaration,filter:0
+#: field:analytic.entries.report,date:0
 msgid "Date"
 msgstr "Datum"
 
 #. module: account
-#: field:account.invoice,reference_type:0
-msgid "Reference Type"
-msgstr "Vrsta sklica"
-
-#. module: account
-#: wizard_button:account.move.line.unreconcile,init,unrec:0
-#: wizard_button:account.reconcile.unreconcile,init,unrec:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
 msgstr "Prekliči uskladitev"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
-msgid "Tax Type"
-msgstr "Vrsta davka"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_statemententries0
-msgid "Statement Entries"
-msgstr "Postavke izpiska"
-
-#. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
-msgid "User"
-msgstr "Uporabnik"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_template_form
-msgid "Account Templates"
-msgstr "Kontne predloge"
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "Dnevnik mora imeti privzeta konta za breme in dobro."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2389,30 +3321,27 @@ msgid "Chart of Accounts Template"
 msgstr "Predloge kontnih načrtov"
 
 #. module: account
-#: model:account.journal,name:account.refund_sales_journal
-msgid "Journal d'extourne"
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-msgid "Voucher No"
-msgstr "Številka kupona"
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
-#: model:ir.ui.menu,name:account.menu_automatic_reconcile
-msgid "Automatic reconciliation"
-msgstr "Samodejna uskladitev"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Import Invoice"
-msgstr "Uvozi račun"
-
-#. module: account
-#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
-msgid "and Journals"
-msgstr "in dnevniki"
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot validate a Journal Entry unless all journal items are in same "
+"chart of accounts !"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
@@ -2420,55 +3349,47 @@ msgid "Account Tax"
 msgstr "Davek za konto"
 
 #. module: account
-#: field:account.analytic.line,move_id:0
-msgid "Move Line"
-msgstr "Postavka prenosa"
-
-#. module: account
-#: field:account.bank.accounts.wizard,acc_no:0
-msgid "Account No."
-msgstr "Številka konta"
-
-#. module: account
-#: help:account.tax,child_depend:0
-msgid ""
-"Set if the tax computation is based on the computation of child taxes rather "
-"than on the total amount."
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
 msgstr ""
-"Izberite če izračun davka temelji na izračunih podrejenih davkov in ne na "
-"celotnem znesku."
 
 #. module: account
-#: rml:account.central.journal:0
-msgid "Journal Code"
-msgstr "Šifra dnevnika"
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr "Stanje"
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
 
 #. module: account
 #: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
 msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
 
-#. module: account
-#: field:account.model,lines_id:0
-msgid "Model Entries"
-msgstr ""
-
-#. module: account
-#: field:account.analytic.account,date:0
-msgid "Date End"
-msgstr "Datum konca"
-
-#. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
-#: model:ir.actions.act_window,name:account.action_move_line_search
-#: model:ir.actions.act_window,name:account.action_move_line_tree1
-#: model:ir.ui.menu,name:account.menu_action_move_line_search
-msgid "Entry Lines"
-msgstr "Postavke vknjižbe"
-
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
@@ -2476,122 +3397,1332 @@ msgid "Applicable Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.move.journal,init,open:0
-msgid "Open Journal"
-msgstr "Odpri dnevnik"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-msgid "KI"
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.wizard,name:account.action_account_analytic_line
-#: model:ir.actions.wizard,name:account.action_move_journal_line_form
-#: model:ir.ui.menu,name:account.account_entries_analytic_entries
-#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
-msgid "Entries Encoding by Line"
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
 msgstr ""
 
 #. module: account
-#: help:account.chart.template,tax_template_ids:0
-msgid "List of all the taxes that have to be installed by the wizard"
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr "Pravdanje"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Period from"
-msgstr "Obdobje od"
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr "Konto obveznosti"
 
 #. module: account
-#: model:ir.model,name:account.model_account_bank_statement
-#: model:process.node,name:account.process_node_bankstatement0
-#: model:process.node,name:account.process_node_supplierbankstatement0
-msgid "Bank Statement"
-msgstr "Bančni izpisek"
-
-#. module: account
-#: wizard_view:account.invoice.pay,addendum:0
-#: wizard_view:account.move.line.reconcile,addendum:0
-msgid "Information addendum"
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
 msgstr ""
 
 #. module: account
-#: model:process.transition,name:account.process_transition_entriesreconcile0
-#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
-msgid "Entries Reconcile"
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr "Zaporedje plačil"
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
 msgstr ""
 
 #. module: account
-#: help:account.bank.statement.reconcile,total_second_amount:0
-msgid "The amount in the currency of the journal"
-msgstr "Znesek v valuti dnevnika"
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Stanje konta"
 
 #. module: account
-#: wizard_field:account.general.ledger.report,checktype,landscape:0
-msgid "Landscape Mode"
-msgstr "Ležeče"
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena enote"
 
 #. module: account
-#: model:process.transition,note:account.process_transition_analyticinvoice0
-#: model:process.transition,note:account.process_transition_supplieranalyticcost0
-msgid "From analytic accounts, Create invoice."
-msgstr "Izdelava računa na podlagi analitičnih kontov."
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Unable to change tax !"
+msgstr "Ne morem spremeniti davka!"
 
 #. module: account
-#: wizard_button:account.account.balance.report,account_selection,end:0
-#: wizard_button:account.account.balance.report,checktype,end:0
-#: wizard_button:account.aged.trial.balance,init,end:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
-#: wizard_button:account.analytic.account.balance.report,init,end:0
-#: wizard_button:account.analytic.account.chart,init,end:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,end:0
-#: wizard_button:account.analytic.account.journal.report,init,end:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.line,init,end:0
-#: wizard_button:account.automatic.reconcile,init,end:0
-#: view:account.bank.statement:0
-#: wizard_button:account.central.journal.report,init,end:0
-#: wizard_button:account.chart,init,end:0
-#: wizard_button:account.fiscalyear.close,init,end:0
-#: wizard_button:account.fiscalyear.close.state,init,end:0
-#: wizard_button:account.general.journal.report,init,end:0
-#: wizard_button:account.general.ledger.report,account_selection,end:0
-#: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
-#: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
-#: wizard_button:account.move.bank.reconcile,init,end:0
-#: wizard_button:account.move.journal,init,end:0
-#: wizard_button:account.move.line.reconcile,addendum,end:0
-#: wizard_button:account.move.line.reconcile,init_full,end:0
-#: wizard_button:account.move.line.reconcile,init_partial,end:0
-#: wizard_button:account.move.line.reconcile.select,init,end:0
-#: wizard_button:account.move.line.unreconcile,init,end:0
-#: wizard_button:account.move.line.unreconcile.select,init,end:0
-#: wizard_button:account.move.validate,init,end:0
-#: wizard_button:account.open_closed_fiscalyear,init,end:0
-#: wizard_button:account.partner.balance.report,init,end:0
-#: wizard_button:account.period.close,init,end:0
-#: wizard_button:account.print.journal.report,init,end:0
-#: wizard_button:account.reconcile.unreconcile,init,end:0
-#: wizard_button:account.subscription.generate,init,end:0
-#: wizard_button:account.third_party_ledger.report,init,end:0
-#: wizard_button:account.vat.declaration,init,end:0
-#: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr "Odpri račun"
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr "Dejanski datum"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"Customer Refunds helps you manage the credit notes issued/to be issued for "
+"your customers. A refund invoice is a document that cancels an invoice or a "
+"part of it. You can easily generate refunds and reconcile them from the "
+"invoice form."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr "Računovodstvo"
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr "Stanje:"
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
-msgid "Cancel"
-msgstr "Prekliči"
+msgid "title"
+msgstr ""
 
 #. module: account
-#: field:account.account.type,name:0
-msgid "Acc. Type Name"
-msgstr "Naziv vrste konta"
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr "Preklopi v pripravo"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr "Preveri"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr "(Če hočete odpreti račun, le-ta ne sme biti usklajen)"
+
+#. module: account
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.chart,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr "Naziv davka"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguracija"
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr "Analitično stanje"
+
+#. module: account
+#: code:addons/account/report/account_balance_sheet.py:0
+#: code:addons/account/report/account_profit_loss.py:0
+#, python-format
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr "Bližnjica"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr "3"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr "mesec"
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr "Opomba"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr "Plačano"
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr "Davčne postavke"
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr "Opis davka"
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.bs.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.pl.report,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Mesečno obdobje"
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr "Periodična obdelava"
+
+#. module: account
+#: help:account.move.line,state:0
+msgid ""
+"When new move line is created the state will be 'Draft'.\n"
+"* When all the payments are done it will be in 'Valid' state."
+msgstr ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month: 0"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr "Naziv konta"
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:0
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Datum zapadlosti"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr "Predloga konta"
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Zaključno stanje"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:0
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr "Številka kupona"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr "Dovoli uskladitev"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a payment related entry that occurs on a recurrent "
+"basis from a specific date corresponding to the signature of a contract or "
+"an agreement with a customer or a supplier. With Define Recurring Entries, "
+"you can create them in the system in order to automate their entries in the "
+"system."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr "Davek vključen v ceni"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "4"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr "Sprememba"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "UserError"
+msgstr "NapakaUporabnika"
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,reconcil:0
+msgid "Consider reconciled entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Customer"
+msgstr "Kupec"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"Couldn't create move with currency different from the secondary currency of "
+"the account \"%s - %s\". Clear the secondary currency field of the account "
+"definition if you want to accept all currencies."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "Stanje konta -"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr "Novo poslovno leto"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr "Uporabi model"
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr "Ne"
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr "Ali ste prepričani?"
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr "Bančni izpisek, ki se uporablja pri uskladitvi"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr "Izračunaj"
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/report/common_report_header.py:0
+#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "Error"
+msgstr "Napaka"
+
+#. module: account
+#: field:account.analytic.Journal.report,date2:0
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+msgid "End of period"
+msgstr "Konec obdobja"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Bančne podrobnosti"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Taxes missing !"
+msgstr "Manjkajo davki!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+msgid ""
+"To print an analytics (or costs) journal for a given period. The report give "
+"code, move name, account number, general amount and analytic amount."
+msgstr ""
+
+#. module: account
+#: help:account.journal,refund_journal:0
+msgid "Fill this if the journal is to be used for refunds of invoices."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr "Zaprto"
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr "Premiki"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr "Predloge"
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "5"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr "Analitično stanje -"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+msgid "Target Moves"
+msgstr "Ciljni premik"
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr "Vrsta obdobja"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr "Plačila"
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr "Vnos"
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr "Python kod (obratno)"
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr "Stolpec dnevnika"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's fiscal year depending on the period you have chosen to "
+"follow. A fiscal year is a 1 year period over which a company budgets its "
+"spending. It may run over any period of 12 months. The fiscal year is "
+"referred to by the date in which it ends. For example, if a company's fiscal "
+"year ends November 30, 2011, then everything between December 1, 2010 and "
+"November 30, 2011  would be referred to as FY 2011. Not using the actual "
+"calendar year gives many companies an advantage, allowing them to close "
+"their books at a time which is most convenient for them."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr "Plačilni pogoji"
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr "Naziv stolpca"
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "Napaka celovitosti!"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "Interni naziv"
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr "mesec"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Opis na računih"
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr "Konto davkov"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr "Izid usklajevanja"
+
+#. module: account
+#: view:account.bs.report:0
+#: model:ir.actions.act_window,name:account.action_account_bs_report
+#: model:ir.ui.menu,name:account.menu_account_bs_report
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr "Vknjižbe"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr "ME"
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "Na računu ni obdobja!"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr "Izračunaj stopnjo"
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr "Prodaja"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"The Journal Entry of the invoice have been totally reconciled with one or "
+"several Journal Entries of payment."
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr "Izračunaj davke po podrejenih zapisih"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "No period found !"
+msgstr "Ne najdem obdobja!"
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr "Omogoči storniranje vknjižb"
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr "Ime partnerja"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -2606,32 +4737,905 @@ msgid "Use this code for the VAT declaration."
 msgstr "Uporabi to stonjo za davčno napoved."
 
 #. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
-msgstr "Pravdanje"
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr "Statistika stroškovnih mest"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr "Predloge davčnih šifer"
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr "Vključiti v osnovo"
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+"Število dni, ki jih je potrebno dodati pred izračunom dneva v mesecu. Če je "
+"Datum=15.1, Število dni=22, Dan v mesecu=-1, potem to pomeni, da je datum "
+"zapadlosti 28.2.."
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Bank Journal "
+msgstr "Bančni dnevnik "
+
+#. module: account
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr "Mehanizem vknjiženja"
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr "(Postite prazno da se odpre terenutno stanje)"
+
+#. module: account
+#: field:account.analytic.Journal.report,date1:0
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+msgid "Start of period"
+msgstr "Začetek obdobja"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry ! Please note that "
+"you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "Analitično knjigovodstvo"
+
+#. module: account
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"expenses for the current product"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr "Dobropis kupcu"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr "Privzeti davek"
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr "Predznak davčne stopnje"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Poročilo o računih narejenih v zadnjih 15-ih dneh"
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr "Dnevnik knjižb za zaključek leta"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "6"
+msgstr "6"
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.actions.act_window,name:account.action_analytic_open
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr "Stroškovna mesta"
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr "Valuta zneska"
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: account
 #: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
-#: view:account.payment.term:0
-msgid "Information"
-msgstr "Informacije"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_tax_report
-msgid "Taxes Reports"
-msgstr "Davčna poročila"
-
-#. module: account
-#: field:res.partner,property_account_payable:0
-msgid "Account Payable"
-msgstr "Konto obveznosti"
-
-#. module: account
-#: wizard_view:populate_statement_from_inv,init:0
-msgid "Import Invoices in Statement"
+msgid "Number (Move)"
 msgstr ""
 
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+"Polje zaporedne številke se uporablja za naraščajoče razvrstitev postavk "
+"plačilnih pogojev"
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr "Vzorec za davčno pozicijo"
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr "Odpri načrte"
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"impossible any new entry record. Close a fiscal year when you need to "
+"finalize your end of year results definitive "
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr "z valuto"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr "Zapri z odpisom"
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr "Določen znesek"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr "Metoda izračuna za znesek davka"
+
+#. module: account
+#: help:account.installer.modules,account_anglo_saxon:0
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by changing "
+"the accounting logic with stock transactions."
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Datum izdelave"
+
+#. module: account
+#: view:account.analytic.journal:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr "Podrejeni konti"
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Write-Off"
+msgstr "Odpis"
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr "Skupaj obveznosti"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr "account.analytic.line.extended"
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Supplier"
+msgstr "Dobavitelj"
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Bilanzkonten - Aktiva - Vermögenskonten"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Računi po vrsti"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr "Konto št."
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Receivable and Payable Accounts"
+msgstr "Konti terjatev in obveznosti"
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr "Največja količina:"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr "Dobropis"
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr "Naslov za račun"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be threated."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr "Vsili obdobje"
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr "Konto zaračunanega davka"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr "Število dni"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Nepravilno dejanje!"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr "To ime bo izpisano na poročilih"
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr "Datum izpisa"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr "Nobena"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr "Izdani dobropisi"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr "Naziv obdobja dnevnika"
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:0
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Opomba za davčno pozicijo"
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card, or any other type "
+"of account. Start by encoding the starting and closing balance, then record "
+"all lines of your statement. When you are in the Payment column of the a "
+"line, you can press F1 to open the reconciliation form."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr "Pretekli"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
+msgid "Statements reconciliation"
+msgstr "Uskladitev izpiskov"
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr "Analitičen vnos"
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr "Sporočilo za opomin za zapadle postavke"
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr "Znesek vrednosti"
+
+#. module: account
+#: help:account.journal,code:0
+msgid ""
+"The code will be used to generate the numbers of the journal entries of this "
+"journal."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr "(pustite prazno v primeru trenutnega obdobja)"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr "Osnovni konto"
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr "Izhodni davki"
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr "Vrsta davka"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr "Kontne predloge"
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.chart,fiscalyear:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
+msgid "Fiscal year"
+msgstr "Davčno leto"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: selection:account.invoice.refund,filter_refund:0
+#: view:account.journal.select:0
+#: view:account.move:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr "Naziv vrste konta"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr "Terjatev"
+
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
@@ -2643,28 +5647,24 @@ msgid "Default Credit Account"
 msgstr "Privzeti konto 'v dobro'"
 
 #. module: account
-#: model:process.node,name:account.process_node_supplierpaymentorder0
-msgid "Payment Order"
-msgstr "Zaporedje plačil"
-
-#. module: account
-#: help:account.account.template,reconcile:0
-msgid ""
-"Check this option if you want the user to reconcile entries in this account."
+#: view:account.payment.term.line:0
+msgid "  number of days: 30"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: model:ir.ui.menu,name:account.next_id_40
-#: model:process.node,name:account.process_node_analytic0
-#: model:process.node,name:account.process_node_analyticcost0
-msgid "Analytic"
-msgstr "Analitični"
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
 
 #. module: account
-#: model:process.node,name:account.process_node_invoiceinvoice0
-msgid "Create Invoice"
-msgstr "Ustvari račun"
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -2672,165 +5672,75 @@ msgid "Equity"
 msgstr "Stanje bilance"
 
 #. module: account
-#: field:wizard.company.setup,overdue_msg:0
-msgid "Overdue Payment Message"
-msgstr "Besedilo za opomin za zapadle terjatve"
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr "Delež"
 
 #. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Vzorec davčnih šifer"
-
-#. module: account
-#: rml:account.partner.balance:0
-msgid "In dispute"
-msgstr "V sporu"
-
-#. module: account
-#: help:account.account.template,type:0
-msgid ""
-"This type is used to differenciate types with special effects in Open ERP: "
-"view can not have entries, consolidation are accounts that can have children "
-"accounts for multi-company consolidations, payable/receivable are for "
-"partners accounts (for debit/credit computations), closed for deprecated "
-"accounts."
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
-msgid "End of Year Treatments"
-msgstr "Postopek zaključevanja leta"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_generic_report
-msgid "Generic Reports"
-msgstr "Splošna poročila"
-
-#. module: account
-#: wizard_field:account.automatic.reconcile,init,power:0
+#: field:account.automatic.reconcile,power:0
 msgid "Power"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.analytic.line,init:0
-msgid "Account Analytic Lines Analysis"
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "-"
-msgstr "-"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-msgid "asgfas"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
-#: model:ir.actions.wizard,name:account.wizard_analytic_account_chart
-#: model:ir.ui.menu,name:account.account_analytic_chart_balance
-#: model:ir.ui.menu,name:account.account_analytic_def_chart
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-msgid "Analytic Chart of Accounts"
-msgstr "Analitični kontni plan"
-
-#. module: account
-#: wizard_view:account.analytic.line,init:0
+#: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
 msgstr "Pregled analitičnih vknjižb"
 
 #. module: account
-#: wizard_view:account.move.validate,init:0
-msgid "Select Period and Journal for Validation"
-msgstr "Izberi obdobje in dnevnik za preverjanje"
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr ""
 
 #. module: account
-#: field:account.invoice,number:0
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
 msgid "Invoice Number"
 msgstr "Številka računa"
 
 #. module: account
-#: field:account.period,date_stop:0
-msgid "End of Period"
-msgstr "Konec obdobja"
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
 
 #. module: account
-#: wizard_button:populate_statement_from_inv,go,finish:0
-msgid "O_k"
-msgstr "O_k"
-
-#. module: account
-#: field:account.invoice,amount_untaxed:0
-msgid "Untaxed"
-msgstr "Neobdavčeno"
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
-#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
 msgstr "Obrnjena bilanca po analitičnih kontih"
 
 #. module: account
-#: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
 msgstr ""
 
 #. module: account
 #: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Sklic računa"
 
-#. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,name:0
-#: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
-#: field:account.subscription,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: account
-#: wizard_view:account.move.line.reconcile,init_full:0
-#: wizard_view:account.move.line.reconcile,init_partial:0
-msgid "Reconciliation transactions"
-msgstr "transakcije zapiranja"
-
-#. module: account
-#: wizard_field:account.aged.trial.balance,init,direction_selection:0
-msgid "Analysis Direction"
-msgstr "Smer analize"
-
-#. module: account
-#: wizard_button:populate_statement_from_inv,init,go:0
-msgid "_Go"
-msgstr "_Pojdi"
-
-#. module: account
-#: field:res.partner,ref_companies:0
-msgid "Companies that refers to partner"
-msgstr "Družbe, ki so povezane s partnerjem"
-
-#. module: account
-#: field:account.move.line,date:0
-msgid "Effective date"
-msgstr "Dejanski datum"
-
 #. module: account
 #: help:account.tax.template,sequence:0
 msgid ""
@@ -2840,310 +5750,151 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
-#: field:account.journal.view,name:0
-#: model:ir.model,name:account.model_account_journal_view
-msgid "Journal View"
-msgstr "Pogled dnevnika"
-
-#. module: account
-#: selection:account.move.line,centralisation:0
-msgid "Credit Centralisation"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
 msgstr ""
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Customer Ref:"
-msgstr "Sklic kupca"
-
-#. module: account
-#: xsl:account.transfer:0
-msgid "Partner ID"
-msgstr "Partnerjev ID"
-
-#. module: account
-#: wizard_view:account.automatic.reconcile,init:0
-#: wizard_view:account.invoice.pay,addendum:0
-#: wizard_view:account.move.line.reconcile,addendum:0
-msgid "Write-Off Move"
-msgstr "Prenos odpisa"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Total credit"
-msgstr "Skupaj v dobro"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree1_new
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
-msgid "New Customer Invoice"
-msgstr "Nov izdani račun"
-
-#. module: account
-#: field:account.account,reconcile:0
-#: wizard_button:account.automatic.reconcile,init,reconcile:0
-#: field:account.bank.statement.line,reconcile_id:0
-#: view:account.bank.statement.reconcile:0
-#: field:account.bank.statement.reconcile.line,line_id:0
-#: field:account.move.line,reconcile_id:0
-#: wizard_button:account.move.line.reconcile,addendum,reconcile:0
-#: wizard_button:account.move.line.reconcile,init_full,reconcile:0
-msgid "Reconcile"
-msgstr "Uskladi"
-
-#. module: account
-#: rml:account.overdue:0
-msgid "Best regards."
-msgstr "S spoštovanjem,"
-
-#. module: account
-#: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
-msgid "Analytic account costs and revenues"
-msgstr "Prihodki in stroški na analitičnem kontu"
-
-#. module: account
-#: wizard_view:account.invoice.refund,init:0
-msgid "Are you sure you want to refund this invoice ?"
-msgstr "Res želite narediti dobropis za ta račun?"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_paid_open
-msgid "Open State"
-msgstr "Odpri stanje"
-
-#. module: account
-#: field:account.journal,entry_posted:0
-msgid "Skip 'Draft' State for Created Entries"
-msgstr "Preskoči stanje priprave za ustvarjene vknjižbe"
-
-#. module: account
-#: field:account.invoice.tax,account_id:0
-#: field:account.move.line,tax_code_id:0
-msgid "Tax Account"
-msgstr "Konto davkov"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_statemententries0
-msgid "From statement, create entries"
-msgstr "Iz izpiska naredi vknjižbe"
-
-#. module: account
-#: field:account.analytic.account,complete_name:0
-msgid "Full Account Name"
-msgstr "Polni naziv konta"
-
-#. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr "1cm 27.7cm 20cm 27.7cm"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree12
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
-msgid "Draft Supplier Refunds"
-msgstr "Pripravljeni dobropisi dobaviteljev"
-
-#. module: account
-#: model:process.node,name:account.process_node_accountingstatemententries0
-msgid "Accounting Statement"
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
 msgstr ""
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Document: Customer account statement"
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
-msgid "Accounting"
-msgstr "Računovodstvo"
-
-#. module: account
-#: view:account.fiscal.position.template:0
-msgid "Taxes Mapping"
-msgstr "Preslikava davkov"
-
-#. module: account
-#: wizard_view:account.move.line.unreconcile,init:0
-#: wizard_view:account.reconcile.unreconcile,init:0
-msgid "Unreconciliation transactions"
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
 msgstr ""
 
 #. module: account
-#: model:process.transition,note:account.process_transition_paymentorderbank0
-#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
-msgid "Reconcilation of entries from payment order."
-msgstr "Zapiranje vknjižb plačilnega naloga"
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Can not find account chart for this company, Please Create account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr "Dobropis dobavitelja"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
-#: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
 msgstr "Postavke vknjižbe"
 
-#. module: account
-#: wizard_view:account.automatic.reconcile,init:0
-#: wizard_view:account.move.line.reconcile,init_full:0
-#: wizard_view:account.move.line.reconcile,init_partial:0
-#: wizard_view:account.move.line.reconcile.select,init:0
-#: model:ir.ui.menu,name:account.next_id_20
-#: model:process.node,name:account.process_node_reconciliation0
-#: model:process.node,name:account.process_node_supplierreconciliation0
-msgid "Reconciliation"
-msgstr "Uskladitev"
-
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
 msgstr "Centralizacija"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
-#: model:ir.model,name:account.model_account_tax_code
-msgid "Tax Code"
-msgstr "Davčna stopnja"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-msgid "Analytic Journal -"
-msgstr "Analitični dnevnik"
-
-#. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "Analytic Debit"
-msgstr "Breme - analitično"
-
-#. module: account
-#: field:account.account,currency_mode:0
-msgid "Outgoing Currencies Rate"
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree10
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
-msgid "Draft Customer Refunds"
-msgstr "Pripravljeni dobropisi kupcem"
-
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
 msgstr "Samo za branje"
 
 #. module: account
-#: help:account.model.line,date_maturity:0
-msgid ""
-"The maturity date of the generated entries for this model. You can chosse "
-"between the date of the creation action or the the date of the creation of "
-"the entries plus the partner payment terms."
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
 msgstr ""
 
-#. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
-msgid "Situation"
-msgstr "Stanje"
-
-#. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: account
-#: help:account.move.line,move_id:0
-msgid "The move of this entry line."
-msgstr "Prenos te postavke vknjižbe"
-
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
 msgstr "Enota mere"
 
 #. module: account
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Konto terjatev"
-
-#. module: account
-#: help:account.journal,group_invoice_lines:0
+#: constraint:account.payment.term.line:0
 msgid ""
-"If this box is checked, the system will try to group the accounting lines "
-"when generating them from invoices."
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
 msgstr ""
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
-#: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
-msgid "# of Transaction"
-msgstr "Številka transakcije"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
-msgid "Cancel selected invoices"
-msgstr "Storniraj izbrane račune"
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr "account.sequence.fiscalyear"
 
 #. module: account
+#: report:account.analytic.account.journal:0
 #: view:account.analytic.journal:0
 #: field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
-#: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
 msgstr "Analitični dnevnik"
 
 #. module: account
-#: rml:account.general.ledger:0
-msgid "Entry Label"
+#: view:account.entries.report:0
+msgid "Reconciled"
 msgstr ""
 
 #. module: account
-#: model:process.transition,note:account.process_transition_paymentreconcile0
-msgid "Reconcilate the entries from payment"
-msgstr ""
-
-#. module: account
-#: rml:account.tax.code.entries:0
-msgid "("
-msgstr "("
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
-msgid "Set to Draft"
-msgstr "Preklopi v pripravo"
-
-#. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
-msgid "Reference of the document that produced this invoice."
-msgstr ""
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.aged.trial.balance,init,result_selection:0
-msgid "Payable"
-msgstr "Obveznosti"
-
-#. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Osnova"
@@ -3154,75 +5905,27 @@ msgid "Model Name"
 msgstr "Naziv modela"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-msgid "Others"
-msgstr "Drugi"
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr "Konto vrste stroškov"
 
 #. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "8"
-msgstr "8"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.move:0
-#: wizard_button:account.move.validate,init,validate:0
-msgid "Validate"
-msgstr "Preveri"
-
-#. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
-msgid "Legend"
-msgstr "Napotki"
-
-#. module: account
-#: model:process.node,note:account.process_node_draftinvoices0
-msgid "Proposed invoice to be checked, validated and printed"
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_move_line_select
-msgid "account.move.line.select"
-msgstr "account.move.line.select"
-
-#. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
-#: wizard_field:account.account.balance.report,account_selection,Account_list:0
-#: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
-#: field:account.bank.statement.line,account_id:0
-#: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
-#: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
-#: wizard_field:account.move.line.reconcile.select,init,account_id:0
-#: wizard_field:account.move.line.unreconcile.select,init,account_id:0
-#: model:ir.model,name:account.model_account_account
-msgid "Account"
-msgstr "Konto"
-
-#. module: account
-#: model:account.journal,name:account.bank_journal
-msgid "Journal de Banque CHF"
+#: code:addons/account/wizard/account_state_open.py:0
+#, python-format
+msgid "Invoice is already reconciled"
 msgstr ""
 
-#. module: account
-#: selection:account.account.balance.report,checktype,state:0
-#: selection:account.general.ledger.report,checktype,state:0
-#: selection:account.partner.balance.report,init,state:0
-#: selection:account.third_party_ledger.report,init,state:0
-msgid "By Date and Period"
-msgstr "Po datumu in obdobju"
-
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
 #: field:account.fiscal.position,note:0
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
@@ -3230,174 +5933,57 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: account
-#: help:account.invoice,reconciled:0
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entries: "
+msgstr "Vpisi: "
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
 msgid ""
-"The account moves of the invoice have been reconciled with account moves of "
-"the payment(s)."
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
-#: field:account.invoice.line,invoice_line_tax_id:0
-#: model:ir.actions.act_window,name:account.action_tax_form
-#: model:ir.ui.menu,name:account.menu_action_tax_form
-#: model:ir.ui.menu,name:account.next_id_27
-msgid "Taxes"
-msgstr "Davki"
-
-#. module: account
-#: wizard_view:account.fiscalyear.close,init:0
-msgid "Close Fiscal Year with new entries"
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
 msgstr ""
 
-#. module: account
-#: selection:account.account,currency_mode:0
-msgid "Average Rate"
-msgstr ""
-
-#. module: account
-#: model:process.node,note:account.process_node_bankstatement0
-#: model:process.node,note:account.process_node_supplierbankstatement0
-msgid "Statement encoding produces payment entries"
-msgstr ""
-
-#. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
-msgid "Code"
-msgstr "Oznaka"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance
-msgid "Financial Management"
-msgstr "Finance"
-
-#. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
-msgid "None"
-msgstr "Nobena"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
-#: model:ir.ui.menu,name:account.menu_wizard_fy_close
-msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_reconcile
-msgid "Reconcile Entries"
-msgstr "Uskladi vknjižbe"
-
-#. module: account
-#: wizard_view:account.wizard_paid_open,init:0
-msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Če hočete odpreti račun, le-ta ne sme biti usklajen)"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Additionnal Information"
-msgstr "Dodatne informacije"
-
-#. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
-#: rml:account.vat.declaration:0
-msgid "Tax Name"
-msgstr "Naziv davka"
-
-#. module: account
-#: wizard_view:account.fiscalyear.close.state,init:0
-msgid " Close states of Fiscal year and periods"
-msgstr ""
-
-#. module: account
-#: model:account.payment.term,name:account.account_payment_term
-msgid "30 Days End of Month"
-msgstr ""
-
-#. module: account
-#: field:account.chart.template,tax_code_root_id:0
-msgid "Root Tax Code"
-msgstr ""
-
-#. module: account
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
-#. module: account
-#: field:account.tax.code,notprintable:0
-#: field:account.tax.code.template,notprintable:0
-msgid "Not Printable in Invoice"
-msgstr "Ne bo izpisano na računu"
-
-#. module: account
-#: field:account.move.line,move_id:0
-msgid "Move"
-msgstr "Prenos"
-
-#. module: account
-#: field:account.fiscal.position.tax,tax_src_id:0
-#: field:account.fiscal.position.tax.template,tax_src_id:0
-msgid "Tax Source"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
-#: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
-msgid "Analytic Balance"
-msgstr "Analitično stanje"
-
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
 msgstr "Skupaj v breme"
 
 #. module: account
-#: selection:account.analytic.account,state:0
-msgid "Pending"
-msgstr "Na čakanju"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "Bank Information"
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entry \"%s\" is not valid !"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
 msgid "Fax :"
 msgstr "Faks:"
 
-#. module: account
-#: rml:account.partner.balance:0
-#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
-#: model:ir.actions.wizard,name:account.wizard_partner_balance_report
-#: model:ir.ui.menu,name:account.menu_partner_balance
-msgid "Partner Balance"
-msgstr ""
-
-#. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "Third Party Ledger"
-msgstr ""
-
 #. module: account
 #: help:res.partner,property_account_receivable:0
 msgid ""
@@ -3406,7 +5992,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,applicable_type:0
 #: field:account.tax,python_applicable:0
 #: field:account.tax,python_compute:0
 #: selection:account.tax,type:0
@@ -3418,38 +6003,21 @@ msgid "Python Code"
 msgstr "Python kod"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
-msgid "Bank statements"
-msgstr "Bančni izpiski"
-
-#. module: account
-#: model:ir.ui.menu,name:account.next_id_22
-msgid "Partner Accounts"
-msgstr "Partnerjevi konti"
-
-#. module: account
-#: help:account.tax.template,tax_group:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#, python-format
 msgid ""
-"If a default tax if given in the partner it only override taxes from account "
-"(or product) of the same group."
+"Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
-"Če je pri partnerju podan privzeti davek, potem se spremenijo samo davki iz "
-"konta (ali proizvoda) iste skupine."
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Real Entries"
-msgstr "Dejanske vknjižbe"
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
 
 #. module: account
-#: model:process.node,name:account.process_node_importinvoice0
-msgid "Import invoice"
-msgstr "Uvozi račun"
-
-#. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:account.fiscalyear.close:0
 msgid "Create"
 msgstr "Ustvari"
 
@@ -3459,118 +6027,40 @@ msgid "Create entry"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_invoice_line
-msgid "Invoice line"
-msgstr "Postavka računa"
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
-msgid "Shortcut"
-msgstr "Bližnjica"
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr ""
 
 #. module: account
-#: wizard_view:account.move.validate,init:0
+#: code:addons/account/account.py:0
+#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Error !"
+msgstr "Napaka!"
+
+#. module: account
+#: report:account.journal.period.print:0
 msgid ""
-"All draft account entries in this journal and period will be validated. It "
-"means you won't be able to modify their accouting fields."
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
 msgstr ""
 
 #. module: account
-#: selection:account.model.line,date:0
-#: selection:account.model.line,date_maturity:0
-msgid "Date of the day"
-msgstr "Datum dneva"
-
-#. module: account
-#: help:account.move.line,amount_currency:0
-msgid ""
-"The amount expressed in an optional other currency if it is a multi-currency "
-"entry."
-msgstr ""
-
-#. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
-msgid "Parent Tax Account"
-msgstr "Nadrejeni davčni konto"
-
-#. module: account
-#: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
-#: field:account.analytic.account,type:0
-#: model:ir.model,name:account.model_account_account_type
-msgid "Account Type"
-msgstr "Vrsta konta"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank account owner"
-msgstr "Lastnik bančnega računa"
-
-#. module: account
-#: wizard_view:account.account.balance.report,checktype:0
-#: wizard_view:account.general.ledger.report,checktype:0
-#: wizard_view:account.partner.balance.report,init:0
-#: wizard_view:account.third_party_ledger.report,init:0
-msgid "Filter on Periods"
-msgstr "Filter po obdobju"
-
-#. module: account
-#: field:res.partner,property_account_receivable:0
-msgid "Account Receivable"
-msgstr "Konto terjatev"
-
-#. module: account
-#: wizard_button:account.invoice.pay,addendum,reconcile:0
-msgid "Pay and reconcile"
-msgstr "Plačaj in uskladi"
-
-#. module: account
-#: rml:account.central.journal:0
-#: model:ir.actions.report.xml,name:account.account_central_journal
-msgid "Central Journal"
-msgstr "Glavni dnevnik"
-
-#. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "Balance brought forward"
-msgstr ""
-
-#. module: account
-#: field:account.account,child_consol_ids:0
-msgid "Consolidated Children"
-msgstr ""
-
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
-#: wizard_field:account.chart,init,fiscalyear:0
-#: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
-#: wizard_field:account.partner.balance.report,init,fiscalyear:0
-#: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
-msgid "Fiscal year"
-msgstr "Davčno leto"
-
-#. module: account
-#: rml:account.overdue:0
-msgid "Balance :"
-msgstr "Stanje:"
-
-#. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
-msgid "With balance is not equal to 0"
-msgstr "S stanjem različnim od 0"
-
-#. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "3"
-msgstr "3"
-
-#. module: account
+#: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
 msgstr "Poročilo o davkih"
 
@@ -3579,398 +6069,155 @@ msgstr "Poročilo o davkih"
 msgid "Printed"
 msgstr "Natisnjeno"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree4_new
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
-msgid "New Supplier Refund"
-msgstr "Nov dobropis dobavitelja"
-
-#. module: account
-#: view:account.model:0
-msgid "Entry Model"
-msgstr "Model vknjižbe"
-
-#. module: account
-#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
-msgid "With Currency"
-msgstr "z valuto"
-
-#. module: account
-#: view:account.account:0
-msgid "Chart of accounts"
-msgstr "Kontni načrt"
-
-#. module: account
-#: field:account.subscription.line,subscription_id:0
-msgid "Subscription"
-msgstr "Naročnina"
-
-#. module: account
-#: field:account.analytic.journal,code:0
-msgid "Journal code"
-msgstr ""
-
-#. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
-msgid "Create entries"
-msgstr "Ustvari vknjižbe"
-
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
 msgstr ""
 
-#. module: account
-#: wizard_field:account.automatic.reconcile,init,max_amount:0
-msgid "Maximum write-off amount"
-msgstr "Največji znesek odpisa"
-
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
 msgstr "Ročno"
 
 #. module: account
-#: view:account.invoice:0
-msgid "Compute Taxes"
-msgstr "Izračunaj davke"
-
-#. module: account
-#: field:wizard.multi.charts.accounts,code_digits:0
-msgid "# of Digits"
-msgstr "# mest (števila)"
-
-#. module: account
-#: help:res.partner,property_payment_term:0
+#: view:account.automatic.reconcile:0
 msgid ""
-"This payment term will be used instead of the default one for the current "
-"partner"
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
-#: wizard_field:account.invoice.pay,init,name:0
-msgid "Entry Name"
-msgstr "Naziv vknjižbe"
-
-#. module: account
-#: help:account.invoice,account_id:0
-msgid "The partner account used for this invoice."
-msgstr ""
-
-#. module: account
-#: help:account.tax.code,notprintable:0
-#: help:account.tax.code.template,notprintable:0
-msgid ""
-"Check this box if you don't want any VAT related to this Tax Code to appear "
-"on invoices"
-msgstr ""
-
-#. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
-#: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
-#: field:fiscalyear.seq,sequence_id:0
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_template
-msgid "Template for Fiscal Mapping"
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
 msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-msgid "Entry encoding"
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.invoice.refund,init:0
-#: model:ir.actions.wizard,name:account.wizard_invoice_refund
-msgid "Credit Note"
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.todo,note:account.config_fiscalyear
-msgid "Define Fiscal Years and Select Charts of Account"
-msgstr ""
-
-#. module: account
-#: wizard_field:account.move.line.reconcile,addendum,period_id:0
-msgid "Write-Off Period"
-msgstr "Obdobje odpisa"
-
-#. module: account
-#: selection:account.config.wizard,period:0
-msgid "3 Months"
-msgstr "3 meseci"
-
-#. module: account
-#: wizard_view:account.move.journal,init:0
-msgid "Standard entries"
-msgstr "Običajne vknjižbe"
-
-#. module: account
-#: help:account.account,check_history:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid ""
-"Check this box if you want to print all entries when printing the General "
-"Ledger, otherwise it will only print its balance."
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_payment_term_line
-msgid "Payment Term Line"
-msgstr "Postavka plačilnih pogojev"
-
-#. module: account
-#: selection:account.config.wizard,period:0
-#: field:report.hr.timesheet.invoice.journal,name:0
-msgid "Month"
-msgstr "mesec"
-
-#. module: account
-#: model:ir.model,name:account.model_account_subscription
-msgid "Account Subscription"
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
-msgid "Maturity date"
-msgstr "Datum zapadlosti"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Entry Subscription"
-msgstr ""
-
-#. module: account
-#: selection:account.print.journal.report,init,sort_selection:0
-msgid "By date"
-msgstr "Po datumu"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_config_wizard_form
-msgid "Account Configure Wizard "
-msgstr ""
-
-#. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
-#: field:account.subscription,date_start:0
-msgid "Start Date"
-msgstr "Datum začetka"
-
-#. module: account
-#: wizard_view:account.general.ledger.report,account_selection:0
-msgid "Select Chart"
-msgstr ""
-
-#. module: account
-#: selection:account.chart,init,target_move:0
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.bs.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.pl.report,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 msgid "All Entries"
 msgstr "Vse vknjižbe"
 
 #. module: account
-#: model:process.node,name:account.process_node_draftinvoices0
-#: model:process.node,name:account.process_node_supplierdraftinvoices0
-msgid "Draft Invoices"
-msgstr "Osnutki računov"
-
-#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Template Tax Fiscal Mapping"
-msgstr ""
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Invoice Date"
-msgstr "Datum računa"
-
-#. module: account
-#: selection:account.account.type,close_method:0
-msgid "Unreconciled"
-msgstr "Neusklajeni"
-
-#. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
-msgid "Note"
-msgstr "Opomba"
-
-#. module: account
-#: model:ir.module.module,description:account.module_meta_information
+#: constraint:product.template:0
 msgid ""
-"Financial and accounting module that covers:\n"
-"    General accounting\n"
-"    Cost / Analytic accounting\n"
-"    Third party accounting\n"
-"    Taxes management\n"
-"    Budgets\n"
-"    Customer and Supplier Invoices\n"
-"    Bank statements\n"
-"    "
+"Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 
 #. module: account
-#: field:account.journal,sequence_id:0
-msgid "Entry Sequence"
-msgstr "Zaporedje vknjižbe"
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-msgid "Closed"
-msgstr "Zaprt"
-
-#. module: account
-#: model:process.node,name:account.process_node_paymententries0
-msgid "Payment Entries"
+#: view:account.journal.select:0
+msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: help:account.move.line,tax_code_id:0
-msgid "The Account can either be a base tax code or tax code account."
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "Currnt currency is not confirured properly !"
 msgstr ""
 
 #. module: account
-#: help:account.automatic.reconcile,init,account_ids:0
-msgid ""
-"If no account is specified, the reconciliation will be made using every "
-"accounts that can be reconcilied"
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr "Uskladitev konta"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
-#: view:wizard.company.setup:0
-msgid "Overdue Payment Report Message"
-msgstr ""
-
-#. module: account
-#: selection:account.tax,tax_group:0
-#: selection:account.tax.template,tax_group:0
-msgid "Other"
-msgstr "Ostalo"
-
-#. module: account
+#: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
-#: model:ir.actions.wizard,name:account.wizard_general_ledger
-#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
 msgstr "Glavna knjiga"
 
 #. module: account
-#: field:account.journal.view,columns_id:0
-msgid "Columns"
-msgstr "Stolpci"
-
-#. module: account
-#: selection:account.general.ledger.report,checktype,sortbydate:0
-msgid "Movement"
-msgstr "Prenos"
-
-#. module: account
-#: help:account.period,special:0
-msgid "These periods can overlap."
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
 msgstr ""
 
 #. module: account
-#: help:product.template,property_account_expense:0
+#: view:account.balance.report:0
+#: view:account.bs.report:0
 msgid ""
-"This account will be used instead of the default one to value outgoing stock "
-"for the current product"
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
 msgstr ""
 
 #. module: account
-#: model:process.node,note:account.process_node_manually0
-msgid "Encode manually the statement"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_journal_form
-#: model:ir.ui.menu,name:account.menu_action_account_journal_form
-msgid "Financial Journals"
-msgstr "Finančni dnevniki"
-
-#. module: account
-#: selection:account.account.balance.report,checktype,state:0
-#: selection:account.general.ledger.report,checktype,state:0
-#: selection:account.partner.balance.report,init,state:0
-#: selection:account.third_party_ledger.report,init,state:0
-msgid "By Period"
-msgstr "Po obdobju"
-
-#. module: account
-#: help:account.invoice,date_invoice:0
-msgid "Keep empty to use the current date"
-msgstr ""
-
-#. module: account
-#: rml:account.overdue:0
-msgid "."
-msgstr "."
-
-#. module: account
-#: field:account.analytic.account,quantity_max:0
-msgid "Maximum Quantity"
-msgstr "Največja količina"
-
-#. module: account
-#: field:account.period,name:0
-msgid "Period Name"
-msgstr "Naziv obdobja"
-
-#. module: account
-#: help:account.analytic.journal,type:0
+#: help:account.move,to_check:0
 msgid ""
-"Gives the type of the analytic journal. When a document (eg: an invoice) "
-"needs to create analytic entries, Open ERP will look for a matching journal "
-"of the same type."
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
 msgstr ""
 
 #. module: account
-#: field:account.journal,groups_id:0
-msgid "Groups"
-msgstr "Skupine"
-
-#. module: account
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Code/Date"
+#: help:account.installer.modules,account_voucher:0
+msgid ""
+"Account Voucher module includes all the basic requirements of Voucher "
+"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
 
-#. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
-#: field:account.tax,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: account
-#: model:process.node,note:account.process_node_electronicfile0
-msgid "Import from your bank statements"
-msgstr "Uvoz z bančnega izpiska"
-
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
 msgstr "Lastnosti"
 
 #. module: account
-#: view:res.partner:0
-msgid "Customer Accounting Properties"
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
 msgstr ""
 
 #. module: account
@@ -3979,62 +6226,27 @@ msgid "Select entries"
 msgstr "Izberi postavke"
 
 #. module: account
-#: selection:account.chart,init,target_move:0
-msgid "All Posted Entries"
-msgstr ""
-
-#. module: account
-#: wizard_field:account.vat.declaration,init,based_on:0
-msgid "Base on"
-msgstr ""
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Cash Payment"
-msgstr "Gotovinsko plačilo"
-
-#. module: account
-#: field:account.chart.template,property_account_payable:0
-msgid "Payable Account"
-msgstr "Konto obveznosti"
-
-#. module: account
-#: field:account.account,currency_id:0
-#: field:account.account.template,currency_id:0
-msgid "Secondary Currency"
-msgstr "Druga valuta"
-
-#. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,credit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,cost:0
-msgid "Credit"
-msgstr "Dobro"
-
-#. module: account
-#: help:account.tax.template,child_depend:0
+#: code:addons/account/account.py:0
+#, python-format
 msgid ""
-"Indicate if the tax computation is based on the value computed for the "
-"computation of child taxes or based on the total amount."
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
 msgstr ""
 
 #. module: account
-#: field:account.tax,account_paid_id:0
-#: field:account.tax.template,account_paid_id:0
-msgid "Refund Tax Account"
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Konti prihodkov"
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
 msgstr ""
 
 #. module: account
@@ -4044,56 +6256,16 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,move_name:0
-msgid "Account Move"
+#: model:account.journal,name:account.refund_sales_journal
+msgid "Sales Credit Note Journal - (test)"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
-msgid "Statement lines"
-msgstr "Postavke izpiska"
-
-#. module: account
-#: field:account.move.line,amount_taxed:0
-msgid "Taxed Amount"
-msgstr "Obdavčeni znesek"
-
-#. module: account
-#: field:account.invoice.line,price_subtotal:0
-msgid "Subtotal w/o tax"
-msgstr "Seštevek brez davka"
-
-#. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Ref"
-msgstr "Sklic računa"
-
-#. module: account
-#: field:account.analytic.line,general_account_id:0
-msgid "General Account"
-msgstr "Splošni konto"
-
-#. module: account
-#: help:account.move.line,quantity:0
-msgid ""
-"The optional quantity expressed by this line, eg: number of product sold. "
-"The quantity is not a legal requirement but is very usefull for some reports."
-msgstr ""
-
-#. module: account
-#: wizard_field:account.third_party_ledger.report,init,reconcil:0
-msgid "       Include Reconciled Entries"
-msgstr ""
-
-#. module: account
-#: help:account.move.line,blocked:0
-msgid ""
-"You can check this box to mark the entry line as a litigation with the "
-"associated partner"
-msgstr ""
-"Z okljukanjem tega polja označite postavko vknjižbe kot pravdanje s "
-"partnerjem."
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Ni dovolj podatkov!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4102,303 +6274,133 @@ msgid "Customer Invoices"
 msgstr "Izdani računi"
 
 #. module: account
-#: field:res.partner,debit_limit:0
-msgid "Payable Limit"
-msgstr "Mejni zapadli znesek"
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr "Znesek odpisa"
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,state:0
-#: wizard_field:account.general.ledger.report,checktype,state:0
-#: wizard_field:account.partner.balance.report,init,state:0
-#: wizard_field:account.third_party_ledger.report,init,state:0
-msgid "Date/Period Filter"
-msgstr "Filter datum/obdobje"
-
-#. module: account
-#: rml:account.analytic.account.journal:0
-#: selection:account.analytic.journal,type:0
-#: selection:account.bank.statement.line,type:0
-#: selection:account.journal,type:0
-msgid "General"
-msgstr "Splošno"
-
-#. module: account
-#: rml:account.general.journal:0
-msgid "Credit Trans."
+#: view:account.analytic.line:0
+msgid "Sales"
 msgstr ""
 
 #. module: account
-#: field:wizard.multi.charts.accounts,seq_journal:0
-msgid "Separated Journal Sequences"
+#: model:account.journal,name:account.cash_journal
+msgid "Cash Journal - (test)"
 msgstr ""
 
 #. module: account
-#: help:account.bank.statement.reconcile,total_second_currency:0
-msgid "The currency of the journal"
-msgstr "Valuta dnevnika"
-
-#. module: account
-#: view:account.journal.column:0
-#: model:ir.model,name:account.model_account_journal_column
-msgid "Journal Column"
-msgstr "Stolpec dnevnika"
-
-#. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: selection:account.period,state:0
 #: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
 msgid "Done"
 msgstr "Opravljeno"
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
-#: field:account.fiscalyear,period_ids:0
-#: wizard_field:account.general.ledger.report,checktype,periods:0
-#: wizard_field:account.partner.balance.report,init,periods:0
-#: wizard_field:account.third_party_ledger.report,init,periods:0
-#: wizard_field:account.vat.declaration,init,periods:0
-#: model:ir.actions.act_window,name:account.action_account_period_form
-#: model:ir.ui.menu,name:account.menu_action_account_period_form
-#: model:ir.ui.menu,name:account.next_id_23
-msgid "Periods"
-msgstr "Obdobja"
-
-#. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
-#: field:account.move.line,invoice:0
-#: model:ir.model,name:account.model_account_invoice
-#: model:res.request.link,name:account.req_link_invoice
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: account
-#: selection:account.analytic.account,state:0
-#: selection:account.invoice,state:0
-#: wizard_button:account.open_closed_fiscalyear,init,open:0
-#: wizard_button:account_use_models,create,open_move:0
-msgid "Open"
-msgstr "Odpri"
-
-#. module: account
-#: model:ir.ui.menu,name:account.next_id_29
-msgid "Search Entries"
-msgstr "Išči vknjižbe"
-
-#. module: account
-#: model:process.node,note:account.process_node_analytic0
-#: model:process.node,note:account.process_node_analyticcost0
-msgid "Analytic costs to reinvoice purchases, timesheets, ..."
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
-msgid "Default Taxes"
-msgstr "Privzeti davek"
-
-#. module: account
-#: constraint:ir.model:0
+#: view:account.aged.trial.balance:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
 #. module: account
-#: help:account.account.type,sign:0
+#: model:ir.actions.act_window,help:account.action_account_journal_view
 msgid ""
-"Allows you to change the sign of the balance amount displayed in the "
-"reports, so that you can see positive figures instead of negative ones in "
-"expenses accounts."
+"Here you can personalize and create each view of your financial journals by "
+"selecting the fields you want to appear and the sequence they will appear."
 msgstr ""
 
 #. module: account
-#: help:account.config.wizard,code:0
-msgid "Name of the fiscal year as displayed in reports."
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: help:account.move.line,date_maturity:0
+#: model:ir.actions.act_window,help:account.action_account_period_form
 msgid ""
-"This field is used for payable and receivable entries. You can put the limit "
-"date for the payment of this entry line."
-msgstr ""
-"To polje se uporablja knjiženje obveznosti in terjatev. Za postavke teh "
-"vknjižb lahko nastavite zadnji datum plačila."
-
-#. module: account
-#: rml:account.tax.code.entries:0
-msgid "Third party (Country)"
+"Here, you can define a period, an interval of time between successive "
+"closings of the books of your company. An accounting period typically is a "
+"month or a quarter, corresponding to the tax year used by the business. "
+"Create and manage them from here and decide whether a period should be left "
+"open or closed depending on your company's activities over a specific period."
 msgstr ""
 
 #. module: account
-#: field:account.account,parent_left:0
-msgid "Parent Left"
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
 msgstr ""
 
 #. module: account
-#: help:account.journal,sequence_id:0
-msgid "The sequence gives the display order for a list of journals"
-msgstr "Zaporedna številka določa vrstni red prikaza za seznam dnevnikov"
-
-#. module: account
-#: field:account.journal,type_control_ids:0
-msgid "Type Controls"
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
-msgid "Account Name"
-msgstr "Naziv konta"
-
-#. module: account
-#: wizard_field:account.invoice.pay,init,date:0
-msgid "Payment date"
-msgstr "Datum plačila"
-
-#. module: account
-#: wizard_button:account_use_models,create,end:0
-msgid "Ok"
-msgstr "V redu"
-
-#. module: account
-#: rml:account.invoice:0
+#: report:account.invoice:0
 msgid "Taxes:"
 msgstr "Davek:"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree7
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree7
-msgid "Unpaid Customer Invoices"
-msgstr "Neplačani izdani računi"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree2
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
-msgid "Supplier Invoices"
-msgstr "Računi dobaviteljev"
-
-#. module: account
-#: field:account.analytic.line,product_id:0
-#: field:account.invoice.line,product_id:0
-#: field:account.move.line,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: account
-#: rml:account.tax.code.entries:0
-msgid ")"
-msgstr ")"
-
-#. module: account
-#: field:res.partner,credit:0
-msgid "Total Receivable"
-msgstr "Terjatve skupaj"
-
-#. module: account
-#: model:ir.model,name:account.model_account_period
-msgid "Account period"
-msgstr "Obdobje konta"
-
-#. module: account
-#: wizard_field:account.invoice.pay,init,journal_id:0
-msgid "Journal/Payment Mode"
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-msgid "Canceled Invoice"
-msgstr "Storniran račun"
-
-#. module: account
-#: view:account.subscription:0
-msgid "Remove Lines"
-msgstr "Odstrani postavke"
-
-#. module: account
-#: wizard_field:account.general.ledger.report,checktype,soldeinit:0
-#: wizard_field:account.partner.balance.report,init,soldeinit:0
-#: wizard_field:account.third_party_ledger.report,init,soldeinit:0
-msgid "Include initial balances"
-msgstr "Vključi začetna stanja"
-
-#. module: account
-#: view:account.account.template:0
-msgid "Account Template"
-msgstr "Predloga konta"
-
-#. module: account
-#: field:account.tax.code,sum:0
-msgid "Year Sum"
-msgstr "Letni seštevek"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_filestatement0
-msgid "Import file from your bank statement"
-msgstr "Uvoz datoteke z bančnim izpiskom"
-
-#. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
-msgid "Internal Type"
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product UOM"
 msgstr ""
 
 #. module: account
-#: selection:account.automatic.reconcile,init,power:0
+#: selection:account.automatic.reconcile,power:0
 msgid "9"
 msgstr "9"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form_running
-#: model:ir.ui.menu,name:account.menu_action_subscription_form_running
-msgid "Running Subscriptions"
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for Refund Invoice and Period "
+"will be chosen accordingly!"
 msgstr ""
 
 #. module: account
-#: selection:account.move,type:0
-msgid "Bank Payment"
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period length (days)"
+msgstr "Dolžina obdobja (dni)"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: account
-#: selection:account.move,state:0
-msgid "Posted"
-msgstr "Oddano"
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr "Analitične vrstice"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Credit Notes"
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of account structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
 msgstr ""
 
-#. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
-msgid "End Date"
-msgstr "Končni datum"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
-#: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
-msgid "Cancel Opening Entries"
-msgstr ""
-
-#. module: account
-#: model:process.transition,name:account.process_transition_invoicemanually0
-msgid "Manually statement"
-msgstr ""
-
-#. module: account
-#: field:account.payment.term.line,days2:0
-msgid "Day of the Month"
-msgstr "Dan v mesecu"
-
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
@@ -4406,37 +6408,16 @@ msgid "Lines"
 msgstr "Postavke"
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Dear Sir/Madam,"
-msgstr "Dragi gospod/gospa,"
+#: model:account.journal,name:account.bank_journal
+msgid "Bank Journal - (test)"
+msgstr ""
 
 #. module: account
-#: help:account.tax,sequence:0
+#: code:addons/account/invoice.py:0
+#, python-format
 msgid ""
-"The sequence field is used to order the tax lines from the lowest sequences "
-"to the higher ones. The order is important if you have a tax with several "
-"tax children. In this case, the evaluation order is important."
-msgstr ""
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Tax Declaration"
-msgstr "Davčna napoved"
-
-#. module: account
-#: model:process.transition,name:account.process_transition_filestatement0
-msgid "File statement"
-msgstr ""
-
-#. module: account
-#: view:ir.sequence:0
-msgid "Fiscal Year Sequences"
-msgstr ""
-
-#. module: account
-#: view:account.model.line:0
-msgid "Entry Model Line"
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
 msgstr ""
 
 #. module: account
@@ -4445,320 +6426,108 @@ msgid "Account Tax Template"
 msgstr "Kontna predloga davkov"
 
 #. module: account
-#: help:account.model,name:0
-msgid "This is a model for recurring accounting entries"
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.wizard_paid_open,init:0
-msgid "Open Invoice"
-msgstr "Odpri račun"
-
-#. module: account
-#: model:process.node,note:account.process_node_draftstatement0
-msgid "Set starting and ending balance for control"
-msgstr ""
-
-#. module: account
-#: wizard_view:account.wizard_paid_open,init:0
+#: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
 msgstr "Ali res želite odpreti ta račun?"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
-msgid "Partner Other Ledger"
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: view:res.partner:0
-msgid "Supplier Debit"
-msgstr ""
-
-#. module: account
-#: help:account.model.line,quantity:0
-msgid "The optional quantity on entries"
-msgstr ""
-
-#. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "JNRL"
-msgstr ""
-
-#. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
-msgid "States"
-msgstr "Stanja"
-
-#. module: account
-#: view:account.move:0
-#: model:process.node,name:account.process_node_accountingentries0
-#: model:process.node,name:account.process_node_supplieraccountingentries0
-msgid "Accounting Entries"
-msgstr "Računovodske vknjižbe"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
-msgid "Receivables & Payables"
-msgstr "Terjatve in obveznosti"
-
-#. module: account
-#: rml:account.general.ledger:0
-msgid "General Ledger -"
-msgstr "Glavna knjiga -"
-
-#. module: account
-#: field:report.hr.timesheet.invoice.journal,quantity:0
-msgid "Quantities"
-msgstr "Količine"
-
-#. module: account
-#: field:account.analytic.account,date_start:0
-msgid "Date Start"
-msgstr "Datum začetka"
-
-#. module: account
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
-msgid "Total"
-msgstr "Skupaj"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_customerinvoice0
-#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
-msgid "Number of entries are generated"
-msgstr ""
-
-#. module: account
-#: model:process.transition,name:account.process_transition_suppliervalidentries0
-#: model:process.transition,name:account.process_transition_validentries0
-msgid "Valid Entries"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_account_use_model
-#: model:ir.actions.wizard,name:account.wizard_line_account_use_model
-#: model:ir.ui.menu,name:account.menu_account_use_model
-msgid "Create Entries From Models"
-msgstr ""
-
-#. module: account
-#: field:account.account.template,reconcile:0
-msgid "Allow Reconciliation"
-msgstr "Dovoli uskladitev"
-
-#. module: account
-#: selection:account.account.balance.report,checktype,state:0
-#: selection:account.general.ledger.report,checktype,state:0
-#: selection:account.partner.balance.report,init,state:0
-#: selection:account.third_party_ledger.report,init,state:0
-msgid "By Date"
-msgstr "Po datumu"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree4
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
-msgid "Supplier Refunds"
-msgstr "Dobropisi dobaviteljev"
-
-#. module: account
-#: help:account.model.line,date:0
-msgid "The date of the generated entries"
-msgstr "Datum ustvarjenih vknjižb"
-
-#. module: account
-#: wizard_button:account.invoice.refund,init,modify_invoice:0
-msgid "Modify Invoice"
-msgstr "Spremeni račun"
-
-#. module: account
-#: view:res.partner:0
-msgid "Supplier Accounting Properties"
-msgstr ""
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Analytic Account Statistics"
-msgstr ""
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid ""
-"This will automatically configure your chart of accounts, bank accounts, "
-"taxes and journals according to the selected template"
+#: model:account.account.type,name:account.account_type_income
+msgid "Erfolgskonten - Erlöse"
 msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
 msgstr "Izpisek"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
-#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
-msgid "Entries Encoding by Move"
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.analytic.account.chart,init:0
-msgid "Analytic Account Charts"
-msgstr ""
-
-#. module: account
-#: wizard_field:account.aged.trial.balance,init,result_selection:0
-msgid "Filter on Partners"
-msgstr ""
-
-#. module: account
-#: field:account.tax,price_include:0
-msgid "Tax Included in Price"
-msgstr "Davek vključen v ceni"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
-#: model:ir.ui.menu,name:account.account_analytic_journal_entries
-msgid "Analytic Entries by Journal"
-msgstr ""
-
-#. module: account
-#: model:process.transition,note:account.process_transition_suppliervalidentries0
-#: model:process.transition,note:account.process_transition_validentries0
-msgid "Valid entries from invoice"
-msgstr ""
-
-#. module: account
-#: field:account.account,company_id:0
-#: wizard_field:account.account.balance.report,checktype,company_id:0
-#: wizard_field:account.aged.trial.balance,init,company_id:0
-#: field:account.analytic.account,company_id:0
-#: field:account.fiscal.position,company_id:0
-#: field:account.fiscalyear,company_id:0
-#: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
-#: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
-#: wizard_field:account.third_party_ledger.report,init,company_id:0
-#: wizard_field:account.vat.declaration,init,company_id:0
-#: field:wizard.company.setup,company_id:0
-#: field:wizard.multi.charts.accounts,company_id:0
-msgid "Company"
-msgstr "Družba"
-
-#. module: account
-#: rml:account.general.ledger:0
-msgid "Crebit"
-msgstr ""
-
-#. module: account
-#: selection:account.subscription,state:0
-msgid "Running"
-msgstr "V teku"
-
-#. module: account
-#: help:account.tax,include_base_amount:0
+#: model:ir.module.module,description:account.module_meta_information
 msgid ""
-"Indicate if the amount of tax must be included in the base amount for the "
-"computation of the next taxes"
-msgstr ""
-"Označuje, če mora biti znesek davka vključen v osnovni znesek za izračun "
-"sledečih davkov"
-
-#. module: account
-#: model:process.node,name:account.process_node_draftstatement0
-msgid "Draft statement"
+"Financial and accounting module that covers:\n"
+"    General accountings\n"
+"    Cost / Analytic accounting\n"
+"    Third party accounting\n"
+"    Taxes management\n"
+"    Budgets\n"
+"    Customer and Supplier Invoices\n"
+"    Bank statements\n"
+"    Reconciliation process by partner\n"
+"    Creates a dashboard for accountants that includes:\n"
+"    * List of uninvoiced quotations\n"
+"    * Graph of aged receivables\n"
+"    * Graph of aged incomes\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"module named account_voucher.\n"
+"    "
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,name:0
-msgid "Journal name"
-msgstr "Naziv dnevnika"
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: view:account.invoice.report:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr "Datum računa"
 
 #. module: account
-#: model:process.transition,note:account.process_transition_invoiceimport0
-msgid "Import invoice from statement"
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr "Skupni znesek, ki vam ga dolguje ta stranka."
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
 msgstr ""
 
-#. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "4"
-msgstr "4"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
-#: view:ir.sequence:0
-#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
-msgid "Fiscal Years"
-msgstr "Poslovna leta"
-
-#. module: account
-#: model:process.node,note:account.process_node_importinvoice0
-msgid "Import from invoices or payments"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_reconcile_select
-#: model:ir.ui.menu,name:account.menu_reconcile_select
-msgid "Reconcile entries"
-msgstr "Uskladi vknjižbe"
-
-#. module: account
-#: xsl:account.transfer:0
-msgid "Change"
-msgstr "Sprememba"
-
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
 msgstr "Ikona"
 
 #. module: account
-#: model:ir.model,name:account.model_account_journal_period
-msgid "Journal - Period"
-msgstr "Dnevnik - obdobje"
-
-#. module: account
-#: wizard_field:account.move.line.reconcile,init_full,credit:0
-#: wizard_field:account.move.line.reconcile,init_partial,credit:0
-msgid "Credit amount"
-msgstr "Znesek v dobro"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Create Monthly Periods"
-msgstr "Ustvari mesečna obdobja"
-
-#. module: account
-#: wizard_button:account.aged.trial.balance,init,print:0
-msgid "Print Aged Trial Balance"
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"Cash Register allows you to manage cash entries in your cash journals."
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "Ref."
-msgstr "Sklic"
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr "V redu"
 
 #. module: account
-#: field:account.invoice,address_invoice_id:0
-msgid "Invoice Address"
-msgstr "Naslov za račun"
+#: code:addons/account/report/account_partner_balance.py:0
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "General Credit"
+#: view:account.bank.statement:0
+msgid "Opening Balance"
 msgstr ""
 
 #. module: account
@@ -4770,130 +6539,40 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.invoice,state:0
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
-msgid "Draft statements"
-msgstr "Pripravljeni izpiski"
-
-#. module: account
-#: wizard_field:populate_statement_from_inv,init,date:0
-msgid "Date payment"
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-msgid "A/c No."
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
-#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
-msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
-
-#. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
-msgid "Receivable Accounts"
-msgstr "Konti terjatev"
-
-#. module: account
-#: wizard_button:account.move.line.unreconcile.select,init,open:0
-msgid "Open for unreconciliation"
-msgstr "Odpri za preklic uskladitve"
-
-#. module: account
-#: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
 msgstr "Postavka bančnega izpiska"
 
 #. module: account
-#: wizard_button:account.automatic.reconcile,reconcile,end:0
-msgid "OK"
-msgstr "V redu"
-
-#. module: account
-#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
-msgid "Control Invoice"
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.aged.trial.balance,init,result_selection:0
-msgid "Receivable"
-msgstr "Terjatev"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_account_balance
-#: model:ir.actions.wizard,name:account.wizard_account_balance_report
-#: model:ir.actions.wizard,name:account.wizard_balance_report
-#: model:ir.ui.menu,name:account.menu_account_balance_report
-msgid "Account Balance"
-msgstr "Saldo konta"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
-#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
-msgid "Analytic Check"
+#: field:account.invoice.report,uom_name:0
+msgid "Default UoM"
 msgstr ""
 
 #. module: account
-#: rml:account.overdue:0
-msgid "VAT:"
-msgstr "DDV:"
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
-#: rml:account.invoice:0
-msgid "Total:"
-msgstr "Skupaj:"
-
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_journal
-msgid "account.analytic.journal"
-msgstr "account.analytic.journal"
-
-#. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
-#: field:account.fiscal.position.template,account_ids:0
-msgid "Account Mapping"
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
 msgstr ""
 
-#. module: account
-#: view:product.product:0
-msgid "Sale Taxes"
-msgstr "Davek od prodaje"
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_reconcile
-msgid "Account Reconciliation"
-msgstr "Uskladitev konta"
-
 #. module: account
 #: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Potrdi"
 
 #. module: account
-#: wizard_view:account.account.balance.report,account_selection:0
-msgid "Select parent account"
-msgstr "Izberite nadrejeni konto"
-
-#. module: account
-#: field:account.account.template,parent_id:0
-msgid "Parent Account Template"
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number, Company bank account if Invoice is customer or supplier "
+"refund, otherwise Partner bank account number."
 msgstr ""
 
 #. module: account
@@ -4907,181 +6586,41 @@ msgstr ""
 "ustvarite posebne davka za določene namene."
 
 #. module: account
-#: field:account.bank.statement.reconcile,total_amount:0
-#: field:account.bank.statement.reconcile,total_second_amount:0
-msgid "Payment amount"
-msgstr "Znesek plačila"
-
-#. module: account
-#: view:account.analytic.account:0
-msgid "Analytic account"
-msgstr "Analitični konto"
-
-#. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
-msgid "Supplier Invoice"
-msgstr "Račun dobavitelja"
-
-#. module: account
-#: selection:account.move.line,state:0
-msgid "Valid"
-msgstr "Veljavno"
-
-#. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,debit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,revenue:0
-msgid "Debit"
-msgstr "V breme"
-
-#. module: account
-#: model:ir.ui.menu,name:account.next_id_42
-msgid "All Months"
-msgstr "Vsi meseci"
-
-#. module: account
-#: wizard_field:account.invoice.refund,init,date:0
-msgid "Operation date"
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,invoice_line:0
-msgid "Invoice Lines"
-msgstr "Postavke računa"
-
-#. module: account
-#: field:account.period,date_start:0
-msgid "Start of Period"
-msgstr "Začetek obdobja"
-
-#. module: account
-#: wizard_field:account.fiscalyear.close,init,report_name:0
+#: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
 msgstr "Naziv novih vknjižb"
 
 #. module: account
-#: wizard_button:account_use_models,init_form,create:0
+#: view:account.use.model:0
 msgid "Create Entries"
 msgstr "Ustvari vknjižbe"
 
-#. module: account
-#: field:account.tax,ref_tax_code_id:0
-#: field:account.tax.template,ref_tax_code_id:0
-msgid "Refund Tax Code"
-msgstr ""
-
-#. module: account
-#: field:account.invoice.tax,name:0
-msgid "Tax Description"
-msgstr "Opis davka"
-
-#. module: account
-#: help:account.invoice,move_id:0
-msgid "Link to the automatically generated account moves."
-msgstr ""
-
-#. module: account
-#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
-msgid "Reconciled transactions"
-msgstr "Usklajene transakcije"
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
 msgstr "Poročanje"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "/"
-msgstr "/"
-
-#. module: account
-#: model:process.node,note:account.process_node_invoiceinvoice0
-#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
-msgid "Have a number and entries are generated"
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "Analytic Check -"
-msgstr "Analitična kontrola -"
-
-#. module: account
-#: rml:account.account.balance:0
-msgid "Account Balance -"
-msgstr "Stanje konta -"
-
-#. module: account
-#: field:account.journal,group_invoice_lines:0
-msgid "Group invoice lines"
-msgstr "Združuj vrstice računa"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_configuration
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
-msgid "Total amount"
-msgstr "Skupni znesek"
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
 msgstr "Dnevnik konta"
 
-#. module: account
-#: view:account.subscription.line:0
-msgid "Subscription lines"
-msgstr ""
-
-#. module: account
-#: field:account.chart.template,property_account_income:0
-msgid "Income Account on Product Template"
-msgstr ""
-
-#. module: account
-#: help:account.account,currency_id:0
-#: help:account.account.template,currency_id:0
-msgid "Force all moves for this account to have this secondary currency."
-msgstr "Prisili vse prenose za ta konto, da ima to drugo valuto."
-
-#. module: account
-#: wizard_button:populate_statement_from_inv,go,end:0
-#: wizard_button:populate_statement_from_inv,init,end:0
-msgid "_Cancel"
-msgstr "_Prekliči"
-
-#. module: account
-#: wizard_view:account.general.ledger.report,checktype:0
-#: wizard_view:account.partner.balance.report,init:0
-#: wizard_view:account.third_party_ledger.report,init:0
-msgid "Select Date-Period"
-msgstr "Izberi datum-obdobje"
-
-#. module: account
-#: rml:account.analytic.account.inverted.balance:0
-msgid "Inverted Analytic Balance -"
-msgstr ""
-
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
@@ -5089,59 +6628,2553 @@ msgid "Paid invoice"
 msgstr "Plačani račun"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Tax Definition"
-msgstr "Definicija davka"
-
-#. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
-msgid "Tax Group"
-msgstr "Davčna skupina"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
-msgid "New Customer Refund"
-msgstr "Nov izdani dobropis"
-
-#. module: account
-#: help:wizard.multi.charts.accounts,seq_journal:0
+#: help:account.partner.reconcile.process,next_partner_id:0
 msgid ""
-"Check this box if you want to use a different sequence for each created "
-"journal. Otherwise, all will use the same sequence."
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
 msgstr ""
 
 #. module: account
-#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
-msgid "Import invoices"
-msgstr "Uvozi račune"
-
-#. module: account
-#: wizard_view:account.move.line.unreconcile,init:0
-#: wizard_view:account.move.line.unreconcile.select,init:0
-#: wizard_view:account.reconcile.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Preklic uskladitve"
-
-#. module: account
-#: model:ir.model,name:account.model_fiscalyear_seq
-msgid "Maintains Invoice sequences with Fiscal Year"
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
 msgstr ""
 
-#. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
-msgid "With movements"
-msgstr "S premiki"
-
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domena"
 
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account, OpenERP will propose to you automatically the "
+"Tax related to this account and the counter-part \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), Which is calculated from "
+"Profit & Loss Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.bs.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+msgstr "Podpis na poročilih"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: report:account.move.voucher:0
+msgid "PRO-FORMA"
+msgstr "Predračun"
+
+#. module: account
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr "Običajna"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr "Neobvezni podatki"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ":"
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr "Na datum"
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Bad account !"
+msgstr "Napačni konto!"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Sales Journal"
+msgstr "Prodajni dnevnik"
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr "Zaračunan davek"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.expenses_journal
+msgid "Expenses Journal - (test)"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr "Zapadli znesek skupaj:"
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr "Za"
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr "Poslovno leto za zapret"
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Predloge za kontne načrte"
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr "Davčna stopnja"
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr "Davek od prodaje"
+
+#. module: account
+#: model:account.journal,name:account.sales_journal
+msgid "Sales Journal - (test)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+msgid "Cash"
+msgstr "Gotovina"
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 14"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account:0
+msgid "Parent"
+msgstr "Nadrejeni"
+
+#. module: account
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+"Dan v mesecu, -1 za zadnji dan tekočega meseca. Če pozitiven, bo pomenil dan "
+"v naslednjem mesecu. izberite 0 za točno število dni (drugače se izračuna od "
+"začetka meseca)."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr "Seštevek obdobja"
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr "Saldakonti"
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr "Leto:"
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr "Stalno"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Opozorilo!"
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr "Izračun naročnine"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_other
+msgid "Jahresabschlusskonten u. Statistik"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr "Uporaba davka v"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's financial journals from this menu. A "
+"journal is a business diary in which all financial data related to the day "
+"to day business transactions of your company is recorded using double-entry "
+"book keeping system. Depending on the nature of its activities and number of "
+"daily transactions, a company may keep several  types of specialized "
+"journals such as a cash journal, purchases journal, and sales journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr "Metoda zaključevanja"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr "Postavka"
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr "Odpri za uskladitev z izpiski"
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr "En partner na stran"
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr "Otroci"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr "Pridružen partner"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must first select a partner !"
+msgstr "Najprej morate izbrati partnerja!"
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr "Dodatni podatki"
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "Stroškovna glavna knjiga"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr "Izberi poslovno leto"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr "8"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and Financial Management"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr "Ročno"
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr "Obdobje"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr "Skupaj (brez davkov):"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr "Dnevnik odpisov"
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Koda izračuna za davke v cenah"
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr "Konto kategorije prihodkov"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr "Predloge davčnih pozicij"
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr "Znesek davka/osnove"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr "Valute družba"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid ""
+"You can look up individual account entries by searching for useful "
+"information. To search for account entries, open a journal, then select a "
+"record line."
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+msgid ""
+"This account will be used for invoices to value sales for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr "Delno uskladi"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_view
+#: model:ir.ui.menu,name:account.menu_action_account_journal_view
+msgid "Journal Views"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr "Vrste kontov"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:0
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr "Uskladitev"
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Konto terjatev"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr "Dnevnik vračil"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr "Stopnja naddavka"
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr "Postavka plačilnih pogojev"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Purchase Journal"
+msgstr "Dnevnik nakupov"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Partner Ref."
+msgstr "Sklic partnerja"
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr "Zapade dne"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr "Dovoljene vrste kontov (prazno - brez kontrole)"
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: balance"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr "Od"
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is a name or code given to an account that indicates its "
+"purpose. For example, the account type could be linked to an asset account, "
+"expense account or payable account. From this view, you can create and "
+"manage the account types you need to be used for your company management."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr "Znesek v breme"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.common.report:0
+msgid "Print"
+msgstr "Natisni"
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr "Dovoljeni konti (prazno - ni kontrole)"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr "Skupni znesek za plačilo temu dobavitelju."
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr "Naziv dnevnika"
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+"Zaporedna številka računa, izračunana avtomatično ob kreiranju računa."
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Bad account!"
+msgstr "Napačni konto!"
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr "Usklajene vknjižbe"
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Naslov stika"
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice.             \n"
+"* The 'Paid' state is set automatically when invoice is paid.            \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr "Vsili obdobje"
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr "Dnevnik otvoritev"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss: Amount will be deducted.), Which is calculated from "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr "Vrsta sklica"
+
+#. module: account
+#: help:account.bs.report,reserve_account_id:0
+msgid ""
+"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
+"& Loss Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+"Izberite če izračun davka temelji na izračunih podrejenih davkov in ne na "
+"celotnem znesku."
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr "Šifra dnevnika"
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr "Postavke vknjižbe"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+msgid "Open Journal"
+msgstr "Odpri dnevnik"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr "Obdobje od"
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify company of this period as its related record exist in "
+"Entry Lines"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr "Informacije"
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr "Analitični"
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"A tax code is a reference of a tax that will be taken out of a gross income "
+"depending on the country and sometimes industry sector. OpenERP allows you "
+"to define and manage them from this menu."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr "Dragi gospod/gospa,"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage accounts you will need to record financial entries in. "
+"Accounts are financial records of your company that register all financial "
+"transactions. Companies present their annual accounts in two main parts: the "
+"balance sheet and the income statement (profit and loss account). The annual "
+"accounts of a company are required by law to disclose a certain amount of "
+"information. They have to be certified by an external auditor yearly."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr "Konec obdobja"
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr "Smer analize"
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr "Družbe, ki so povezane s partnerjem"
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr "Pogled dnevnika"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Skupaj v dobro"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"You cannot cancel the Invoice which is Partially Paid! You need to "
+"unreconcile concerned payment entries!"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr "S spoštovanjem,"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodic tax statement. You will "
+"see here the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Pustite prazno v primeru konta prihodkov"
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,balance_end:0
+#: field:account.bank.statement,balance_end_cash:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "("
+msgstr "("
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr "Obveznosti"
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Year"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Odbor za računovodstvo"
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr "Napotki"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Cannot delete bank statement(s) which are already confirmed !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Bilanca po vrsti konta"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr "Prenos"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr "Bančni izpiski"
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr "Datum dneva"
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr "transakcije zapiranja"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr "Kontni načrt"
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr "Naročnina"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr "Običajne vknjižbe"
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: field:account.installer,date_start:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+msgid "Start Date"
+msgstr "Datum začetka"
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr "Osnutki računov"
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr "Neusklajeni"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Bad total !"
+msgstr "Napačna skupna vsota!"
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr "Zaporedje vknjižbe"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Na čakanju"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_payment:0
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr "Naziv obdobja"
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr "Aktivno"
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr "Druga valuta"
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.move.voucher:0
+#: report:account.partner.balance:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr "Dobro"
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the refund invoice that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Through :"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr "Število"
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr "Splošno"
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr "Obdobja"
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund invoice base on this type. You can not Modify and Cancel if the "
+"invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_analytic_plans:0
+msgid ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
+msgstr ""
+
+#. module: account
+#: field:account.installer,sale_tax:0
+msgid "Sale Tax(%)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr "Računi dobaviteljev"
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid ")"
+msgstr ")"
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr "Obdobje konta"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr "Odstrani postavke"
+
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "State:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: account
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr "Izberi obdobje"
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+msgstr "Oddano"
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: field:account.installer,date_stop:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+msgid "End Date"
+msgstr "Končni datum"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr "Dan v mesecu"
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_balance_sheet.py:0
+#: code:addons/account/report/account_profit_loss.py:0
+#, python-format
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr "Stanja"
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr "Skupaj"
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr "Ustvari mesečna obdobja"
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr "Pripravljeni izpiski"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr "Postavke računa"
+
+#. module: account
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.chart,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
+msgstr "Opozorilo"
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "account.analytic.journal"
+msgstr "account.analytic.journal"
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Prenos odpisa"
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr "Račun dobavitelja"
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.move.voucher:0
+#: report:account.partner.balance:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr "V breme"
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr "Postavke računa"
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used for invoices to value expenses for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Konti terjatev"
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr "Partnerjevi plačilni pogoji"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Obseg"
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr "S premiki"
+
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
@@ -5153,80 +9186,46 @@ msgid "Account Tax Code Template"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-msgid "Subscription Periods"
+#: model:account.account.type,name:account.account_type_expense
+msgid "Erfolgskonten - Aufwendungen"
 msgstr ""
 
 #. module: account
-#: model:process.node,name:account.process_node_manually0
-msgid "Manually"
-msgstr "Ročno"
-
-#. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
-#: selection:account.vat.declaration,init,based_on:0
-#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
-#: model:ir.actions.act_window,name:account.action_invoice_tree
-#: model:ir.actions.report.xml,name:account.account_invoices
-#: model:ir.ui.menu,name:account.menu_finance_invoice
-#: wizard_field:populate_statement_from_inv,go,lines:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
-msgid "Payable Accounts"
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
-msgid "Invoice Line"
-msgstr "Postavka računa"
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr "Izpiši dnevnik analitike"
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
-msgid "Write-Off journal"
-msgstr "Dnevnik odpisov"
-
-#. module: account
-#: wizard_button:account.invoice.pay,init,writeoff_check:0
-msgid "Full Payment"
-msgstr "Plačilo v celoti"
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Journal Purchase"
+#: view:account.analytic.line:0
+msgid "Fin.Account"
 msgstr ""
 
 #. module: account
-#: selection:account.move,type:0
-msgid "Cash Receipt"
-msgstr "Blagajniški prejemek"
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Zastarane terjatve"
 
 #. module: account
-#: field:account.fiscal.position.tax,tax_dest_id:0
-#: field:account.fiscal.position.tax.template,tax_dest_id:0
-msgid "Replacement Tax"
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
 msgstr ""
 
 #. module: account
-#: model:process.transition,note:account.process_transition_invoicemanually0
-msgid "Encode manually statement comes into the draft statement"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.menu,name:account.next_id_43
-msgid "This Month"
-msgstr "Ta mesec"
-
-#. module: account
-#: field:account.account.type,sign:0
-msgid "Sign on Reports"
-msgstr "Podpis na poročilih"
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid "This period is already closed !"
+msgstr "To obdobje je že zaprto!"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -5234,73 +9233,30 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
-#: selection:account.vat.declaration,init,based_on:0
-msgid "Payments"
-msgstr "Plačila"
-
-#. module: account
-#: model:process.node,note:account.process_node_accountingstatemententries0
-msgid "Accounting entries at statement's confirmation"
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
 
 #. module: account
-#: wizard_view:account_use_models,create:0
-msgid "Use Model"
-msgstr "Uporabi model"
-
-#. module: account
-#: wizard_button:account.wizard_paid_open,init,end:0
-msgid "No"
-msgstr "Ne"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.act_account_partner_account_move
-msgid "All account entries"
-msgstr "Vse vknjižbe kontov"
-
-#. module: account
-#: help:account.invoice.tax,tax_code_id:0
-msgid "The tax basis of the tax declaration."
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.account.balance.report,checktype:0
-#: wizard_view:account.general.ledger.report,checktype:0
-#: wizard_view:account.partner.balance.report,init:0
-#: wizard_view:account.third_party_ledger.report,init:0
-msgid "Date Filter"
+#: model:account.journal,name:account.check_journal
+msgid "Checks Journal - (test)"
 msgstr ""
 
 #. module: account
-#: wizard_view:populate_statement_from_inv,init:0
-msgid "Choose Journal and Payment Date"
+#: view:account.account:0
+msgid "Parent Account"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.account,state:0
-#: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
-#: selection:account.subscription,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: account
-#: rml:account.overdue:0
-msgid "Paid"
-msgstr "Plačano"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree11
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
-msgid "Unpaid Customer Refunds"
-msgstr "Neplačani izdani dobropisi"
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5308,108 +9264,41 @@ msgid "Remaining amount due."
 msgstr ""
 
 #. module: account
-#: wizard_view:account.period.close,init:0
-msgid "Are you sure ?"
-msgstr "Ali ste prepričani?"
-
-#. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
-msgid "PRO-FORMA"
-msgstr "Predračun"
-
-#. module: account
-#: field:account.move.reconcile,line_partial_ids:0
-msgid "Partial Entry lines"
-msgstr "Delne postavke vknjižbe"
-
-#. module: account
-#: help:account.move.line,statement_id:0
-msgid "The bank statement used for bank reconciliation"
-msgstr "Bančni izpisek, ki se uporablja pri uskladitvi"
-
-#. module: account
-#: view:account.fiscalyear:0
-msgid "Fiscalyear"
-msgstr "Poslovno leto"
-
-#. module: account
-#: wizard_button:account.analytic.line,init,open:0
-msgid "Open Entries"
-msgstr "Odprte postavke"
-
-#. module: account
-#: selection:account.analytic.account,type:0
-#: selection:account.move.line,centralisation:0
-msgid "Normal"
-msgstr "Običajna"
-
-#. module: account
-#: model:process.process,name:account.process_process_supplierinvoiceprocess0
-msgid "Supplier Invoice Process"
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-msgid "Page"
-msgstr "Stran"
-
-#. module: account
-#: view:account.move:0
-#: view:account.move.line:0
-msgid "Optional Information"
-msgstr "Neobvezni podatki"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_payment_term_form
-#: model:ir.ui.menu,name:account.menu_action_payment_term_form
-msgid "Payment Terms"
-msgstr "Plačilni pogoji"
-
-#. module: account
-#: selection:account.aged.trial.balance,init,result_selection:0
-msgid "Receivable and Payable"
+#: field:account.installer,progress:0
+#: field:account.installer.modules,progress:0
+#: field:wizard.multi.charts.accounts,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
-msgid ":"
-msgstr ":"
-
-#. module: account
-#: field:account.bank.statement.line,reconcile_amount:0
-msgid "Amount reconciled"
-msgstr "Usklajeni znesek"
-
-#. module: account
-#: selection:account.account,currency_mode:0
-msgid "At Date"
-msgstr "Na datum"
-
-#. module: account
-#: help:account.move.line,tax_amount:0
-msgid ""
-"If the Tax account is tax code account, this field will contain the taxed "
-"amount.If the tax account is base tax code,                    this field "
-"will contain the basic amount(without tax)."
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
-#: view:account.subscription:0
-msgid "Compute"
-msgstr "Izračunaj"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -5417,90 +9306,36 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: field:account.tax,type_tax_use:0
-msgid "Tax Application"
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form
-#: model:ir.ui.menu,name:account.menu_action_subscription_form
-msgid "Subscription Entries"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree6
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree6
-msgid "PRO-FORMA Customer Invoices"
-msgstr "Izdani predračuni"
-
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
 msgstr "Število obdobij"
 
 #. module: account
-#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
-#: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
-#: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
-#: wizard_field:account.analytic.account.journal.report,init,date2:0
-#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
-#: wizard_field:account.automatic.reconcile,init,date2:0
-msgid "End of period"
-msgstr "Konec obdobja"
-
-#. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
-msgid "Account Entry"
-msgstr "Vknjižba"
-
-#. module: account
-#: rml:account.general.journal:0
+#: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-msgid "Balance"
-msgstr "Saldo"
-
-#. module: account
-#: rml:account.invoice:0
-msgid "Refund"
-msgstr "Dobropis"
-
-#. module: account
-#: model:ir.model,name:account.model_account_invoice_tax
-msgid "Invoice Tax"
-msgstr "Zaračunan davek"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
-#: model:ir.ui.menu,name:account.account_def_analytic_journal
-msgid "Analytic Journal Definition"
+#: view:account.invoice:0
+msgid "Search Invoice"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr "account.tax.template"
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: selection:account.invoice.refund,filter_refund:0
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund"
+msgstr "Dobropis"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -5508,101 +9343,48 @@ msgid "Bank Accounts"
 msgstr "Bančni računi"
 
 #. module: account
-#: constraint:account.period:0
-msgid ""
-"Invalid period ! Some periods overlap or the date period is not in the scope "
-"of the fiscal year. "
-msgstr ""
-
-#. module: account
-#: help:account.journal,invoice_sequence_id:0
-msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr "Terjatve skupaj"
 
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
 #: view:account.journal:0
-#: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
 msgstr "Splošne informacije"
 
 #. module: account
-#: help:populate_statement_from_inv,init,journal_id:0
-msgid ""
-"This field allow you to choose the accounting journals you want for "
-"filtering the invoices. If you left this field empty, it will search on all "
-"sale, purchase and cash journals."
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
 msgstr ""
 
 #. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error ! The duration of the Fiscal Year is invalid. "
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.account,state:0
-msgid "Close"
-msgstr "Zaprto"
-
-#. module: account
-#: field:account.bank.statement.line,move_ids:0
-msgid "Moves"
-msgstr "Premiki"
-
-#. module: account
-#: selection:account.invoice,state:0
-msgid "Pro-forma"
-msgstr "Predračun"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_form
-#: model:ir.ui.menu,name:account.menu_action_account_form
-msgid "List of Accounts"
-msgstr "Seznam kontov"
-
-#. module: account
-#: view:product.product:0
-#: view:product.template:0
-msgid "Sales Properties"
-msgstr ""
-
-#. module: account
-#: rml:account.general.journal:0
-msgid "Printing Date :"
-msgstr "Datum izpisa:"
-
-#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
-#: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
 msgid "Cost Ledger (Only quantities)"
 msgstr "Knjiga odhodkov (samo količine)"
 
 #. module: account
-#: wizard_view:account.move.validate,init:0
-msgid "Validate Account Entries"
-msgstr "Preveri vknjižbe kontov"
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
 
 #. module: account
-#: selection:account.print.journal.report,init,sort_selection:0
-msgid "Reference Number"
-msgstr "Številka sklica"
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Total amount due:"
-msgstr "Zapadli znesek skupaj:"
-
-#. module: account
-#: wizard_field:account.analytic.account.chart,init,to_date:0
-#: wizard_field:account.analytic.line,init,to_date:0
-msgid "To"
-msgstr "Za"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
-msgid "Entries of Open Analytic Journals"
+#: view:account.account.template:0
+msgid "Search Account Templates"
 msgstr ""
 
 #. module: account
@@ -5611,75 +9393,14 @@ msgid "Manual Invoice Taxes"
 msgstr "Ročno zaračunan davek"
 
 #. module: account
-#: field:account.model.line,date:0
-msgid "Current Date"
-msgstr "Trenutni datum"
-
-#. module: account
-#: selection:account.move,type:0
-msgid "Journal Sale"
-msgstr ""
-
-#. module: account
-#: wizard_field:account.fiscalyear.close,init,fy_id:0
-#: wizard_field:account.fiscalyear.close.state,init,fy_id:0
-msgid "Fiscal Year to close"
-msgstr "Poslovno leto za zapret"
-
-#. module: account
-#: wizard_field:account.aged.trial.balance,init,date1:0
-#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
-#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
-#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
-#: wizard_field:account.analytic.account.journal.report,init,date1:0
-#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
-#: wizard_field:account.automatic.reconcile,init,date1:0
-msgid "Start of period"
-msgstr "Začetek obdobja"
-
-#. module: account
-#: model:ir.ui.menu,name:account.account_template_folder
-msgid "Templates"
-msgstr "Predloge"
-
-#. module: account
-#: wizard_button:account.vat.declaration,init,report:0
-msgid "Print VAT Decl."
-msgstr "Izpiši deklaracijo DDV"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_intracom
-msgid "IntraCom"
-msgstr ""
-
-#. module: account
-#: view:account.analytic.account:0
-#: field:account.analytic.account,description:0
-#: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
-#: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: account
-#: help:product.template,property_account_income:0
-msgid ""
-"This account will be used instead of the default one to value incoming stock "
-"for the current product"
-msgstr ""
-
-#. module: account
-#: field:account.tax,child_ids:0
-msgid "Child Tax Accounts"
-msgstr ""
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr "Skupaj:"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -5687,197 +9408,84 @@ msgid "Parent Right"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.account_account_menu
-msgid "Financial Accounts"
-msgstr "Finančni konti"
-
-#. module: account
-#: model:ir.model,name:account.model_account_chart_template
-msgid "Templates for Account Chart"
-msgstr "Predloge za kontne načrte"
-
-#. module: account
-#: view:account.config.wizard:0
-msgid "Account Configure"
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
 msgstr ""
 
 #. module: account
-#: help:res.partner,property_account_payable:0
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
+msgid "Fiscal Years"
+msgstr "Poslovna leta"
+
+#. module: account
+#: help:account.analytic.journal,active:0
 msgid ""
-"This account will be used instead of the default one as the payable account "
-"for the current partner"
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
-msgstr "Davčna stopnja"
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr "Sklic"
 
 #. module: account
-#: selection:account.automatic.reconcile,init,power:0
-msgid "5"
-msgstr "5"
-
-#. module: account
-#: field:product.category,property_account_income_categ:0
-#: field:product.template,property_account_income:0
-msgid "Income Account"
-msgstr "Konto prijhodkov"
-
-#. module: account
-#: field:account.period,special:0
-msgid "Opening/Closing Period"
-msgstr ""
-
-#. module: account
-#: rml:account.analytic.account.balance:0
-msgid "Analytic Balance -"
-msgstr "Analitično stanje -"
-
-#. module: account
-#: wizard_field:account_use_models,init_form,model:0
+#: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
 msgstr "Model kontov"
 
 #. module: account
-#: view:account.invoice:0
-#: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
-msgid "Invoice lines"
-msgstr "Postavke računa"
-
-#. module: account
-#: selection:account.bank.statement.line,type:0
-msgid "Customer"
-msgstr "Kupec"
-
-#. module: account
-#: field:account.subscription,period_type:0
-msgid "Period Type"
-msgstr "Vrsta obdobja"
-
-#. module: account
-#: view:product.category:0
-msgid "Accounting Properties"
-msgstr "Lastnosti računovodstva"
-
-#. module: account
-#: model:ir.model,name:account.model_account_sequence_fiscalyear
-msgid "account.sequence.fiscalyear"
-msgstr "account.sequence.fiscalyear"
-
-#. module: account
-#: wizard_field:account.print.journal.report,init,sort_selection:0
-msgid "Entries Sorted By"
-msgstr "Vnosi urejeni po"
-
-#. module: account
-#: rml:account.journal.period.print:0
-msgid "Print Journal -"
-msgstr "Izpiši dnevnik -"
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
 #: field:account.chart.template,bank_account_view_id:0
-#: field:account.invoice,partner_bank:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
 msgstr "Bančni račun"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_model_form
-#: model:ir.ui.menu,name:account.menu_action_model_form
-msgid "Models Definition"
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
-msgid "Cash"
-msgstr "Gotovina"
-
-#. module: account
-#: field:account.fiscal.position.account,account_dest_id:0
-#: field:account.fiscal.position.account.template,account_dest_id:0
-msgid "Account Destination"
-msgstr ""
-
-#. module: account
-#: rml:account.overdue:0
+#: report:account.overdue:0
 msgid "Maturity"
 msgstr "Zapadlost"
 
 #. module: account
-#: field:account.fiscalyear,name:0
-#: field:account.journal.period,fiscalyear_id:0
-#: field:account.period,fiscalyear_id:0
-#: field:account.sequence.fiscalyear,fiscalyear_id:0
-#: field:fiscalyear.seq,fiscalyear_id:0
-#: model:ir.model,name:account.model_account_fiscalyear
-msgid "Fiscal Year"
-msgstr "Poslovno leto"
-
-#. module: account
-#: selection:account.aged.trial.balance,init,direction_selection:0
+#: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
 msgstr "Prihodnost"
 
 #. module: account
-#: help:account.account.balance.report,checktype,fiscalyear:0
-#: help:account.chart,init,fiscalyear:0
-#: help:account.general.ledger.report,checktype,fiscalyear:0
-#: help:account.partner.balance.report,init,fiscalyear:0
-#: help:account.third_party_ledger.report,init,fiscalyear:0
-msgid "Keep empty for all open fiscal year"
-msgstr ""
-
-#. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
-msgid "Supplier Refund"
-msgstr "Dobropis dobavitelja"
-
-#. module: account
-#: model:process.transition,note:account.process_transition_entriesreconcile0
-#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
-msgid "Reconcile Entries."
-msgstr ""
-
-#. module: account
-#: field:account.subscription.line,move_id:0
-msgid "Entry"
-msgstr "Vnos"
-
-#. module: account
-#: model:process.node,note:account.process_node_paidinvoice0
-#: model:process.node,note:account.process_node_supplierpaidinvoice0
-#: model:process.transition,note:account.process_transition_reconcilepaid0
-#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
-msgid "Paid invoice when reconciled."
-msgstr ""
-
-#. module: account
-#: field:account.tax,python_compute_inv:0
-#: field:account.tax.template,python_compute_inv:0
-msgid "Python Code (reverse)"
-msgstr "Python kod (obratno)"
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and financial management"
-msgstr "Računovodstvo in finančno upravljanje"
-
-#. module: account
-#: view:account.fiscal.position.template:0
-msgid "Accounts Mapping"
-msgstr ""
-
-#. module: account
-#: help:product.category,property_account_expense_categ:0
-msgid ""
-"This account will be used to value outgoing stock for the current product "
-"category"
+#: view:account.move.line:0
+msgid "Search Journal Items"
 msgstr ""
 
 #. module: account
@@ -5893,9 +9501,9 @@ msgid "Usually 1 or -1."
 msgstr "Ponavadi 1 ali -1."
 
 #. module: account
-#: view:res.partner:0
-msgid "Bank Details"
-msgstr "Bančne podrobnosti"
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
@@ -5903,443 +9511,950 @@ msgid "Expense Account on Product Template"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-msgid "General Debit"
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,code:0
-msgid "Account Code"
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: help:account.config.wizard,name:0
-msgid "Name of the fiscal year as displayed on screens."
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
 msgstr ""
 
-#. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
-#: field:account.payment.term.line,payment_id:0
-#: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
-msgid "Payment Term"
-msgstr "Plačilni pogoj"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
-#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
-msgid "Fiscal Mappings"
-msgstr ""
-
-#. module: account
-#: model:process.process,name:account.process_process_statementprocess0
-msgid "Statement Process"
-msgstr ""
-
-#. module: account
-#: model:ir.model,name:account.model_account_bank_statement_reconcile
-msgid "Statement reconcile"
-msgstr "Uskladitev izpiska"
-
-#. module: account
-#: wizard_field:account.fiscalyear.close,init,sure:0
-#: wizard_field:account.fiscalyear.close.state,init,sure:0
-#: wizard_field:account.period.close,init,sure:0
-msgid "Check this box"
-msgstr "Okljukaj to polje"
-
-#. module: account
-#: help:account.tax,price_include:0
-msgid ""
-"Check this if the price you use on the product and invoices includes this "
-"tax."
-msgstr ""
-
-#. module: account
-#: field:account.journal.column,name:0
-msgid "Column Name"
-msgstr "Naziv stolpca"
-
-#. module: account
-#: wizard_view:account.account.balance.report,checktype:0
-#: wizard_view:account.general.ledger.report,checktype:0
-#: wizard_view:account.partner.balance.report,init:0
-#: wizard_view:account.third_party_ledger.report,init:0
-msgid "Filters"
-msgstr "Filtri"
-
-#. module: account
-#: wizard_button:account.wizard_paid_open,init,yes:0
-msgid "Yes"
-msgstr "Da"
-
-#. module: account
-#: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
-msgstr ""
-
-#. module: account
-#: wizard_button:account.subscription.generate,init,generate:0
-msgid "Compute Entry Dates"
-msgstr "Izračunaj datume vknjižb"
-
-#. module: account
-#: view:board.board:0
-msgid "Analytic accounts to close"
-msgstr "Analitični konti za zapiranje"
-
-#. module: account
-#: view:board.board:0
-msgid "Draft invoices"
-msgstr "Osnutki računov"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.open_board_account
-#: model:ir.ui.menu,name:account.menu_board_account
-msgid "Accounting Dashboard"
-msgstr "Računovodska pregledna plošča"
-
-#. module: account
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.act_my_account
-msgid "Accounts to invoice"
-msgstr "Zaračunavanje po kontih"
-
-#. module: account
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
-msgid "Costs to invoice"
-msgstr "Zaračunavanje stroškov"
-
-#. module: account
-#: view:board.board:0
-msgid "Aged receivables"
-msgstr "Zastarane terjatve"
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Board for accountant"
-msgstr "Odbor za računovodjo"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konti prihodkov"
-
-#. module: account
-#: view:board.board:0
-msgid "My indicators"
-msgstr "Moji kazalci"
-
-#. module: account
-#: view:board.board:0
-msgid "Account Board"
-msgstr "Odbor za računovodstvo"
-
-#. module: account
-#: view:board.board:0
-msgid "Aged income"
-msgstr "Zastarani prihodki"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,show_columns:0
-msgid "Show Debit/Credit Information"
-msgstr "Prikaži oinformacijo breme/dobro"
-
-#. module: account
-#: selection:account.balance.account.balance.report,init,account_choice:0
-msgid "All accounts"
-msgstr "Vsi konti"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,period_manner:0
-msgid "Entries Selection Based on"
-msgstr "Izbira vnosov temelji na"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-#: wizard_view:account.balance.account.balance.report,zero_years:0
-msgid "Notification"
-msgstr "Obvestilo"
-
-#. module: account
-#: selection:account.balance.account.balance.report,init,period_manner:0
-msgid "Financial Period"
-msgstr "Finančno obdobje"
-
-#. module: account
-#: model:ir.actions.report.xml,name:account.account_account_balance
-#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
-msgid "Account balance"
-msgstr "Stanje konta"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
-msgid "Select Period(s)"
-msgstr "Izberi obdobje(a)"
-
-#. module: account
-#: selection:account.balance.account.balance.report,init,compare_pattern:0
-msgid "Percentage"
-msgstr "Delež"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
-msgid "Compare Selected Years In Terms Of"
-msgstr "Primerjaj izbrana leta po"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
-msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr "Izberite poslovna leta (največ tri)"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,select_account:0
-msgid "Select Reference Account(for  % comparision)"
-msgstr "Izberite referenčni konto (za primerjavo v %)"
-
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_account_balance_report
-msgid "Account balance-Compare Years"
-msgstr "Stanje konta - primerjaj med leti"
-
-#. module: account
-#: model:ir.module.module,description:account.module_meta_information
-msgid ""
-"Account Balance Module is an added functionality to the Financial Management "
-"module.\n"
-"\n"
-"    This module gives you the various options for printing balance sheet.\n"
-"\n"
-"    1. You can compare the balance sheet for different years.\n"
-"\n"
-"    2. You can set the cash or percentage comparison between two years.\n"
-"\n"
-"    3. You can set the referential account for the percentage comparison for "
-"particular years.\n"
-"\n"
-"    4. You can select periods as an actual date or periods as creation "
-"date.\n"
-"\n"
-"    5. You have an option to print the desired report in Landscape format.\n"
-"    "
-msgstr ""
-"Modul \"Stanje konta\" je dodatek funkcionalnosti modula \"Finančno "
-"upravljanje\".\n"
-"\n"
-"    Ta modul vam nudi različne možnosti za tiskanje bilance stanja.\n"
-"\n"
-"    1. Lahko primerjate bilance stanja za različna leta.\n"
-"\n"
-"    2. Nastavite lahko denarno ali odstotkovno primerjavo med dvema letoma.\n"
-"\n"
-"    3. Lahko nastavite referenčni konto za odstotekovno primerjavo za "
-"posamezna leta.\n"
-"\n"
-"    4. Izberete lahko dobe kot dejanski datum ali obdobja kot datum "
-"nastanka.\n"
-"\n"
-"    5. Imate možnost tiskanja želenega poročila v ležečem formatu.\n"
-"    "
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid "You have to select 'Landscape' option. Please Check it."
-msgstr "Izbrati morate možnost \"Ležeče\". Prosim, reverite."
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,landscape:0
-msgid "Show Report in Landscape Form"
-msgstr "Prikaži poročilo v ležeči obliki"
-
-#. module: account
-#: rml:account.account.balance.landscape:0
-#: rml:account.balance.account.balance:0
-msgid "Total :"
-msgstr "Skupaj:"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,format_perc:0
-msgid "Show Comparision in %"
-msgstr "Prikaži primerjavo v %"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
-msgid "Select Period"
-msgstr "Izberi obdobje"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
-msgid "Report Options"
-msgstr "Možnosti poročila"
-
-#. module: account
-#: selection:account.balance.account.balance.report,init,compare_pattern:0
-msgid "Don't Compare"
-msgstr "Ne primerjaj"
-
-#. module: account
-#: wizard_field:account.balance.account.balance.report,init,account_choice:0
-msgid "Show Accounts"
-msgstr "Prikaži konto"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid "1. You have selected more than 3 years in any case."
-msgstr "1. V vsakem primeru ste izbrali več kot 3 leta."
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and financial management-Compare Accounts"
-msgstr "Računovodstvo in finančno upravljanje - primerjaj konte"
-
-#. module: account
-#: rml:account.account.balance.landscape:0
-#: rml:account.balance.account.balance:0
-msgid "Year :"
-msgstr "Leto:"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid "You can select maximum 3 years. Please check again."
-msgstr "Izberete lahko največ tri leta. Prosim, preverite ponovno."
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid ""
-"3. You have selected 'Percentage' option with more than 2 years, but you "
-"have not selected landscape format."
-msgstr ""
-"3. Izbrali ste možnost \"odstotki\" za več kot dve leti, vendar niste "
-"izbrali ležečega formata."
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid ""
-"You might have done following mistakes. Please correct them and try again."
-msgstr ""
-"Naredili ste naslednje napake. Prosim, popravite jih in poskusite znova."
-
-#. module: account
-#: help:account.balance.account.balance.report,init,select_account:0
-msgid "Keep empty for comparision to its parent"
-msgstr "Pustite prazno za primerjavo z nadrejenim."
-
-#. module: account
-#: selection:account.balance.account.balance.report,init,period_manner:0
-msgid "Creation Date"
-msgstr "Ustvarjeno dne"
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,backtoinit:0
-msgid ""
-"2. You have not selected 'Percentage' option, but you have selected more "
-"than 2 years."
-msgstr ""
-"3. Niste izbrali možnosti \"odstotki\" , vendatr ste izbrali več kot dve "
-"leti."
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,zero_years:0
-msgid ""
-"You may have selected the compare options with more than 1 year with "
-"credit/debit columns and % option.This can lead contents to be printed out "
-"of the paper.Please try again."
-msgstr ""
-"Najbrž ste izbrali možnost za primerjavo več kot enega leta s kolonami "
-"breme/dobro  in možnostjo %. To lahko privede k temu, da se bo vsebina "
-"izpisala izven papirja. Poskuste znova."
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,zero_years:0
-msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr "Izbrati morate vsaj eno poslovno leto. Poskusite znova."
-
-#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
-msgid "Customize Report"
-msgstr "Prilagodi poročilo"
-
-#. module: account
-#: field:report.aged.receivable,name:0
-msgid "Month Range"
-msgstr "Mesečno obdobje"
-
-#. module: account
-#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi narejeni v zadnjih 15-ih dneh"
-
-#. module: account
-#: model:ir.model,name:report_account.model_report_invoice_created
-msgid "Report of Invoices Created within Last 15 days"
-msgstr "Poročilo o računih narejenih v zadnjih 15-ih dneh"
-
-#. module: account
-#: view:report.invoice.created:0
-msgid "Total Amount"
-msgstr "Skupni znesek"
-
-#. module: account
-#: view:report.account.receivable:0
-msgid "Accounts by type"
-msgstr "Računi po vrsti"
-
-#. module: account
-#: model:ir.model,name:report_account.model_report_aged_receivable
-msgid "Aged Receivable Till Today"
-msgstr "Zastarane terjatve do danes"
-
-#. module: account
-#: model:ir.model,name:report_account.model_report_account_receivable
-msgid "Receivable accounts"
-msgstr "Konti terjatev"
-
-#. module: account
-#: field:temp.range,name:0
-msgid "Range"
-msgstr "Obseg"
-
-#. module: account
-#: model:ir.module.module,description:report_account.module_meta_information
-msgid "A module that adds new reports based on the account module."
-msgstr "Modul, ki doda nova poročila na osnovi modula konti."
-
-#. module: account
-#: model:ir.module.module,shortdesc:report_account.module_meta_information
-msgid "Account Reporting - Reporting"
-msgstr "Poročanje po kontih - poročanje"
-
-#. module: account
-#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
-#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
-msgid "Balance by Type of Account"
-msgstr "Bilanca po vrsti konta"
-
-#. module: account
-#: field:report.account.receivable,name:0
-msgid "Week of Year"
-msgstr "Teden v letu"
-
-#. module: account
-#: field:report.invoice.created,create_date:0
-msgid "Create Date"
-msgstr "Datum izdelave"
-
-#. module: account
-#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
-#: view:report.aged.receivable:0
-msgid "Aged Receivable"
-msgstr "Zastarane terjatve"
-
-#. module: account
-#: view:report.invoice.created:0
-msgid "Untaxed Amount"
-msgstr "Neobdavčen znesek"
+#~ msgid "Unpaid Supplier Invoices"
+#~ msgstr "Neplačani računi dobaviteljem"
+
+#~ msgid "Asset"
+#~ msgstr "Delovno sredstvo"
+
+#~ msgid "Select Message"
+#~ msgstr "Izberi sporočilo"
+
+#~ msgid "Unreconciled entries"
+#~ msgstr "Neusklajene vknjižbe"
+
+#~ msgid "Print Taxes Report"
+#~ msgstr "Natisni davčno poročilo"
+
+#~ msgid "Unreconcile entries"
+#~ msgstr "Prekliči uskladitev vknjižb"
+
+#~ msgid "Confirm draft invoices"
+#~ msgstr "Potrdi okvirne račune"
+
+#~ msgid "Entry label"
+#~ msgstr "Označba vknjižbe"
+
+#~ msgid "Total entries"
+#~ msgstr "Vknjižbe skupaj"
+
+#~ msgid "Unpaid Supplier Refunds"
+#~ msgstr "Neplačani dobropisi dobaviteljev"
+
+#~ msgid "Supplier invoice"
+#~ msgstr "Račun dobavitelja"
+
+#~ msgid "Contact"
+#~ msgstr "Stik"
+
+#~ msgid "Account Entry Reconcile"
+#~ msgstr "Uskladi vknjižbo"
+
+#~ msgid "account.move.line"
+#~ msgstr "account.move.line"
+
+#~ msgid "Partial Payment"
+#~ msgstr "Delno plačilo"
+
+#~ msgid "Move Lines Created."
+#~ msgstr "Ustvarejne postavke prenosa."
+
+#~ msgid "Status"
+#~ msgstr "Stanje"
+
+#~ msgid "Partner account"
+#~ msgstr "Partnerjev račun"
+
+#~ msgid "Generate entries before:"
+#~ msgstr "Ustvari vknjižbe pred:"
+
+#~ msgid "Account cost and revenue by journal"
+#~ msgstr "Odhodki in prihodki po dnevnikih"
+
+#~ msgid "Bank Reconciliation"
+#~ msgstr "Uskladitev z izpiski"
+
+#~ msgid "Print Journal"
+#~ msgstr "Natisni dnevnik"
+
+#~ msgid "End date"
+#~ msgstr "Datum konca"
+
+#~ msgid "Entries by Statements"
+#~ msgstr "Vknjižbe po izpiskih"
+
+#~ msgid "Grand total"
+#~ msgstr "Skupni seštevek"
+
+#~ msgid "New Supplier Invoice"
+#~ msgstr "Nov račun dobavitelja"
+
+#~ msgid "Amount paid"
+#~ msgstr "Plačan znesek"
+
+#~ msgid "Total write-off"
+#~ msgstr "Odpis skupaj"
+
+#~ msgid "New Analytic Account"
+#~ msgstr "Nov analitičen konto"
+
+#~ msgid "Standard entry"
+#~ msgstr "Običajna vknjižba"
+
+#~ msgid "Tax Report"
+#~ msgstr "Davčno poročilo"
+
+#~ msgid "Ending Balance"
+#~ msgstr "Končni saldo"
+
+#~ msgid "Value"
+#~ msgstr "Vrednost"
+
+#~ msgid "Compute Entry Dates"
+#~ msgstr "Izračunaj datume vknjižb"
+
+#~ msgid "Statement reconcile line"
+#~ msgstr "Postavka uskladitve izpiska"
+
+#~ msgid "Income"
+#~ msgstr "Prihodki"
+
+#~ msgid "Print General Journal"
+#~ msgstr "Natisni splošni dnevnik"
+
+#~ msgid "Invoice Movement"
+#~ msgstr "Prenos računa"
+
+#~ msgid "Open for reconciliation"
+#~ msgstr "Odpri za uskladitev"
+
+#~ msgid "VAT"
+#~ msgstr "DDV"
+
+#~ msgid "Account to reconcile"
+#~ msgstr "Konto za uskladit"
+
+#~ msgid "Total quantity"
+#~ msgstr "Skupna količina"
+
+#~ msgid "Costs & Revenues"
+#~ msgstr "Odhodki in prihodki"
+
+#~ msgid "Account Number"
+#~ msgstr "Številka konta"
+
+#~ msgid "Gives the sequence order when displaying a list of account types."
+#~ msgstr "Določa zaporedno številko pri prikazovanju seznama kontnih tipov."
+
+#~ msgid "Include in base amount"
+#~ msgstr "Vključen v znesek osnove"
+
+#~ msgid "Cost Legder for period"
+#~ msgstr "Knjga odhodkov za obdobje"
+
+#~ msgid "New Statement"
+#~ msgstr "Nov izpisek"
+
+#~ msgid "Print Central Journal"
+#~ msgstr "Natisni glavni dnevnik"
+
+#~ msgid "Start date"
+#~ msgstr "Datum začetka"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Neobdavčen znese"
+
+#~ msgid "Pay invoice"
+#~ msgstr "Plačaj račun"
+
+#~ msgid "Draft Customer Invoices"
+#~ msgstr "Pripravljeni računi za izdajo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid "Expense"
+#~ msgstr "Strošek"
+
+#~ msgid "Options"
+#~ msgstr "Možnosti"
+
+#~ msgid "Validate Account Moves"
+#~ msgstr "Preveri kontne prenose"
+
+#~ msgid "Unpaid invoices"
+#~ msgstr "Naplačani računi"
+
+#~ msgid "Draft Supplier Invoices"
+#~ msgstr "Pripravljeni računi dobaviteljev"
+
+#~ msgid "Date Invoiced"
+#~ msgstr "Datum računa"
+
+#~ msgid "Automatic reconciliation"
+#~ msgstr "Samodejna uskladitev"
+
+#~ msgid "Date End"
+#~ msgstr "Datum konca"
+
+#~ msgid "The amount in the currency of the journal"
+#~ msgstr "Znesek v valuti dnevnika"
+
+#~ msgid "Select Period and Journal for Validation"
+#~ msgstr "Izberi obdobje in dnevnik za preverjanje"
+
+#~ msgid "Partner ID"
+#~ msgstr "Partnerjev ID"
+
+#~ msgid "New Customer Invoice"
+#~ msgstr "Nov izdani račun"
+
+#~ msgid "Open State"
+#~ msgstr "Odpri stanje"
+
+#~ msgid "Draft Supplier Refunds"
+#~ msgstr "Pripravljeni dobropisi dobaviteljev"
+
+#~ msgid "Draft Customer Refunds"
+#~ msgstr "Pripravljeni dobropisi kupcem"
+
+#~ msgid "Cancel selected invoices"
+#~ msgstr "Storniraj izbrane račune"
+
+#~ msgid "account.move.line.select"
+#~ msgstr "account.move.line.select"
+
+#~ msgid "Financial Management"
+#~ msgstr "Finance"
+
+#~ msgid "Additionnal Information"
+#~ msgstr "Dodatne informacije"
+
+#~ msgid "Partner Accounts"
+#~ msgstr "Partnerjevi konti"
+
+#~ msgid ""
+#~ "If a default tax if given in the partner it only override taxes from account "
+#~ "(or product) of the same group."
+#~ msgstr ""
+#~ "Če je pri partnerju podan privzeti davek, potem se spremenijo samo davki iz "
+#~ "konta (ali proizvoda) iste skupine."
+
+#~ msgid "Real Entries"
+#~ msgstr "Dejanske vknjižbe"
+
+#~ msgid "Invoice line"
+#~ msgstr "Postavka računa"
+
+#~ msgid "Force all moves for this account to have this secondary currency."
+#~ msgstr "Prisili vse prenose za ta konto, da ima to drugo valuto."
+
+#~ msgid "Pay and reconcile"
+#~ msgstr "Plačaj in uskladi"
+
+#~ msgid "New Supplier Refund"
+#~ msgstr "Nov dobropis dobavitelja"
+
+#~ msgid "Entry Model"
+#~ msgstr "Model vknjižbe"
+
+#~ msgid "Entry Name"
+#~ msgstr "Naziv vknjižbe"
+
+#~ msgid "Write-Off Period"
+#~ msgstr "Obdobje odpisa"
+
+#~ msgid "Other"
+#~ msgstr "Ostalo"
+
+#~ msgid "Financial Journals"
+#~ msgstr "Finančni dnevniki"
+
+#~ msgid "Taxed Amount"
+#~ msgstr "Obdavčeni znesek"
+
+#~ msgid "Subtotal w/o tax"
+#~ msgstr "Seštevek brez davka"
+
+#~ msgid "Invoice Ref"
+#~ msgstr "Sklic računa"
+
+#~ msgid ""
+#~ "You can check this box to mark the entry line as a litigation with the "
+#~ "associated partner"
+#~ msgstr ""
+#~ "Z okljukanjem tega polja označite postavko vknjižbe kot pravdanje s "
+#~ "partnerjem."
+
+#~ msgid "The currency of the journal"
+#~ msgstr "Valuta dnevnika"
+
+#~ msgid "Search Entries"
+#~ msgstr "Išči vknjižbe"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid ""
+#~ "This field is used for payable and receivable entries. You can put the limit "
+#~ "date for the payment of this entry line."
+#~ msgstr ""
+#~ "To polje se uporablja knjiženje obveznosti in terjatev. Za postavke teh "
+#~ "vknjižb lahko nastavite zadnji datum plačila."
+
+#~ msgid "The sequence gives the display order for a list of journals"
+#~ msgstr "Zaporedna številka določa vrstni red prikaza za seznam dnevnikov"
+
+#~ msgid "Payment date"
+#~ msgstr "Datum plačila"
+
+#~ msgid "Unpaid Customer Invoices"
+#~ msgstr "Neplačani izdani računi"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Storniran račun"
+
+#~ msgid "End of Year Treatments"
+#~ msgstr "Postopek zaključevanja leta"
+
+#~ msgid "Accounting Entries"
+#~ msgstr "Računovodske vknjižbe"
+
+#~ msgid "Quantities"
+#~ msgstr "Količine"
+
+#~ msgid "Date Start"
+#~ msgstr "Datum začetka"
+
+#~ msgid "The date of the generated entries"
+#~ msgstr "Datum ustvarjenih vknjižb"
+
+#~ msgid ""
+#~ "Indicate if the amount of tax must be included in the base amount for the "
+#~ "computation of the next taxes"
+#~ msgstr ""
+#~ "Označuje, če mora biti znesek davka vključen v osnovni znesek za izračun "
+#~ "sledečih davkov"
+
+#~ msgid "Journal name"
+#~ msgstr "Naziv dnevnika"
+
+#~ msgid "Reconcile entries"
+#~ msgstr "Uskladi vknjižbe"
+
+#~ msgid "Journal - Period"
+#~ msgstr "Dnevnik - obdobje"
+
+#~ msgid "Open for unreconciliation"
+#~ msgstr "Odpri za preklic uskladitve"
+
+#~ msgid "OK"
+#~ msgstr "V redu"
+
+#~ msgid "Account Balance"
+#~ msgstr "Saldo konta"
+
+#~ msgid "Payment amount"
+#~ msgstr "Znesek plačila"
+
+#~ msgid "All Months"
+#~ msgstr "Vsi meseci"
+
+#~ msgid "Total amount"
+#~ msgstr "Skupni znesek"
+
+#~ msgid "Tax Group"
+#~ msgstr "Davčna skupina"
+
+#~ msgid "New Customer Refund"
+#~ msgstr "Nov izdani dobropis"
+
+#~ msgid "Write-Off journal"
+#~ msgstr "Dnevnik odpisov"
+
+#~ msgid "Full Payment"
+#~ msgstr "Plačilo v celoti"
+
+#~ msgid "All account entries"
+#~ msgstr "Vse vknjižbe kontov"
+
+#~ msgid "Unpaid Customer Refunds"
+#~ msgstr "Neplačani izdani dobropisi"
+
+#~ msgid "Amount reconciled"
+#~ msgstr "Usklajeni znesek"
+
+#~ msgid "PRO-FORMA Customer Invoices"
+#~ msgstr "Izdani predračuni"
+
+#~ msgid "Skip 'Draft' State for Created Entries"
+#~ msgstr "Preskoči stanje priprave za ustvarjene vknjižbe"
+
+#~ msgid "List of Accounts"
+#~ msgstr "Seznam kontov"
+
+#~ msgid "Validate Account Entries"
+#~ msgstr "Preveri vknjižbe kontov"
+
+#~ msgid "Current Date"
+#~ msgstr "Trenutni datum"
+
+#~ msgid "Financial Accounts"
+#~ msgstr "Finančni konti"
+
+#~ msgid "Statement reconcile"
+#~ msgstr "Uskladitev izpiska"
+
+#~ msgid "Charts of Account"
+#~ msgstr "Kontni načrt"
+
+#~ msgid "Account Num."
+#~ msgstr "Številka konta"
+
+#~ msgid "Printing Date"
+#~ msgstr "Datum izpisa"
+
+#~ msgid "Analytic Invoice"
+#~ msgstr "Analitični račun"
+
+#~ msgid "Cancel Invoice"
+#~ msgstr "Prekliči račun"
+
+#~ msgid "Select Chart of Accounts"
+#~ msgstr "Izberite kontni načrt"
+
+#~ msgid "analytic Invoice"
+#~ msgstr "Analitični račun"
+
+#~ msgid "Printing Date :"
+#~ msgstr "Datum izpisa:"
+
+#~ msgid "Invoice import"
+#~ msgstr "Uvoz računa"
+
+#~ msgid "Continue"
+#~ msgstr "Nadaljuj"
+
+#~ msgid "Skip"
+#~ msgstr "Preskoči"
+
+#~ msgid "Next"
+#~ msgstr "Naslednji"
+
+#~ msgid "          Start date"
+#~ msgstr "          Začetni datum"
+
+#~ msgid "Liability"
+#~ msgstr "Odgovornost"
+
+#~ msgid "Taxes Reports"
+#~ msgstr "Davčna poročila"
+
+#~ msgid "O_k"
+#~ msgstr "O_k"
+
+#~ msgid "_Go"
+#~ msgstr "_Pojdi"
+
+#~ msgid "1cm 27.7cm 20cm 27.7cm"
+#~ msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#~ msgid "Full Account Name"
+#~ msgstr "Polni naziv konta"
 
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
+
+#~ msgid "        Start date"
+#~ msgstr "        Začetni datum"
+
+#~ msgid "Sort by:"
+#~ msgstr "Razvrsti po:"
+
+#~ msgid "From analytic accounts, Create invoice."
+#~ msgstr "Izdelava računa na podlagi analitičnih kontov."
+
+#~ msgid "Analytic Chart of Accounts"
+#~ msgstr "Analitični kontni plan"
+
+#~ msgid "Import invoice"
+#~ msgstr "Uvozi račun"
+
+#~ msgid "3 Months"
+#~ msgstr "3 meseci"
+
+#~ msgid "Movement"
+#~ msgstr "Prenos"
+
+#~ msgid "Import file from your bank statement"
+#~ msgstr "Uvoz datoteke z bančnim izpiskom"
+
+#~ msgid "Modify Invoice"
+#~ msgstr "Spremeni račun"
+
+#~ msgid "By Date"
+#~ msgstr "Po datumu"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Prekliči"
+
+#~ msgid "Import invoices"
+#~ msgstr "Uvozi račune"
+
+#~ msgid "Page"
+#~ msgstr "Stran"
+
+#~ msgid "Delta Debit"
+#~ msgstr "Razlika breme"
+
+#~ msgid "Debit Trans."
+#~ msgstr "Transakcije v breme"
+
+#~ msgid "Display History"
+#~ msgstr "Zgodovina prikazov"
+
+#~ msgid "Display accounts "
+#~ msgstr "Prikaži konte "
+
+#~ msgid "Legal Statements"
+#~ msgstr "Pravna izjava"
+
+#~ msgid "Delta Credit"
+#~ msgstr "Razlika - dobro"
+
+#~ msgid "No Filter"
+#~ msgstr "Ni filtra"
+
+#~ msgid "Analytic Journal Report"
+#~ msgstr "Poročilo analitičnega dnevnika"
+
+#~ msgid "Invoice Sequence"
+#~ msgstr "Zaporedje računa"
+
+#~ msgid "Import Invoice"
+#~ msgstr "Uvozi račun"
+
+#~ msgid "Analytic Debit"
+#~ msgstr "Breme - analitično"
+
+#~ msgid "By Date and Period"
+#~ msgstr "Po datumu in obdobju"
+
+#~ msgid "Filter on Periods"
+#~ msgstr "Filter po obdobju"
+
+#~ msgid "By date"
+#~ msgstr "Po datumu"
+
+#~ msgid "By Period"
+#~ msgstr "Po obdobju"
+
+#~ msgid "Maximum Quantity"
+#~ msgstr "Največja količina"
+
+#~ msgid "Cash Payment"
+#~ msgstr "Gotovinsko plačilo"
+
+#~ msgid "Import from your bank statements"
+#~ msgstr "Uvoz z bančnega izpiska"
+
+#~ msgid "Date/Period Filter"
+#~ msgstr "Filter datum/obdobje"
+
+#~ msgid "General Ledger -"
+#~ msgstr "Glavna knjiga -"
+
+#~ msgid "Analytic Check -"
+#~ msgstr "Analitična kontrola -"
+
+#~ msgid "Group invoice lines"
+#~ msgstr "Združuj vrstice računa"
+
+#~ msgid "Select Date-Period"
+#~ msgstr "Izberi datum-obdobje"
+
+#~ msgid "Cash Receipt"
+#~ msgstr "Blagajniški prejemek"
+
+#~ msgid "Print VAT Decl."
+#~ msgstr "Izpiši deklaracijo DDV"
+
+#~ msgid "Print Journal -"
+#~ msgstr "Izpiši dnevnik -"
+
+#~ msgid "Accounting and financial management"
+#~ msgstr "Računovodstvo in finančno upravljanje"
+
+#~ msgid "Account Entry Line"
+#~ msgstr "Vnosna vrstica konta"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
+
+#~ msgid "Contra"
+#~ msgstr "Nasproti"
+
+#~ msgid "(Keep empty for all open fiscal years)"
+#~ msgstr "(Prazno za vsa odprta davčna leta)"
+
+#~ msgid "Sign for parent"
+#~ msgstr "Podpiši za nadrejenega"
+
+#~ msgid "Can be draft or validated"
+#~ msgstr "Lahko je osnutek ali preverjen"
+
+#~ msgid "Period from :"
+#~ msgstr "Obdobje od:"
+
+#~ msgid "Journal de vente"
+#~ msgstr "Dnevnik prodaje"
+
+#~ msgid "Bank Receipt"
+#~ msgstr "Bančni prejemek"
+
+#~ msgid "Are you sure you want to close the fiscal year ?"
+#~ msgstr "Ali ste prepričani da želite zapreti davčno leto?"
+
+#~ msgid "Analytic Credit"
+#~ msgstr "Dobro - analitično"
+
+#~ msgid "Message"
+#~ msgstr "Sporočilo"
+
+#~ msgid "Parent Analytic Account"
+#~ msgstr "Nadrejeni analitični konto"
+
+#~ msgid "Close states"
+#~ msgstr "Zaprta stanja"
+
+#~ msgid "Third party"
+#~ msgstr "Tretja stanka"
+
+#~ msgid "Journal d'ouverture"
+#~ msgstr "Dnevnik otvoritve"
+
+#~ msgid "To Be Verified"
+#~ msgstr "Mora biti preverjeno"
+
+#~ msgid "to :"
+#~ msgstr "za:"
+
+#~ msgid "Customer Invoice Process"
+#~ msgstr "Proces računa stranke"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Napačno ime modela v definiciji dejanja."
+
+#~ msgid "Analytic Journal -"
+#~ msgstr "Analitični dnevnik"
+
+#~ msgid "Journal Voucher"
+#~ msgstr "Dnevnik za kupone."
+
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Izpis po zapadlosti"
+
+#~ msgid ""
+#~ "This account will be used to value incoming stock for the current product "
+#~ "category"
+#~ msgstr ""
+#~ "Ta konto bo uporabljen za vrednotenje prevzetih zalog za izbrano kategorijo "
+#~ "proizvodov."
+
+#~ msgid "Entries Encoding"
+#~ msgstr "Knjiženje"
+
+#~ msgid "Recurrent Entries"
+#~ msgstr "Ponavljajoče se knjižbe"
+
+#~ msgid "Specify The Message for the Overdue Payment Report."
+#~ msgstr "Določite besedilo opomina za zapadla plačila."
+
+#~ msgid "Move line select"
+#~ msgstr "Izberite knjižbo."
+
+#~ msgid "Confirm statement from draft"
+#~ msgstr "Potrdite predlog izpiska."
+
+#~ msgid "Confirm statement with/without reconciliation from draft statement"
+#~ msgstr "Na podlagi osnutka potrdite izpisek z ali brez zapiranja plačil"
+
+#~ msgid "Journal de frais"
+#~ msgstr "Dnevnik provizij"
+
+#~ msgid "Payment Reconcilation"
+#~ msgstr "Zapiranje plačil"
+
+#~ msgid "Mvt"
+#~ msgstr "Premik"
+
+#~ msgid "Reconcile Paid"
+#~ msgstr "Zapri plačano"
+
+#~ msgid "Move Lines"
+#~ msgstr "Postavke knjižb"
+
+#~ msgid ""
+#~ "These types are defined according to your country. The type contain more "
+#~ "information about the account and it's specificities."
+#~ msgstr ""
+#~ "Tipi so določeni glede na državo. Tip vsebuje več informacij o kontu in "
+#~ "njegovih posebnostih."
+
+#~ msgid "Keep empty if the fiscal year belongs to several companies."
+#~ msgstr "Postite prazno, če poslovno leto pripada večim podjetjem"
+
+#~ msgid "Select invoices you want to pay and manages advances"
+#~ msgstr "Izbere račune, ki jih želite plačati in upravlja z avansi"
+
+#~ msgid "Voucher Nb"
+#~ msgstr "Kupon Nb"
+
+#~ msgid "Date or Code"
+#~ msgstr "Datum ali šifra"
+
+#~ msgid "Pre-generated invoice from control"
+#~ msgstr "Predgeneriran račun iz kontrole"
+
+#~ msgid "Reconciliation of entries from invoice(s) and payment(s)"
+#~ msgstr "Zapiranje računov in plačil"
+
+#~ msgid ""
+#~ "The partner bank account to pay\n"
+#~ "Keep empty to use the default"
+#~ msgstr ""
+#~ "Partnerjev bančni račun\n"
+#~ "Pustite prazno za privzeti račun"
+
+#~ msgid "Validated accounting entries."
+#~ msgstr "Potrjene knjižbe"
+
+#~ msgid "Payment Reconcile"
+#~ msgstr "Zapiranje plačil"
+
+#~ msgid ""
+#~ "Check this box if you don't want new account moves to pass through the "
+#~ "'draft' state and instead goes directly to the 'posted state' without any "
+#~ "manual validation."
+#~ msgstr ""
+#~ "Odkljukajte ta kvadratek, če ne želite, da bo za vknjižbe na tem kontu "
+#~ "potrebna dodatna ročna potrditev prehoda statusa iz \"osnutka\" v "
+#~ "\"knjiženo\" (status \"knjiženo\" bodo pridobile avtomatično)."
+
+#~ msgid "Create subscription entries"
+#~ msgstr "Kreiraj periodične vnose"
+
+#~ msgid "All periods if empty"
+#~ msgstr "Če prazno, potem vsa obdobja"
+
+#~ msgid "Create a Fiscal Year"
+#~ msgstr "Kreiraj poslovno leto"
+
+#~ msgid "Account No."
+#~ msgstr "Številka konta"
+
+#~ msgid "Statement Entries"
+#~ msgstr "Postavke izpiska"
+
+#~ msgid "Overdue Payment Message"
+#~ msgstr "Besedilo za opomin za zapadle terjatve"
+
+#~ msgid "Generic Reports"
+#~ msgstr "Splošna poročila"
+
+#~ msgid "From statement, create entries"
+#~ msgstr "Iz izpiska naredi vknjižbe"
+
+#~ msgid "Are you sure you want to refund this invoice ?"
+#~ msgstr "Res želite narediti dobropis za ta račun?"
+
+#~ msgid "Analytic account costs and revenues"
+#~ msgstr "Prihodki in stroški na analitičnem kontu"
+
+#~ msgid "Reconcilation of entries from payment order."
+#~ msgstr "Zapiranje vknjižb plačilnega naloga"
+
+#~ msgid "Select parent account"
+#~ msgstr "Izberite nadrejeni konto"
+
+#~ msgid "Account Manager"
+#~ msgstr "Odgovorni za stranko"
+
+#~ msgid "Analytic accounts to close"
+#~ msgstr "Analitični konti za zapiranje"
+
+#~ msgid "Draft invoices"
+#~ msgstr "Osnutki računov"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Zaračunavanje po kontih"
+
+#~ msgid "Costs to invoice"
+#~ msgstr "Zaračunavanje stroškov"
+
+#~ msgid "Aged receivables"
+#~ msgstr "Zastarane terjatve"
+
+#~ msgid "Board for accountant"
+#~ msgstr "Odbor za računovodjo"
+
+#~ msgid "My indicators"
+#~ msgstr "Moji kazalci"
+
+#~ msgid "Aged income"
+#~ msgstr "Zastarani prihodki"
+
+#~ msgid "Show Debit/Credit Information"
+#~ msgstr "Prikaži oinformacijo breme/dobro"
+
+#~ msgid "All accounts"
+#~ msgstr "Vsi konti"
+
+#~ msgid "Entries Selection Based on"
+#~ msgstr "Izbira vnosov temelji na"
+
+#~ msgid "Notification"
+#~ msgstr "Obvestilo"
+
+#~ msgid "Financial Period"
+#~ msgstr "Finančno obdobje"
+
+#~ msgid "Select Period(s)"
+#~ msgstr "Izberi obdobje(a)"
+
+#~ msgid "Compare Selected Years In Terms Of"
+#~ msgstr "Primerjaj izbrana leta po"
+
+#~ msgid "Select Fiscal Year(s)(Maximum Three Years)"
+#~ msgstr "Izberite poslovna leta (največ tri)"
+
+#~ msgid "Select Reference Account(for  % comparision)"
+#~ msgstr "Izberite referenčni konto (za primerjavo v %)"
+
+#~ msgid "Account balance-Compare Years"
+#~ msgstr "Stanje konta - primerjaj med leti"
+
+#~ msgid ""
+#~ "Account Balance Module is an added functionality to the Financial Management "
+#~ "module.\n"
+#~ "\n"
+#~ "    This module gives you the various options for printing balance sheet.\n"
+#~ "\n"
+#~ "    1. You can compare the balance sheet for different years.\n"
+#~ "\n"
+#~ "    2. You can set the cash or percentage comparison between two years.\n"
+#~ "\n"
+#~ "    3. You can set the referential account for the percentage comparison for "
+#~ "particular years.\n"
+#~ "\n"
+#~ "    4. You can select periods as an actual date or periods as creation "
+#~ "date.\n"
+#~ "\n"
+#~ "    5. You have an option to print the desired report in Landscape format.\n"
+#~ "    "
+#~ msgstr ""
+#~ "Modul \"Stanje konta\" je dodatek funkcionalnosti modula \"Finančno "
+#~ "upravljanje\".\n"
+#~ "\n"
+#~ "    Ta modul vam nudi različne možnosti za tiskanje bilance stanja.\n"
+#~ "\n"
+#~ "    1. Lahko primerjate bilance stanja za različna leta.\n"
+#~ "\n"
+#~ "    2. Nastavite lahko denarno ali odstotkovno primerjavo med dvema letoma.\n"
+#~ "\n"
+#~ "    3. Lahko nastavite referenčni konto za odstotekovno primerjavo za "
+#~ "posamezna leta.\n"
+#~ "\n"
+#~ "    4. Izberete lahko dobe kot dejanski datum ali obdobja kot datum "
+#~ "nastanka.\n"
+#~ "\n"
+#~ "    5. Imate možnost tiskanja želenega poročila v ležečem formatu.\n"
+#~ "    "
+
+#~ msgid "You have to select 'Landscape' option. Please Check it."
+#~ msgstr "Izbrati morate možnost \"Ležeče\". Prosim, reverite."
+
+#~ msgid "Show Report in Landscape Form"
+#~ msgstr "Prikaži poročilo v ležeči obliki"
+
+#~ msgid "Show Comparision in %"
+#~ msgstr "Prikaži primerjavo v %"
+
+#~ msgid "Don't Compare"
+#~ msgstr "Ne primerjaj"
+
+#~ msgid "Show Accounts"
+#~ msgstr "Prikaži konto"
+
+#~ msgid "1. You have selected more than 3 years in any case."
+#~ msgstr "1. V vsakem primeru ste izbrali več kot 3 leta."
+
+#~ msgid "Accounting and financial management-Compare Accounts"
+#~ msgstr "Računovodstvo in finančno upravljanje - primerjaj konte"
+
+#~ msgid "You can select maximum 3 years. Please check again."
+#~ msgstr "Izberete lahko največ tri leta. Prosim, preverite ponovno."
+
+#~ msgid ""
+#~ "3. You have selected 'Percentage' option with more than 2 years, but you "
+#~ "have not selected landscape format."
+#~ msgstr ""
+#~ "3. Izbrali ste možnost \"odstotki\" za več kot dve leti, vendar niste "
+#~ "izbrali ležečega formata."
+
+#~ msgid ""
+#~ "You might have done following mistakes. Please correct them and try again."
+#~ msgstr ""
+#~ "Naredili ste naslednje napake. Prosim, popravite jih in poskusite znova."
+
+#~ msgid "Keep empty for comparision to its parent"
+#~ msgstr "Pustite prazno za primerjavo z nadrejenim."
+
+#~ msgid "Creation Date"
+#~ msgstr "Ustvarjeno dne"
+
+#~ msgid ""
+#~ "2. You have not selected 'Percentage' option, but you have selected more "
+#~ "than 2 years."
+#~ msgstr ""
+#~ "3. Niste izbrali možnosti \"odstotki\" , vendatr ste izbrali več kot dve "
+#~ "leti."
+
+#~ msgid ""
+#~ "You may have selected the compare options with more than 1 year with "
+#~ "credit/debit columns and % option.This can lead contents to be printed out "
+#~ "of the paper.Please try again."
+#~ msgstr ""
+#~ "Najbrž ste izbrali možnost za primerjavo več kot enega leta s kolonami "
+#~ "breme/dobro  in možnostjo %. To lahko privede k temu, da se bo vsebina "
+#~ "izpisala izven papirja. Poskuste znova."
+
+#~ msgid "You have to select at least 1 Fiscal Year. Try again."
+#~ msgstr "Izbrati morate vsaj eno poslovno leto. Poskusite znova."
+
+#~ msgid "Customize Report"
+#~ msgstr "Prilagodi poročilo"
+
+#~ msgid "A module that adds new reports based on the account module."
+#~ msgstr "Modul, ki doda nova poročila na osnovi modula konti."
+
+#~ msgid "Account Reporting - Reporting"
+#~ msgstr "Poročanje po kontih - poročanje"
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 1a611aa49f3..069312a06d8 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-03 15:50+0000\n"
-"Last-Translator: Andreas Berg <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 13:59+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Systembetalning"
 
 #. module: account
 #: view:account.journal:0
@@ -39,6 +39,7 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Ni kan inte ta bort/avaktivera ett konto som är kopplat till ett företag."
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -101,11 +102,13 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Resultaträkningen visar en översikt av ditt företags resultat i en enda "
+"rapport."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Importera från fakturor eller betalningar"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -171,6 +174,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Du kan gömma ett betalningsvillkor genom att sätta det aktiv till falskt."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -680,7 +684,7 @@ msgstr "Opening Entries Period"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "Journalperiod"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -697,7 +701,7 @@ msgstr "Fel! Du kan inte skapa rekursiva konton."
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Huvudboksrapport"
 
 #. module: account
 #: view:account.invoice:0
@@ -712,7 +716,7 @@ msgstr "Are you sure you want to create entries?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Markera"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -747,7 +751,7 @@ msgstr ""
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Ni kan enbart ändra valuta på fakturor som är i utkastläge"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -784,12 +788,12 @@ msgstr "Unreconciliation"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_Journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Analyskontojournal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automatisk avstämning"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -819,7 +823,7 @@ msgstr "dagar"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Om ifylld, så kommer inte detta konto med i den nya kontoplanen."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:0
@@ -922,7 +926,7 @@ msgstr "Konsolidering"
 #: view:account.invoice.report:0
 #: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -937,7 +941,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Kontoutdrag"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1205,7 +1209,7 @@ msgstr ""
 #. module: account
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Nivå"
 
 #. module: account
 #: report:account.invoice:0
@@ -1226,7 +1230,7 @@ msgstr "Skatter"
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Ange en start och en slutperiod"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1255,7 +1259,7 @@ msgstr "Förfallna betalningar"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Ingående balans"
 
 #. module: account
 #: view:account.invoice:0
@@ -1271,7 +1275,7 @@ msgstr "Bankinformation"
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "Rapportinställningar"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
@@ -1361,7 +1365,7 @@ msgstr "Antal siffror"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Hoppa över preliminär status för manuella registreringar"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1377,7 +1381,7 @@ msgstr "Summa exkl moms"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "# registreingar "
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1478,7 +1482,7 @@ msgstr "Untaxed"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "Hoppa till nästa företag"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1512,7 +1516,7 @@ msgstr "Verifikatrader"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Datum/Kod"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1545,7 +1549,7 @@ msgstr ""
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Bokslutsårsordning"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1565,7 +1569,7 @@ msgstr "Nettototal:"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Försäljning per kontotyp"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1603,7 +1607,7 @@ msgstr "Skriv ut kvitto"
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Den här wizarden kommer att ändra fakturans valuta"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1612,11 +1616,14 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Visa ditt företagskontoplan per bokföringsår och selektera på period.  Du "
+"får en komplett trädvy över alla verifikationer per konto genom att klicka "
+"på ett konto."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Fel! Su kan inte definiera överlappande bokföringsår."
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1627,14 +1634,14 @@ msgstr "The account is not defined to be reconciled !"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Värden"
 
 #. module: account
 #: help:account.journal.period,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
-msgstr ""
+msgstr "Gör journalperioden genom att sätta aktiv til falsk."
 
 #. module: account
 #: view:res.partner:0
@@ -1649,7 +1656,7 @@ msgstr "The optional quantity on entries"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Kund- och leverantörsfakturor"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1665,12 +1672,12 @@ msgstr ""
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Alla företag"
 
 #. module: account
 #: report:account.move.voucher:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Ref. :"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1680,7 +1687,7 @@ msgstr "Analytic Account Charts"
 #. module: account
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Mina registreringar"
 
 #. module: account
 #: report:account.overdue:0
@@ -1691,7 +1698,7 @@ msgstr "Kundreferens:"
 #: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "Användare %s har inte åtkomst till %s journalen !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1722,7 +1729,7 @@ msgstr "Credit amount"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Du kan inte skapa transaktioner för ett avslutat konto."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1754,7 +1761,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "periodavslut"
 
 #. module: account
 #: view:account.installer:0
@@ -1764,7 +1771,7 @@ msgstr "Inställningar för räkenskapsår"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Transaktiomer per rad"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -1775,7 +1782,7 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Registrera verifikation"
 
 #. module: account
 #: view:account.tax:0
@@ -1795,7 +1802,7 @@ msgstr "Likviditetsanalys"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva företag."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1874,7 +1881,7 @@ msgstr ""
 msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
-msgstr ""
+msgstr "Registreringsdatum måste vara i perioden om denna är markerad."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
@@ -1914,7 +1921,7 @@ msgstr "Belopp ex. moms"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr ""
+msgstr "Du kan gömma momsen utan att ta bort den om denna är falsk."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1962,7 +1969,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importera verifikatet från en fil."
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -1981,17 +1988,17 @@ msgstr "Januari"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "Valideringar"
 
 #. module: account
 #: model:account.journal,name:account.close_journal
 msgid "End of Year"
-msgstr ""
+msgstr "Årsavslut"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Innevarande bokf.år"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -2004,6 +2011,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Fel period! Nägra perioder överlappar varandra eller så är de utanför "
+"bokföringsårets gränser. "
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2017,7 +2026,7 @@ msgstr "Pro-forma"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid " Journal"
-msgstr ""
+msgstr " Journal"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -2103,7 +2112,7 @@ msgstr "Entries Sorted By"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Ändra till"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2209,7 +2218,7 @@ msgstr "Öppen"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Preliminär status för en faktura"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2278,7 +2287,7 @@ msgstr "Koncentration av betalningar"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Godkänna preliminära fakturor"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2334,7 +2343,7 @@ msgstr "Välj period"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Kontoutdrag"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2347,6 +2356,8 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Finansiell position används för att definiera vilken moms och vilket konto "
+"som skall användas för ett företag."
 
 #. module: account
 #: view:account.print.journal:0
@@ -2357,7 +2368,7 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Fel ! Du kan inte skapa rekursiva kategorier."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2423,7 +2434,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Konteringsinformation"
 
 #. module: account
 #: view:account.tax:0
@@ -2477,7 +2488,7 @@ msgstr "Refund Base Code"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "Kontoutdrag"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2516,7 +2527,7 @@ msgstr "Aged Partner Balance"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Redovisningstransaktioner"
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2551,7 +2562,7 @@ msgstr ""
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "Försäljning per konto"
 
 #. module: account
 #: view:account.use.model:0
@@ -2677,7 +2688,7 @@ msgstr "Baskodsbelopp"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Standard moms"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2762,12 +2773,12 @@ msgstr "Användaren ansvarig för denna journal"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Sök period"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Fakturavaluta"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -2777,7 +2788,7 @@ msgstr "Villkor"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "Kontanttransaktion"
 
 #. module: account
 #: view:res.partner:0
@@ -2884,7 +2895,7 @@ msgstr "Tax Code Template"
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "Börjar den"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
@@ -3013,7 +3024,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Redovisningsdashboard"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3053,7 +3064,7 @@ msgstr ""
 #. module: account
 #: report:account.move.voucher:0
 msgid "Journal:"
-msgstr ""
+msgstr "Journal:"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3073,7 +3084,7 @@ msgstr "Utkast"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Kontoplan konfigurering"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3148,7 +3159,7 @@ msgstr "Tax Amount"
 #. module: account
 #: view:account.installer:0
 msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "Dina bank och kontantkonton"
 
 #. module: account
 #: view:account.move:0
@@ -3174,6 +3185,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Valda fakturor kan inte avbrytas då de redan har \"Avbruten\" eller \"Klar\" "
+"status!"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -3188,23 +3201,23 @@ msgstr ""
 #. module: account
 #: report:account.general.ledger:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Motpart"
 
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Fakturainformation"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Fakturastatus"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Produktkategori"
 
 #. module: account
 #: view:account.move:0
@@ -3212,18 +3225,18 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "berättelse"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Skapa konto"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Försäljningskonto per kontotyp"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3255,7 +3268,7 @@ msgstr "Kontotabell"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(Om du inte väljer period så används alla perioder)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3366,7 +3379,7 @@ msgstr "Account Tax"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Budgetar"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3395,7 +3408,7 @@ msgstr "Situation"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3417,12 +3430,12 @@ msgstr "Applicable Code (if type=code)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Antal"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Kontakt adressnamn"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3595,7 +3608,7 @@ msgstr ""
 #: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: account
 #: view:account.invoice:0
@@ -3635,7 +3648,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Godkänn fakturor"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3665,7 +3678,7 @@ msgstr "(Invoice should be unreconciled if you want to open it)"
 #: field:account.report.general.ledger,period_from:0
 #: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Startperiod"
 
 #. module: account
 #: field:account.tax,name:0
@@ -3697,7 +3710,7 @@ msgstr "Objektbalans"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Loss"
-msgstr ""
+msgstr "Nettoförlust"
 
 #. module: account
 #: help:account.account,active:0
@@ -3709,12 +3722,12 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Sök momsmall"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Preliminära transaktioner"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3739,12 +3752,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Råbalans"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Avbryt de valda fakturorna"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3772,7 +3785,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Kontotyp"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3879,7 +3892,7 @@ msgstr ""
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Månadsintervall"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -3889,7 +3902,7 @@ msgstr "Check if you want to display Accounts with 0 balance too."
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr ""
+msgstr "Standardmoms"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3912,7 +3925,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Visningsläge"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -3922,12 +3935,12 @@ msgstr ""
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month: 0"
-msgstr ""
+msgstr "  dag i månaden: 0"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Konto plan"
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -3944,12 +3957,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Fakturastatistik"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Kontoutdrag är registrerade"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:0
@@ -3978,7 +3991,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:0
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "Inte implementerat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4041,7 +4054,7 @@ msgstr "Analytic Account Statistics"
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,based_on:0
 msgid "Based On"
-msgstr ""
+msgstr "Baserad på"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4137,7 +4150,7 @@ msgstr ""
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Välj momstabell"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4158,7 +4171,7 @@ msgstr "Kund"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bekräftad"
 
 #. module: account
 #: report:account.invoice:0
@@ -4212,7 +4225,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -4248,12 +4261,12 @@ msgstr "Fakturor"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Säljare"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturerad"
 
 #. module: account
 #: view:account.use.model:0
@@ -4273,7 +4286,7 @@ msgstr "The tax basis of the tax declaration."
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Lägg till!"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4283,7 +4296,7 @@ msgstr "Lämna tomt för att använda dagens datum"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
-msgstr ""
+msgstr "Bank och checkar"
 
 #. module: account
 #: view:account.period.close:0
@@ -4298,7 +4311,7 @@ msgstr "The bank statement used for bank reconciliation"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Preliminära fakturor är validerade. "
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4334,17 +4347,17 @@ msgstr "Tax Application"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Journalrader"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgstr "Balansräkning (Tillgångskonton)"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Tredje part (Land)"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4399,7 +4412,7 @@ msgstr "Skapa ingående balans för verksamhetsår"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Gruppera fakturarader"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -4454,7 +4467,7 @@ msgstr "Child Tax Accounts"
 #: code:addons/account/account.py:0
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Startperiod skall vara mindre än slutperiod"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4563,7 +4576,7 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
@@ -5494,7 +5507,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "is validated."
-msgstr ""
+msgstr "har validerats."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5505,7 +5518,7 @@ msgstr "Root Account"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Senaste avstämningsdag"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
@@ -5520,13 +5533,13 @@ msgstr "Produktskatter"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Skapa ett konto baserat på denna mall"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Rapport konfiguration"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -5553,7 +5566,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Företag"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -5700,7 +5713,7 @@ msgstr "Eget kapital"
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procent"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -5715,7 +5728,7 @@ msgstr "Power"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr ""
+msgstr "Återbetalningstyp"
 
 #. module: account
 #: report:account.invoice:0
@@ -6883,7 +6896,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: account
 #: view:account.account:0
@@ -6987,17 +7000,17 @@ msgstr ""
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Månadsvis"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 14"
-msgstr ""
+msgstr "  antal dagar: 14"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Förlopp"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7200,7 +7213,7 @@ msgstr "Deferral Method"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "Fakturan '%s' är betald"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -7210,7 +7223,7 @@ msgstr ""
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Fel ! Du kan inte skapa rekursiva skattekoder."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7281,7 +7294,7 @@ msgstr "Additional Information"
 #. module: account
 #: view:account.installer:0
 msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Bank och kontantkonton"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7634,7 +7647,7 @@ msgstr "Slutdatum"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Leverantörer"
 
 #. module: account
 #: constraint:account.move:0
@@ -7660,7 +7673,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistik"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -7685,7 +7698,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Obetalda fakturor"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8241,7 +8254,7 @@ msgstr "("
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify"
-msgstr ""
+msgstr "Ändra"
 
 #. module: account
 #: view:account.account.type:0
@@ -8268,7 +8281,7 @@ msgstr "Payable"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: account
 #: view:board.board:0
@@ -8306,7 +8319,7 @@ msgstr "You must select accounts to reconcile"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo på kontotyp"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -8324,13 +8337,13 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Selektera på"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Manuell registrering"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8408,7 +8421,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Betaningstransaktioner"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8417,7 +8430,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: account
 #: view:account.account:0
@@ -8445,7 +8458,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "End Period"
-msgstr ""
+msgstr "Slutperiod"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8464,12 +8477,12 @@ msgstr ""
 #: field:account.report.general.ledger,chart_account_id:0
 #: field:account.vat.declaration,chart_account_id:0
 msgid "Chart of account"
-msgstr ""
+msgstr "Kontoplan"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Förfallodatum"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8570,12 +8583,12 @@ msgstr "Väntar"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Från analyskonto"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Leverantörsbetalningar"
 
 #. module: account
 #: field:account.period,name:0
@@ -8600,7 +8613,7 @@ msgstr "Aktiv"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Okänt fel"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8741,7 +8754,7 @@ msgstr "Perioder"
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
+msgstr "Valutakurs"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8755,7 +8768,7 @@ msgstr "For Value percent enter % ratio between 0-1."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -8783,7 +8796,7 @@ msgstr ""
 #. module: account
 #: field:account.installer,sale_tax:0
 msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Moms(%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8940,7 +8953,7 @@ msgstr "Källskatt"
 #: code:addons/account/report/account_profit_loss.py:0
 #, python-format
 msgid "Net Profit"
-msgstr ""
+msgstr "Nettovinst"
 
 #. module: account
 #: view:ir.sequence:0
@@ -8956,7 +8969,7 @@ msgstr "This is a model for recurring accounting entries"
 #: code:addons/account/account_analytic_line.py:0
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9058,7 +9071,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Balansomslutningsrapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9094,7 +9107,7 @@ msgstr "Fakturarader"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Slutperiod"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9125,17 +9138,17 @@ msgstr "Write-Off Move"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Fakturans status är klar."
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Försäljningsrapport per konto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Kontots momsregion"
 
 #. module: account
 #: report:account.invoice:0
@@ -9191,7 +9204,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Återkommande"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9202,7 +9215,7 @@ msgstr "Entry is already reconciled"
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Kundfordranskonto"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9212,7 +9225,7 @@ msgstr "Företags betalningsvillkor"
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervall"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -9259,7 +9272,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9276,7 +9289,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Periodiserad kundreskontra"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -9303,7 +9316,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Debitering"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -9313,7 +9326,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Moderkonto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9328,7 +9341,7 @@ msgstr "Remaining amount due."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr ""
+msgstr "Statistikrapport"
 
 #. module: account
 #: field:account.installer,progress:0
@@ -9346,7 +9359,7 @@ msgstr "Accounts Mapping"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "Faktura '%s' väntar på validering."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9355,12 +9368,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Kontots kod måste vara unik per företag."
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -9371,7 +9384,7 @@ msgstr "The income or expense account related to the selected product."
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "Journaldatumet tillhör inte den aktuella perioden!"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9387,7 +9400,7 @@ msgstr "General Journal"
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Sök faktura"
 
 #. module: account
 #: report:account.invoice:0
@@ -9437,7 +9450,7 @@ msgstr "Cost Ledger (Only quantities)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Fakturans status är klar."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -9447,7 +9460,7 @@ msgstr ""
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Sok kontomallar"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9484,7 +9497,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Företag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9499,6 +9512,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Analysjournalen kan gömmas utan att du behöver ta bort den om du markerar "
+"denna."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9518,7 +9533,7 @@ msgstr "Account Model"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9548,7 +9563,7 @@ msgstr "Framtida"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Sök journaltransaktioner"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9575,7 +9590,7 @@ msgstr "Expense Account on Product Template"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Belopp valuta"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b1be04f7c70..0301126a373 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -95,6 +95,25 @@ class account_installer(osv.osv_memory):
         'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        configured_cmp = []
+        unconfigured_cmp = []
+        cmp_select = []
+        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+        cr.execute("SELECT company_id FROM account_account WHERE account_account.parent_id IS NULL")
+        for r in cr.fetchall():
+            configured_cmp.append(r[0])
+        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
+        if unconfigured_cmp:
+            for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp):
+                cmp_select.append((line.id,line.name))
+            for field in res['fields']:
+               if field == 'company_id':
+                   res['fields'][field]['domain'] = unconfigured_cmp
+                   res['fields'][field]['selection'] = cmp_select
+        return res
 
     def on_change_tax(self, cr, uid, id, tax):
         return {'value': {'purchase_tax': tax}}
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3f675f90a07..706b357465f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1312,6 +1312,7 @@ class account_invoice_line(osv.osv):
         if context is None:
             context = {}
         company_id = context.get('company_id',False)
+        tax_obj = self.pool.get('account.tax')
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
@@ -1400,17 +1401,24 @@ class account_invoice_line(osv.osv):
         if a:
             result['account_id'] = a
 
+        tax_ids = tax_obj.search(cr, uid, [('company_id', '=', company_id)])
         if type in ('out_invoice', 'out_refund'):
-            taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            sale_taxes_def = map(lambda x: x.id, res.taxes_id)
+            sale_tax_ids = [tax for tax in tax_ids if tax in sale_taxes_def]
+            sale_taxes = tax_obj.browse(cr, uid, sale_tax_ids)
+            sale_taxes_all = sale_taxes and sale_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
+            tax_id = fpos_obj.map_tax(cr, uid, fpos, sale_taxes_all)
         else:
-            taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            pur_taxes_def = map(lambda x: x.id, res.supplier_taxes_id)
+            pur_tax_ids = [tax for tax in tax_ids if tax in pur_taxes_def]
+            pur_taxes = tax_obj.browse(cr, uid, pur_tax_ids)
+            pur_taxes_all = pur_taxes and pur_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
+            tax_id = fpos_obj.map_tax(cr, uid, fpos, pur_taxes_all)
+
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-
 #        if not name:
         result['name'] = res.partner_ref
 
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index f9697710f8f..45d7e107180 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -84,11 +84,12 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 }
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
+                acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                 if disp_acc == 'bal_movement':
-                    if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0:
+                    if round(res['credit'], acc_digit) > 0  or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
-                    if  res['balance'] != 0:
+                    if round(res['balance'], acc_digit) != 0:
                         self.result_acc.append(res)
                 else:
                     self.result_acc.append(res)
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index b6f39fbbebd..8816d702118 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -60,6 +60,13 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
         })
         self.context = context
 
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        return super(report_balancesheet_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
+
     def sum_dr(self):
         if self.res_bl['type'] == _('Net Profit'):
             self.result_sum_dr += self.res_bl['balance']*-1
@@ -129,15 +136,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'level': account.level,
                         'balance':account.balance,
                     }
+                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += account.balance
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
+                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if account.balance != 0:
+                        if round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 80065880ad9..a6936c74210 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -94,7 +94,7 @@ class account_entries_report(osv.osv):
         return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
         todel=[]
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
@@ -112,7 +112,7 @@ class account_entries_report(osv.osv):
         for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
             if a in domain:
                 domain.remove(a)
-        return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context)
+        return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_entries_report')
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 117f9e351fb..d9d6226904a 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -56,6 +56,13 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
         })
         self.context = context
 
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        return super(report_pl_account_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
+
 
     def final_result(self):
         return self.res_pl
@@ -99,15 +106,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
+                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                     if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += abs(account.debit - account.credit)
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
+                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if  account.balance != 0:
+                        if round(account.balance, acc_digit) != 0:
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index da689275ba3..e2e4db0933e 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -115,3 +115,5 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
+"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index f4c360cd253..e8f0e432d69 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -33,8 +33,9 @@ class account_chart(osv.osv_memory):
                                     help = 'Keep empty for all open fiscal years'),
         'period_from': fields.many2one('account.period', 'Start period'),
         'period_to': fields.many2one('account.period', 'End period'),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required = True),
+        'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                         ('all', 'All Entries'),
+                                        ], 'Target Moves', required = True),
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
@@ -92,7 +93,7 @@ class account_chart(osv.osv_memory):
         return result
 
     _defaults = {
-        'target_move': 'all'
+        'target_move': 'posted'
     }
 
 account_chart()
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 72ae65f83b9..5f4616075fc 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -21,7 +21,7 @@
 
 from lxml import etree
 
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 import tools
 
@@ -29,6 +29,15 @@ class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
     _description = "Move journal"
 
+    _columns = {
+       'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                        ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
+    }
+
+    _defaults = {
+        'target_move': 'posted'
+    }
     def _get_period(self, cr, uid, context={}):
         """
         Return  default account period value
@@ -93,6 +102,8 @@ class account_move_journal(osv.osv_memory):
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
             <separator string="Open Journal Items !" colspan="4"/>
+            <field name="target_move" />
+            <newline/>
             <group colspan="4" >
                 <label width="300" string="Journal: %s"/>
                 <newline/>
@@ -132,6 +143,7 @@ class account_move_journal(osv.osv_memory):
 
         journal_id = self._get_journal(cr, uid, context)
         period_id = self._get_period(cr, uid, context)
+        target_move = self.read(cr, uid, ids, [])[0]['target_move']
 
         name = _("Journal Items")
         if journal_id:
@@ -156,23 +168,26 @@ class account_move_journal(osv.osv_memory):
                 }
                 period_pool.create(cr, uid, res,context=context)
 
-            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
+            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
             period = period_pool.browse(cr, uid, ids[0], context=context)
             name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
 
         result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
         res_id = result and result[1] or False
+        move = 0
+        if target_move == 'posted':
+            move = 1
         return {
             'name': name,
             'view_type': 'form',
             'view_mode': 'tree,graph,form',
             'res_model': 'account.move.line',
             'view_id': False,
-            'context': "{'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+            'context': "{'search_default_posted': %d, 'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, journal_id, period_id),
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }
 
 account_move_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 307272f42ab..eeb77f708e0 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -38,8 +38,9 @@ class account_common_report(osv.osv_memory):
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+        'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                         ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
 
         }
 
@@ -101,7 +102,7 @@ class account_common_report(osv.osv_memory):
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,
-            'target_move': 'all',
+            'target_move': 'posted',
     }
 
     def _build_contexts(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 80bc7a8030e..9e02931f34d 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -31,8 +31,9 @@ class account_tax_chart(osv.osv_memory):
        'period_id': fields.many2one('account.period', \
                                     'Period',  \
                                     ),
-       'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+       'target_move': fields.selection([('posted', 'All Posted Entries'),
+                                        ('all', 'All Entries'),
+                                        ], 'Target Moves', required=True),
     }
 
     def _get_period(self, cr, uid, context=None):
@@ -72,7 +73,7 @@ class account_tax_chart(osv.osv_memory):
 
     _defaults = {
         'period_id': _get_period,
-        'target_move': 'all'
+        'target_move': 'posted'
     }
 
 account_tax_chart()
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
new file mode 100644
index 00000000000..0cc5cfa042d
--- /dev/null
+++ b/addons/account_accountant/i18n/sk.po
@@ -0,0 +1,23 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 10:27+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Účtovník"
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index 942e9001e2d..74e394b78f2 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-05 00:05+0000\n"
+"PO-Revision-Date: 2010-12-05 07:32+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index 18e867d2f2c..976b478772e 100644
--- a/addons/account_analytic_analysis/i18n/es_EC.po
+++ b/addons/account_analytic_analysis/i18n/es_EC.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-06 15:38+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 04:00+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -25,19 +25,6 @@ msgstr ""
 "Número de horas que pueden ser facturadas más aquellas que ya han sido "
 "facturadas."
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
@@ -60,20 +47,15 @@ msgstr "Error de acceso"
 msgid "Theorical Revenue"
 msgstr "Ingresos teóricos"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
 msgstr "Fecha de la última factura creada para esta cuenta analítica."
 
 #. module: account_analytic_analysis
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Fecha última factura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -165,11 +147,6 @@ msgstr "Horas no facturadas"
 msgid "Date of the latest work done on this account."
 msgstr "Fecha del último trabajo realizado en esta cuenta."
 
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
@@ -295,6 +272,11 @@ msgstr "Todas las entradas no facturadas"
 msgid "Hours Tot"
 msgstr "Horas totales"
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index dc07f5700d4..febd2654a04 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-27 14:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 11:49+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -24,19 +24,6 @@ msgid ""
 msgstr ""
 "Número de horas que podem ser facturadas mais as que já foram facturadas."
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-"especial !"
-
-#. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
@@ -60,25 +47,15 @@ msgstr "Erro de acesso"
 msgid "Theorical Revenue"
 msgstr "Rendimento Teórico"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Data da última factura"
-
-#. module: account_analytic_analysis
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
 msgstr "Data da última factura criada para esta conta analítica."
 
 #. module: account_analytic_analysis
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Não pode criar menus recursivos"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Data da última factura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -95,11 +72,6 @@ msgstr "Margem Teórica"
 msgid "Real Margin Rate (%)"
 msgstr "Margem Real da Taxa (%)"
 
-#. module: account_analytic_analysis
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -175,11 +147,6 @@ msgstr "Horas não Facturadas"
 msgid "Date of the latest work done on this account."
 msgstr "Data do último trabalho feito nesta conta"
 
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista!"
-
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
@@ -307,9 +274,9 @@ msgid "Hours Tot"
 msgstr "Total de Horas"
 
 #. module: account_analytic_analysis
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erro! Não pode criar contas analíticas recursivamente"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -328,3 +295,27 @@ msgstr ""
 
 #~ msgid "Financial Project Management"
 #~ msgstr "Gestão do Projecto Financeiro"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Não pode criar menus recursivos"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial !"
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 727033c1315..c5b8f783e81 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-25 19:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 13:07+0000\n"
+"Last-Translator: Alexsandro Haag <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -24,18 +24,6 @@ msgid ""
 msgstr ""
 "Número de horas que podem ser faturadas além daquelas que já foram faturadas"
 
-#. module: account_analytic_analysis
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto deve começar com x_ e não conter caracteres especiais!"
-
-#. module: account_analytic_analysis
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
@@ -57,25 +45,15 @@ msgstr "Erro de acesso"
 msgid "Theorical Revenue"
 msgstr "Receita Projetada"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Data da Última fatura"
-
-#. module: account_analytic_analysis
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
 msgstr "Data da última fatura criada para esta conta analítica."
 
 #. module: account_analytic_analysis
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Você não pode criar um Menu recursivo."
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Data da Última fatura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -92,11 +70,6 @@ msgstr "Marem Projetada"
 msgid "Real Margin Rate (%)"
 msgstr "Taxa Real de Margem"
 
-#. module: account_analytic_analysis
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -172,11 +145,6 @@ msgstr "Horas a faturar"
 msgid "Date of the latest work done on this account."
 msgstr "Data do último trabalho realizado nesta conta."
 
-#. module: account_analytic_analysis
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitetura de exibição"
-
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
@@ -303,9 +271,9 @@ msgid "Hours Tot"
 msgstr "Total de Horas"
 
 #. module: account_analytic_analysis
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erro! Você não pode criar contas analíticas recursivas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -358,5 +326,28 @@ msgstr ""
 #~ msgid "Current Analytic Accounts"
 #~ msgstr "Contas analíticas atuais"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitetura de exibição"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto deve começar com x_ e não conter caracteres especiais!"
+
 #~ msgid "My Uninvoiced Entries"
 #~ msgstr "Minhas Entradas não Faturadas"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Você não pode criar um Menu recursivo."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 58b24c90969..e8141b22917 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:20+0000\n"
+"PO-Revision-Date: 2010-12-05 08:07+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 7fc9758f356..fce78913343 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-26 11:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 12:30+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: 2010-11-27 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +22,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Analyt. Buchungsvorlage"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten !"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -72,11 +60,6 @@ msgstr "Gruppierung..."
 msgid "Default end date for this Analytical Account"
 msgstr "Gültig bis Datum für das Analytische Konto"
 
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
@@ -103,11 +86,6 @@ msgstr ""
 msgid "Sale Order Line"
 msgstr "Auftragsposition"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
@@ -122,7 +100,7 @@ msgstr "Produkt"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Analyt. Verrechnung"
+msgstr "Analytische Verrechnung"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -146,11 +124,6 @@ msgstr "Buchungen"
 msgid "End Date"
 msgstr "Endedatum"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
@@ -183,15 +156,10 @@ msgstr ""
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#. module: account_analytic_default
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Rechungsposition"
+msgstr "Rechnungszeile"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -223,7 +191,17 @@ msgstr ""
 "Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen "
 "festgelegt."
 
-#. module: account_analytic_default
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten !"
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index e7d88447d12..a117aebaeb0 100644
--- a/addons/account_analytic_default/i18n/es_EC.po
+++ b/addons/account_analytic_default/i18n/es_EC.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-17 17:34+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 04:03+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Account Analytic Default"
 msgstr "Cuenta analítica por defecto"
 
-#. module: account_analytic_default
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: account_analytic_default
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
 msgid ""
@@ -41,6 +28,10 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta empresa, automáticamente se "
+"utilizará esta cuenta analítica)."
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -52,32 +43,27 @@ msgstr "Reglas analíticas"
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "Cuenta analítica"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupado por..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
-
-#. module: account_analytic_default
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Fecha final por defecto para esta cuenta analítica."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Paquete de productos"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -91,16 +77,20 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona esta compañía, automáticamente se "
+"utilizará esta cuenta analítica)."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Línea de pedido"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Fecha inicial por defecto para esta cuenta analítica."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -111,7 +101,7 @@ msgstr "Producto"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Distribución analítica"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -135,16 +125,13 @@ msgstr "Asientos"
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: account_analytic_default
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -160,6 +147,10 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
+"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
+"pedidos de venta, si se selecciona este producto, automáticamente se "
+"utilizará esta cuenta analítica)."
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -169,7 +160,7 @@ msgstr "Secuencia"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Detalle de Factura"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -180,7 +171,7 @@ msgstr "Cuenta analítica"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Cuentas"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -198,3 +189,5 @@ msgstr "Fecha inicial"
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
+"Indica el orden de la secuencia cuando se muestra una lista de distribución "
+"analítica."
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 6e00c6b587d..5a021d4d104 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -59,6 +59,7 @@ of distribution models.
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],
     'update_xml': [
+        'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
         'account_analytic_plans_report.xml',
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index fa3e4a24635..afb6b263b3d 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -240,7 +240,7 @@ class account_analytic_plan_instance_line(osv.osv):
     _description = "Analytic Instance Line"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
         'rate': fields.float('Rate (%)', required=True),
     }
     _defaults = {
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index ee9fd5019d9..95275d418c9 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-28 13:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 12:31+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: 2010-11-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account4 Id"
 msgstr "Konto4 ID"
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#. module: account_analytic_plans
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten !"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 #: view:account.crossovered.analytic:0
@@ -110,6 +97,11 @@ msgstr "Bis Datum"
 msgid "Plan Id"
 msgstr "Plan ID"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
@@ -131,20 +123,15 @@ msgid "Distribution Code"
 msgstr "Kurzbezeichnung"
 
 #. module: account_analytic_plans
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Prozent"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
 msgstr "Datum Druck"
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr "Prozent"
-
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sale Order Line"
@@ -156,9 +143,9 @@ msgid "Dont show empty lines"
 msgstr "Zeige keine leeren Zeilen"
 
 #. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID sollte eindeutig sein !"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -215,6 +202,11 @@ msgstr "Verrechnungsposition"
 msgid "Default Entries"
 msgstr "Vorlage Verrechnung"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@@ -255,6 +247,11 @@ msgstr "Konto1 ID"
 msgid "Maximum Allowed (%)"
 msgstr "Max. Erlaubt (100%)"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
@@ -272,11 +269,6 @@ msgstr "Verrechnungsvorlage gespeichert"
 msgid "Analytic Plan Instance"
 msgstr "Analyt. Verrechnungsvorgang"
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
@@ -287,6 +279,12 @@ msgstr "Vorlage Verrechnung"
 msgid "Ok"
 msgstr "OK"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
@@ -323,11 +321,6 @@ msgstr "Der Wert sollte zwischen %s  und %s sein."
 msgid "Bank Statement Line"
 msgstr "Bankauszug Buchungen"
 
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr ""
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
@@ -338,6 +331,11 @@ msgstr "Wert"
 msgid "Print Crossovered Analytic"
 msgstr "Druck Kreuzanalyse"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
@@ -460,11 +458,6 @@ msgstr ""
 msgid "No Analytic Journal !"
 msgstr "Kein Analytisches Journal !"
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
@@ -517,6 +510,11 @@ msgstr "Analyt. Konto Referenz"
 msgid "Invoice"
 msgstr "Rechnung"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
@@ -528,6 +526,11 @@ msgstr "Abbruch"
 msgid "Start Date"
 msgstr "Start Datum"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
@@ -538,11 +541,6 @@ msgstr "bei"
 msgid "Company"
 msgstr "Unternehmen"
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
@@ -557,6 +555,9 @@ msgstr "Von Datum"
 #~ msgid "Create Model"
 #~ msgstr "Erzeuge Model"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
@@ -630,3 +631,24 @@ msgstr "Von Datum"
 
 #~ msgid "Crossovered Analytic -"
 #~ msgstr "Matrix Analyse"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index 0a782bbceb3..640a613b227 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:33+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:14+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -22,19 +22,6 @@ msgstr ""
 msgid "Account4 Id"
 msgstr "Id cuenta4"
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: account_analytic_plans
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 #: view:account.crossovered.analytic:0
@@ -111,6 +98,11 @@ msgstr "Hasta fecha"
 msgid "Plan Id"
 msgstr "Id plan"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañía!"
+
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
@@ -132,20 +124,15 @@ msgid "Distribution Code"
 msgstr "Código de distribución"
 
 #. module: account_analytic_plans
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Porcentaje"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
 msgstr "Fecha de impresión"
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr "Porcentaje"
-
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sale Order Line"
@@ -157,9 +144,9 @@ msgid "Dont show empty lines"
 msgstr "No mostrar líneas vacías"
 
 #. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr "analitica.plan.crear.modelo.accion"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -216,6 +203,11 @@ msgstr "Nombre de plan"
 msgid "Default Entries"
 msgstr "Asientos por defecto"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
+
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@@ -256,6 +248,11 @@ msgstr "Id cuenta1"
 msgid "Maximum Allowed (%)"
 msgstr "Máximo permitido (%)"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
@@ -273,11 +270,6 @@ msgstr "Modelo de distribución guardado"
 msgid "Analytic Plan Instance"
 msgstr "Instancia de plan analítico"
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
@@ -286,7 +278,15 @@ msgstr "Modelos distribución"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr "Acceptar"
+msgstr "Aceptar"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
@@ -324,11 +324,6 @@ msgstr "El total debería estar entre %s y %s"
 msgid "Bank Statement Line"
 msgstr "Línea extracto bancario"
 
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr "analitica.plan.crear.modelo.accion"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
@@ -339,6 +334,11 @@ msgstr "Importe"
 msgid "Print Crossovered Analytic"
 msgstr "Imprimir analítica cruzada"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
@@ -457,11 +457,6 @@ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 msgid "No Analytic Journal !"
 msgstr "¡No diario analítico!"
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
@@ -514,6 +509,11 @@ msgstr "Referencia cuenta analítica"
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañía!"
+
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
@@ -525,6 +525,11 @@ msgstr "Cancelar"
 msgid "Start Date"
 msgstr "Fecha inicial"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
+
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
@@ -535,16 +540,17 @@ msgstr "a las"
 msgid "Company"
 msgstr "Compañía"
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr "Desde la fecha"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Select Information"
 #~ msgstr "Seleccionar información"
 
@@ -554,6 +560,9 @@ msgstr "Desde la fecha"
 #~ msgid "Create Model"
 #~ msgstr "Crear modelo"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "OK"
 #~ msgstr "Aceptar"
 
@@ -565,6 +574,9 @@ msgstr "Desde la fecha"
 #~ msgstr ""
 #~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid ""
 #~ "This module allows to use several analytic plans, according to the general "
 #~ "journal,\n"
@@ -631,3 +643,15 @@ msgstr "Desde la fecha"
 
 #~ msgid "Crossovered Analytic -"
 #~ msgstr "Analítico Entrecruzado -"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 58168d7d63f..f7c5318473f 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 09:59+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-06 14:35+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -102,7 +101,7 @@ msgstr "Identifiant du Plan"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Le nom du journal doit être unique dans chaque société !"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
@@ -207,7 +206,7 @@ msgstr "Entrées par défaut"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Impossible de créer une ligne de transfert sur un compte clos"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index cd31048c1d8..754353a4f97 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-01 09:20+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 12:49+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -21,18 +21,6 @@ msgstr ""
 msgid "Account4 Id"
 msgstr ""
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
-#. module: account_analytic_plans
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 #: view:account.crossovered.analytic:0
@@ -82,7 +70,7 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
 #, python-format
 msgid "Please put a name and a code before saving the model !"
-msgstr ""
+msgstr "Vänligen skriv ett namn och en kod innan du sparar modellen !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -97,18 +85,23 @@ msgstr ""
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 msgid "Print"
-msgstr ""
+msgstr "Utskrift"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Till datum:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
 msgstr ""
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalnamnet måste vara unikt per företag!"
+
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
@@ -127,23 +120,18 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr "Utskriftsdatum"
+msgstr "Fördelningskod"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
 msgstr "Procent"
 
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Utskriftsdatum"
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sale Order Line"
@@ -155,9 +143,9 @@ msgid "Dont show empty lines"
 msgstr "Visa inte tomma rader"
 
 #. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -185,7 +173,7 @@ msgstr "Valuta"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Analyskonto :"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -212,6 +200,11 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
+msgstr "Standardvärden"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account_analytic_plans
@@ -237,7 +230,7 @@ msgstr "Användarfel"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Journalrader"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -252,6 +245,11 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
+msgstr "Maximalt tillåtet (%)"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_analytic_plans
@@ -271,11 +269,6 @@ msgstr "Distributionsmodell sparad"
 msgid "Analytic Plan Instance"
 msgstr ""
 
-#. module: account_analytic_plans
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
@@ -286,6 +279,13 @@ msgstr "Distributionsmodell"
 msgid "Ok"
 msgstr "Ok"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Du kan inte skapa en transaktion på en ett konto utan en kund/leverantör"
+
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
@@ -299,7 +299,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "Minimum tillåtet (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -315,28 +315,28 @@ msgstr ""
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "Totalen borde vara mellan %s och %s"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
 msgstr ""
 
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr ""
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "Belopp"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
 msgstr ""
 
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
@@ -388,7 +388,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@@ -398,7 +398,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "Konto id"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -408,7 +408,7 @@ msgstr "Kod"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -422,11 +422,6 @@ msgstr ""
 msgid "No Analytic Journal !"
 msgstr ""
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
@@ -445,7 +440,7 @@ msgstr "Bankkontoutdrag"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analys konto"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -462,7 +457,7 @@ msgstr ""
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "Värdefel"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
@@ -479,6 +474,11 @@ msgstr ""
 msgid "Invoice"
 msgstr "Faktura"
 
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden måste vara unik per företag!"
+
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
@@ -490,6 +490,11 @@ msgstr "Avbryt"
 msgid "Start Date"
 msgstr "Startdatum"
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Du kan inte skapa transaktioner på visa-konton."
+
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
@@ -500,16 +505,16 @@ msgstr ""
 msgid "Company"
 msgstr "Företag"
 
-#. module: account_analytic_plans
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr "Från datum"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
 #~ msgid ""
 #~ "This module allows to use several analytic plans, according to the general "
 #~ "journal,\n"
@@ -572,3 +577,18 @@ msgstr "Från datum"
 #~ "lines,\n"
 #~ "for one account entry.\n"
 #~ "        "
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 67b25ae6013..74f268db168 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -97,19 +97,21 @@ class crossovered_analytic(report_sxw.rml_parse):
 
         self.final_list = children_list
         selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
+        
+        res['ref_qty'] = 0.0
+        res['ref_amt'] = 0.0
+        self.base_amount = 0.0
+        
         if selected_ids:
             query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                     WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
 
             self.cr.execute(query)
             info=self.cr.dictfetchall()
-
             res['ref_qty'] = info[0]['qty']
             res['ref_amt'] = info[0]['amt']
             self.base_amount = info[0]['amt']
-        res['ref_qty'] = 0.0
-        res['ref_amt'] = 0.0
-        self.base_amount = 0.0
+        
         result.append(res)
         return result
 
diff --git a/addons/account_analytic_plans/security/account_analytic_plan_security.xml b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
new file mode 100644
index 00000000000..1c379bb0f30
--- /dev/null
+++ b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.user_root" model="res.users">
+            <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 40efe00dae4..4eaca49e2ca 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -31,7 +31,7 @@ class account_crossovered_analytic(osv.osv_memory):
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
-        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
+        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
         'empty_line': fields.boolean('Dont show empty lines'),
     }
     _defaults = {
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index dde3bd761ae..3b29422e792 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -7,54 +7,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:23+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:00+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_anglo_saxon
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: account_anglo_saxon
-#: help:product.category,property_account_creditor_price_difference_categ:0
-#: help:product.template,property_account_creditor_price_difference:0
-msgid ""
-"This account will be used to value price difference between purchase price "
-"and cost price."
-msgstr ""
-"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
-"precio de compra y precio de coste"
-
-#. module: account_anglo_saxon
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML Inválido para la Arquitectura de la Vista!"
-
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
 msgstr "Categoría de producto"
 
 #. module: account_anglo_saxon
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
 
 #. module: account_anglo_saxon
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -129,9 +114,14 @@ msgstr ""
 "separadas."
 
 #. module: account_anglo_saxon
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
+"precio de compra y precio de coste"
 
 #~ msgid " Accounting Property"
 #~ msgstr " Contabilidad de la propiedad"
@@ -139,6 +129,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Stock Account"
 #~ msgstr "Cuenta de Valores"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
+
 #~ msgid ""
 #~ "This module will support the Anglo-Saxons accounting methodology by \n"
 #~ "    changing the accounting logic with stock transactions. The difference "
@@ -166,3 +159,18 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ "provisional \n"
 #~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
 #~ "acreedor de la cuenta."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/account_anglo_saxon/i18n/pt_BR.po b/addons/account_anglo_saxon/i18n/pt_BR.po
index fa50ee0dba8..2c55969d5be 100644
--- a/addons/account_anglo_saxon/i18n/pt_BR.po
+++ b/addons/account_anglo_saxon/i18n/pt_BR.po
@@ -7,85 +7,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-25 23:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-09 02:25+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-27 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_anglo_saxon
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: help:product.category,property_account_creditor_price_difference_categ:0
-#: help:product.template,property_account_creditor_price_difference:0
-msgid ""
-"This account will be used to value price difference between purchase price "
-"and cost price."
-msgstr ""
-
-#. module: account_anglo_saxon
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Categoria de produtos"
 
 #. module: account_anglo_saxon
-#: constraint:ir.model:0
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Erro!  Você não pode criar categorias recursivas."
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+"Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erro: A unidade padrão e a unidade de compra devem ser da mesma categoria."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha da Fatura"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Ordem de Compra"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Modelo de produto"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "Banco de Contabilidade para os países anglo-saxões"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
 msgid "Price Difference Account"
-msgstr ""
+msgstr "Diferença de preço de Conta"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "lista de opções"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,description:account_anglo_saxon.module_meta_information
@@ -105,8 +94,28 @@ msgid ""
 "    Secondly, price differences between actual purchase price and fixed "
 "product standard price are booked on a separate account"
 msgstr ""
+"Este módulo irá apoiar as metodologia de contabilização anglo-saxões \n"
+"    Mudando a lógica de contabilização com transações de estoque. A "
+"diferença entre os países de contabilidade anglo-saxão\n"
+"    e os outros ou também chamado continental representando outros países, é "
+"o momento de tomar o custo dos bens vendidos versus custo de vendas.\n"
+"    Contabilidade Anglo-saxões assumirá o custo quando for criada a  de "
+"venda, contabilidade continental terá o custo no momento em que as "
+"mercadorias são enviadas.\n"
+"    Este módulo irá adicionar essa funcionalidade, usando uma conta "
+"provisória, para armazenar o valor das mercadorias expedidas e vai contra "
+"reservar esta conta provisória\n"
+"    Quando a nota fiscal é criada para transferir esta quantia para a conta "
+"do credor ou devedor.\n"
+"    Secundáriamente, as diferenças de preços entre o preço de compra real e "
+"preço padrão de produto fixo são contabilizadas numa conta separada"
 
 #. module: account_anglo_saxon
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
 msgstr ""
+"Essa conta será usada para valorizar a diferença de preço entre preço de "
+"compra e o preço de custo."
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 87b7573a68a..0ccf5d71ce8 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -177,7 +177,7 @@ class crossovered_budget_lines(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids):
             if line.theoritical_amount <> 0.00:
-                res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
+                res[line.id] = float((line.practical_amount or 0.0) / line.theoritical_amount) * 100
             else:
                 res[line.id] = 0.00
         return res
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 6cdadda2338..86551866d4a 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -131,7 +131,6 @@
                                     <field name="date_to"/>
                                     <field name="paid_date" select="1"/>
                                     <field name="planned_amount" select="1"/>
-                                    <field name="analytic_account_id"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
@@ -172,7 +171,7 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group col="20" colspan="4">
-                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index ec1554f4d97..222285eb97d 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:00+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -34,9 +34,10 @@ msgid "Budgetary Positions"
 msgstr "Posiciones presupuestarias"
 
 #. module: account_budget
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -61,11 +62,6 @@ msgstr "Confirmar"
 msgid "Validate User"
 msgstr "Validar usuario"
 
-#. module: account_budget
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
@@ -96,23 +92,17 @@ msgid "at"
 msgstr "a las"
 
 #. module: account_budget
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos"
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Imprimir presupuestos"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
 msgstr "Moneda:"
 
-#. module: account_budget
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
@@ -128,17 +118,16 @@ msgstr "Validado"
 msgid "Percentage"
 msgstr "Porcentaje"
 
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
+
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
-
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "%"
@@ -168,9 +157,9 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: account_budget
-#: report:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -215,11 +204,6 @@ msgstr "Importe real"
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
@@ -312,9 +296,10 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: account_budget
-#: view:crossovered.budget:0
-msgid "To Approve"
-msgstr "Para aprobar"
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha de inicio"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -331,13 +316,6 @@ msgstr "Posición presupuestaria"
 msgid "Start of period"
 msgstr "Inicio del período"
 
-#. module: account_budget
-#: view:account.budget.report:0
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
-msgid "Print Budgets"
-msgstr "Imprimir presupuestos"
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
@@ -349,11 +327,6 @@ msgstr "Informe cruzado resumido presupuesto contable"
 msgid "Theoretical Amt"
 msgstr "Importe teórico"
 
-#. module: account_budget
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
@@ -362,11 +335,6 @@ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
 msgid "Select Dates Period"
 msgstr "Seleccione fechas del período"
 
-#. module: account_budget
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
@@ -470,11 +438,6 @@ msgstr "Cuentas"
 msgid "Budget Lines"
 msgstr "Líneas de presupuesto"
 
-#. module: account_budget
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
@@ -490,10 +453,9 @@ msgid "Budget Management"
 msgstr "Gestión presupuestaria"
 
 #. module: account_budget
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: account_budget
 #: report:account.budget:0
@@ -501,14 +463,15 @@ msgstr "Fecha de inicio"
 msgid "Analysis from"
 msgstr "Análisis desde"
 
-#. module: account_budget
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #~ msgid "% performance"
 #~ msgstr "% rendimiento"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Printing date:"
 #~ msgstr "Fecha impresión:"
 
@@ -539,6 +502,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Select Options"
 #~ msgstr "Seleccionar opciones"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Print Summary of Budgets"
 #~ msgstr "Imprimir resumen de presupuestos"
 
@@ -566,6 +532,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Spreading"
 #~ msgstr "Difusión"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "Budget Item Detail"
 #~ msgstr "Detalle de elemento presupuestario"
 
@@ -626,3 +595,21 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
 #~ "principales por presupuestos.\n"
 #~ "\n"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 46f44d1706f..4e1a08399a4 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/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: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-03 07:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-09 02:59+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -24,7 +24,7 @@ msgstr "Usuário responsável"
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr "Confirmado"
+msgstr "Confirmada"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -49,11 +49,20 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Um orçamento é uma previsão das receitas e despesas esperadas para um "
+"período no futuro da sua empresa. Com um orçamento, uma empresa é capaz de "
+"examinar cuidadosamente quanto dinheiro eles estão arrecadando durante um "
+"determinado período e descobrir a melhor maneira de dividi-lo entre várias "
+"categorias. Para manter o controle para onde seu dinheiro vai, você pode "
+"estar menos propensos a gastar mais e mais provável a atender aos seus "
+"objetivos financeiros. A previsão de um orçamento detalhando a receita "
+"esperada por conta analítica e monitorarar sua evolução baseada nos dados "
+"efetivos realizados durante esse período."
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr "confirmar"
+msgstr "Confirmado"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
@@ -104,7 +113,7 @@ msgstr "Moeda:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Relatório de Conta orçamento contrapartida"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -187,7 +196,7 @@ msgstr "Completo"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Amt prático"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -206,7 +215,7 @@ msgstr "Data Final"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "Relatório de orçamento conta analítica"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -317,13 +326,13 @@ msgstr "Início do período"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Relatório resumido do orçamento contrapartida"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Amt teórico"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -369,6 +378,33 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Este módulo permite aos contabilistas gerenciar orçamentos analíticos e "
+"contrapartida\n"
+"\n"
+"Uma vez que os orçamentos de gerente e o controle orçamental é definidos (na "
+"contabilidade/orçamentos),\n"
+"os gerentes de projeto podem definir a quantidade planejada em cada conta "
+"analítica.\n"
+"s\n"
+"O contador tem a possibilidade de ver o total do montante previsto para cada "
+"um\n"
+"Orçamento e orçamento gerente para assegurar que o  total planejado não é\n"
+"maior/menor do que se planejou para este orçamento de orçamento/Mestre. Cada "
+"lista de\n"
+"registro também pode ser alternado para uma visualização gráfica do mesmo.\n"
+"\n"
+"Três relatórios estão disponíveis:\n"
+"    1. O primeiro está disponível em uma lista de controle orçamental. Ele "
+"dá a propagação, para esses orçamentos, das contas analítico por gerentes "
+"dos Orçamentos.\n"
+"\n"
+"    2. O segundo é um resumo da anterior, apenas dá a propagação, para o "
+"orçamento selecionado, das contas analítico.\n"
+"\n"
+"    3. A última que está disponível no plano analítico de contas. Ele dá a "
+"propagação, para as contas analítico selecionadas, do gerente dos orçamentos "
+"por orçamentos.\n"
+"\n"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -424,7 +460,7 @@ msgstr "Administração do Orçamento"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erro! Você não pode criar contas analíticas recursivas"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index b988f195888..050a8dc0227 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-01 08:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 20:23+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -33,9 +33,9 @@ msgid "Budgetary Positions"
 msgstr ""
 
 #. module: account_budget
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -60,11 +60,6 @@ msgstr "Bekräfta"
 msgid "Validate User"
 msgstr "Validera användare"
 
-#. module: account_budget
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
-
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
@@ -95,22 +90,17 @@ msgid "at"
 msgstr ""
 
 #. module: account_budget
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fel! Ni kan inte skapa rekursiva menyer"
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr "Skriv ut budgetar"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
 msgstr "Valuta:"
 
-#. module: account_budget
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
@@ -126,16 +116,16 @@ msgstr "Validerad"
 msgid "Percentage"
 msgstr "Procent"
 
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "till"
+
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "%"
@@ -165,9 +155,9 @@ msgid "Company"
 msgstr "Företag"
 
 #. module: account_budget
-#: report:crossovered.budget.report:0
-msgid "to"
-msgstr ""
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Att godkänna"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -212,11 +202,6 @@ msgstr ""
 msgid "End Date"
 msgstr "Slutdatum"
 
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
@@ -255,7 +240,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget
 msgid "Budget"
-msgstr ""
+msgstr "Budget"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -266,19 +251,19 @@ msgstr "Utskriven vid"
 #: code:addons/account_budget/account_budget.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Guiden används för att skriva ut budgeten"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -301,17 +286,18 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Godkänn"
 
 #. module: account_budget
-#: view:crossovered.budget:0
-msgid "To Approve"
-msgstr ""
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Startdatum"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -328,13 +314,6 @@ msgstr ""
 msgid "Start of period"
 msgstr ""
 
-#. module: account_budget
-#: view:account.budget.report:0
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
-msgid "Print Budgets"
-msgstr ""
-
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
@@ -346,11 +325,6 @@ msgstr ""
 msgid "Theoretical Amt"
 msgstr ""
 
-#. module: account_budget
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
@@ -359,18 +333,13 @@ msgstr ""
 msgid "Select Dates Period"
 msgstr ""
 
-#. module: account_budget
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Print"
-msgstr ""
+msgstr "Skriv ut"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -410,7 +379,7 @@ msgstr ""
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
-msgstr ""
+msgstr "Budget :"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -436,12 +405,7 @@ msgstr "Konton"
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
-
-#. module: account_budget
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Budgetrader"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -450,7 +414,7 @@ msgstr ""
 #: view:account.budget.report:0
 #: view:crossovered.budget:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
@@ -458,9 +422,8 @@ msgid "Budget Management"
 msgstr ""
 
 #. module: account_budget
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: account_budget
@@ -469,10 +432,10 @@ msgstr ""
 msgid "Analysis from"
 msgstr ""
 
-#. module: account_budget
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #~ msgid ""
 #~ "This module allows accountants to manage analytic and crossovered budgets.\n"
@@ -526,3 +489,15 @@ msgstr ""
 #~ "gives the spreading, for the selected Analytic Accounts, of the Master "
 #~ "Budgets per Budgets.\n"
 #~ "\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index 4de7da4f969..d88c916bf39 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 08:56+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-06 08:24+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -74,7 +73,7 @@ msgstr "Import du CODA"
 #: code:addons/account_coda/account_coda.py:0
 #, python-format
 msgid "Coda file not found for bank statement !!"
-msgstr ""
+msgstr "Fichier coda non trouvé pour le relvé de banque !!"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
diff --git a/addons/account_coda/i18n/pt.po b/addons/account_coda/i18n/pt.po
new file mode 100644
index 00000000000..b96b3a98981
--- /dev/null
+++ b/addons/account_coda/i18n/pt.po
@@ -0,0 +1,250 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-06 13:00+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Importar dados"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Importar"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:0
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "Result"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Fechar"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr ""
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 5f7256124db..eea7b225b16 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-25 20:06+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 20:39+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -112,11 +112,21 @@ msgstr "Aceptar"
 msgid "Select Partners to Remind"
 msgstr "Seleccionar empresas a recordar"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr "Fecha envío del seguimiento"
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
@@ -191,11 +201,6 @@ msgstr "Fin de mes"
 msgid "Not Litigation"
 msgstr "No litigio"
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
@@ -226,11 +231,6 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de líneas de "
 "seguimiento."
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
@@ -291,16 +291,19 @@ msgstr ""
 "\n"
 "Saludos cordiales,\n"
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Enviar correo en el idioma de la empresa"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
@@ -440,21 +443,11 @@ msgstr "Debido"
 msgid "Select Partners"
 msgstr "Seleccionar empresas"
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "Configuración de correo electrónico"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -495,6 +488,11 @@ msgstr "%(user_signature)s: Nombre del usuario"
 msgid "Journal Items"
 msgstr "Registros del diario"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
@@ -510,6 +508,11 @@ msgstr ""
 "Todos los correos han sido enviados a las empresas correctamente:.\n"
 "\n"
 
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -595,11 +598,6 @@ msgstr "Cancelar"
 msgid "Follow-Up Lines"
 msgstr "Líneas de seguimiento"
 
-#. module: account_followup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
@@ -610,14 +608,6 @@ msgstr "Litigio"
 msgid "Max Follow Up Level"
 msgstr "Nivel superior seguimiento máx."
 
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
@@ -770,6 +760,11 @@ msgstr "Fecha último seguimiento"
 msgid "Follow-Up Criteria"
 msgstr "Criterios seguimiento"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
+
 #~ msgid "All payable entries"
 #~ msgstr "Todas los asientos cuentas a pagar"
 
@@ -785,9 +780,18 @@ msgstr "Criterios seguimiento"
 #~ msgid "Follow-Ups Criteria"
 #~ msgstr "Criterios de seguimientos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Select partners to remind"
 #~ msgstr "Seleccionar empresas para recordar"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "All receivable entries"
 #~ msgstr "Todos los asientos cuentas a cobrar"
 
@@ -914,6 +918,9 @@ msgstr "Criterios seguimiento"
 #~ "Saludos cordiales,\n"
 #~ "\t\t\t"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #, python-format
 #~ msgid ""
 #~ "\n"
@@ -925,3 +932,15 @@ msgstr "Criterios seguimiento"
 #~ "\n"
 #~ "Correo enviado a las siguientes empresas correctamente.\n"
 #~ "\n"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index b9d1008667c..24ac71ea4c8 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 16:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 21:20+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -109,31 +109,41 @@ msgstr "Ok"
 msgid "Select Partners to Remind"
 msgstr "Välj partner att påminna"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
 msgstr ""
 
+#. module: account_followup
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "Nettodagar"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr ""
+msgstr "Uppföljningar"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Balans > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Total debet"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -143,7 +153,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Uppföljning"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,32 +186,27 @@ msgstr "Fakturapåminnelser"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "Kontouppföljning"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "Månadsslut"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)er: Användarnamn"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Debet"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -214,18 +219,13 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
@@ -267,16 +267,17 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ogiltig XML för Vy-arkitektur!"
-
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
 msgstr "Skicka email på partnerns språk"
 
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
@@ -347,7 +348,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Skicka mail"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -367,7 +368,7 @@ msgstr "Accounting follow-ups management"
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blockerad"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -386,21 +387,11 @@ msgstr "Förfaller"
 msgid "Select Partners"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
 msgstr "E-postinställningar"
 
-#. module: account_followup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
@@ -419,12 +410,12 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr ""
+msgstr "Balans:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "Uppföljning statistik"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -439,12 +430,17 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
+msgstr "Journalrader"
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr ""
+msgstr "Skicka bekräftelse epost"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:0
@@ -454,6 +450,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#. module: account_followup
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
@@ -539,11 +540,6 @@ msgstr ""
 msgid "Follow-Up Lines"
 msgstr ""
 
-#. module: account_followup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
@@ -554,13 +550,6 @@ msgstr ""
 msgid "Max Follow Up Level"
 msgstr ""
 
-#. module: account_followup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
@@ -708,3 +697,25 @@ msgstr ""
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
 msgstr ""
+
+#. module: account_followup
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po
index a866133abb5..8358d3f4a01 100644
--- a/addons/account_invoice_layout/i18n/hu.po
+++ b/addons/account_invoice_layout/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-05 01:07+0000\n"
-"Last-Translator: Balint (eSolve) <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 08:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index 88c4501f051..7849bac7bbd 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 14:51+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -264,7 +264,7 @@ msgstr "Linha Separadora"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr ""
+msgstr "Melhoria do aspeto das faturas"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po
index 36fee4d67a3..8cdb89b70e2 100644
--- a/addons/account_invoice_layout/i18n/ru.po
+++ b/addons/account_invoice_layout/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:22+0000\n"
+"PO-Revision-Date: 2010-12-05 07:34+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index d2e91351632..9356f7222a6 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 10:01+0000\n"
+"PO-Revision-Date: 2010-12-08 19:13+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -109,7 +109,7 @@ msgstr "Fecha de vencimiento"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -136,7 +136,7 @@ msgstr "Importe"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -162,7 +162,7 @@ msgstr "Referencia"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "¡El nombre de la línea de pago debe ser única!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -298,6 +298,8 @@ msgstr "Buscar órdenes de pago"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -450,7 +452,7 @@ msgstr "Registros del diario"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -721,7 +723,7 @@ msgstr "Cuenta bancaria para el modo de pago"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 
 #~ msgid "Execution date:"
 #~ msgstr "Fecha de ejecución:"
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index eafe5e247f1..6ff1a558c2e 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 08:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-07 21:15+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -40,12 +40,12 @@ msgstr "Seleccione o modo de pagamento para ser aplicado"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: account_payment
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Linhas de pagamentos"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -72,13 +72,9 @@ msgstr ""
 "menos a quantidade que está já na ordem de pagamento"
 
 #. module: account_payment
-#: help:payment.line,date:0
-msgid ""
-"If no payment date is specified, the bank will treat this payment line "
-"directly"
-msgstr ""
-"Se nenhuma data de pagamento for especificado, o banco tratará esta linha de "
-"pagamento directamente"
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr "Empresa"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -106,6 +102,11 @@ msgstr ""
 msgid "Due Date"
 msgstr "Data de Vencimento"
 
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
@@ -128,6 +129,11 @@ msgstr ""
 msgid "Amount"
 msgstr "Montante"
 
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
@@ -149,11 +155,16 @@ msgstr "Nova ordem de pagamento"
 msgid "Reference"
 msgstr "Referência"
 
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
 msgid "Payment Orders"
-msgstr ""
+msgstr "Ordens de pagamento"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -161,10 +172,12 @@ msgid "Directly"
 msgstr "Directamente"
 
 #. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
 #: view:payment.order:0
-#: selection:payment.order,state:0
-msgid "Draft"
-msgstr "Rascunho"
+msgid "Payment Line"
+msgstr "Linha de pagamento"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -182,11 +195,6 @@ msgstr "Confirmado"
 msgid "Invoice Effective Date"
 msgstr "Data efectiva da factura"
 
-#. module: account_payment
-#: field:payment.order,line_ids:0
-msgid "Payment lines"
-msgstr "Linhas de pagamentos"
-
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
@@ -216,7 +224,7 @@ msgstr "Informação da transação"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Modo de pagamento"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
@@ -255,6 +263,11 @@ msgstr "Debito total"
 msgid "Execution date"
 msgstr "Data de execução"
 
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
@@ -274,12 +287,13 @@ msgstr "Conta de destino"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Procurar ordens de pagamento"
 
 #. module: account_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -309,7 +323,7 @@ msgstr "Tipo de comunicação"
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr ""
+msgstr "Gestão de pagamentos"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -329,12 +343,12 @@ msgstr "Montante a ser pago"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Divisa"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
@@ -342,9 +356,13 @@ msgid "Address of the Main Partner"
 msgstr "Endereço do terceiro principal"
 
 #. module: account_payment
-#: field:payment.mode,company_id:0
-msgid "Company"
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
 msgstr ""
+"Se nenhuma data de pagamento for especificado, o banco tratará esta linha de "
+"pagamento directamente"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
@@ -359,7 +377,7 @@ msgstr "Modo de pagamento"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Data valor"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -372,17 +390,10 @@ msgid "Payment amount in the partner currency"
 msgstr "Montante do pagamento na moeda do terceiro"
 
 #. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
-#: model:ir.model,name:account_payment.model_payment_line
-#: view:payment.line:0
 #: view:payment.order:0
-msgid "Payment Line"
-msgstr "Linha de pagamento"
-
-#. module: account_payment
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Rascunho"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -431,6 +442,11 @@ msgstr "Linhas de pagamento"
 msgid "Journal Items"
 msgstr ""
 
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
 #. module: account_payment
 #: help:payment.line,move_line_id:0
 msgid ""
@@ -441,7 +457,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "Search"
-msgstr ""
+msgstr "Procurar"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -451,7 +467,7 @@ msgstr "Data de pagamento"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -491,7 +507,7 @@ msgstr ""
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Referência da fatura"
 
 #. module: account_payment
 #: field:payment.line,name:0
@@ -523,7 +539,7 @@ msgstr "Concluído"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -544,13 +560,6 @@ msgstr "Cancelar"
 msgid "Information"
 msgstr "Informação"
 
-#. module: account_payment
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
@@ -585,12 +594,13 @@ msgstr "Conta bancaria de destino"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Tem a certeza de que quer fazer o pagamento?"
 
 #. module: account_payment
-#: help:payment.mode,journal:0
-msgid "Cash Journal for the Payment Mode"
-msgstr "Diário monetário para o modo de pagamento"
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Diário"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
@@ -618,7 +628,7 @@ msgstr "Pagamento"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Ordem de pagamento / Pagamento"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -640,7 +650,7 @@ msgstr "Nome"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Conta bancária"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -651,7 +661,7 @@ msgstr "Informação de entrada"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr ""
+msgstr "payment.order.create"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -664,15 +674,19 @@ msgid "Total"
 msgstr "Total"
 
 #. module: account_payment
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request that your company does in order to pay "
+"a supplier invoice or a customer credit note. Here you can register all "
+"payment orders that should be done, keep track of all payment orders and "
+"mention the invoice reference and the partner the payment should be done for."
 msgstr ""
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr ""
+msgstr "Fazer pagamento"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -691,10 +705,9 @@ msgid "Bank Account for the Payment Mode"
 msgstr "Conta bancaria para o modo de pagamento"
 
 #. module: account_payment
-#: view:payment.mode:0
-#: field:payment.mode,journal:0
-msgid "Journal"
-msgstr "Diário"
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
 
 #~ msgid "Execution date:"
 #~ msgstr "Data de execução"
@@ -702,6 +715,9 @@ msgstr "Diário"
 #~ msgid "Suitable bank types"
 #~ msgstr "Tipos adequados de bancos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura de vista"
+
 #~ msgid "_Cancel"
 #~ msgstr "_Cancelar"
 
@@ -723,9 +739,17 @@ msgstr "Diário"
 #~ msgid "Code"
 #~ msgstr "Código"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+
 #~ msgid "Pay"
 #~ msgstr "Pagar"
 
+#~ msgid "Cash Journal for the Payment Mode"
+#~ msgstr "Diário monetário para o modo de pagamento"
+
 #~ msgid "_Search"
 #~ msgstr "_Procurar"
 
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index bd61d58be3f..daa92165615 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -37,10 +37,12 @@ class account_payment_populate_statement(osv.osv_memory):
         res = super(account_payment_populate_statement, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         line_ids = line_obj.search(cr, uid, [
             ('move_line_id.reconcile_id', '=', False),
-            ('bank_statement_line_id', '=', False),])
+            ('bank_statement_line_id', '=', False),
+            ('move_line_id.state','=','valid')])
         line_ids.extend(line_obj.search(cr, uid, [
             ('move_line_id.reconcile_id', '=', False),
-            ('order_id.mode', '=', False)]))
+            ('order_id.mode', '=', False),
+            ('move_line_id.state','=','valid')]))
         domain = '[("id", "in", '+ str(line_ids)+')]'
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='lines']")
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
index 2ce45fe8b73..51d36af5443 100644
--- a/addons/account_tax_include/i18n/id.po
+++ b/addons/account_tax_include/i18n/id.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 02:39+0000\n"
+"Last-Translator: sudarno <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML tidak valid untuk Menampilkan Arsitektur!"
+msgstr "Salah dalam penyusunan format XML"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9394863f0c8..d47d8fb1f6f 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -841,7 +841,6 @@ class account_voucher_line(osv.osv):
     _defaults = {
         'name': ''
     }
-
     def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
         """
         Returns a dict that contains new values and context
@@ -964,6 +963,17 @@ class account_bank_statement_line(osv.osv):
                 res[line.id] = 0.0
         return res
 
+    def _check_amount(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            if obj.voucher_id:
+                if not (obj.amount == obj.voucher_id.amount):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line', ['amount']),
+    ]
+
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', method=True, type='float'),
@@ -983,4 +993,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 8e144800c75..03b7078f546 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-25 10:22+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:45+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -50,11 +50,6 @@ msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
 "¡No se puede eliminar comprobante(s) que ya estén abiertos o pagados!"
 
-#. module: account_voucher
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
@@ -185,6 +180,11 @@ msgstr "Aceptar"
 msgid "Due Date"
 msgstr "Fecha vencimiento"
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
+
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
@@ -226,6 +226,11 @@ msgstr "Importe"
 msgid "Payment Options"
 msgstr "Opciones de pago"
 
+#. module: account_voucher
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
@@ -258,11 +263,22 @@ msgstr "Línea extracto bancario"
 msgid "Supplier Vouchers"
 msgstr "Comprobantes proveedores"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
 msgstr "Impuesto"
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr "Diario de desajuste"
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -270,6 +286,7 @@ msgid "Amount (in words) :"
 msgstr "Importe (en palabras):"
 
 #. module: account_voucher
+#: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -279,6 +296,14 @@ msgstr "Cuenta analítica"
 msgid "Journal:"
 msgstr "Diario:"
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -311,9 +336,9 @@ msgstr ""
 "del impuesto '%s'!"
 
 #. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
-msgstr "Pagar tarde o agrupar fondos"
+#: report:voucher.print:0
+msgid "Account :"
+msgstr "Cuenta :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -343,11 +368,6 @@ msgstr "Fecha:"
 msgid "Period"
 msgstr "Período"
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
@@ -359,11 +379,6 @@ msgstr "Estado"
 msgid "Accounting Voucher Entries"
 msgstr "Comprobantes contables"
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@@ -415,11 +430,6 @@ msgstr "Otra información"
 msgid "Unreconciliation"
 msgstr "Romper conciliación"
 
-#. module: account_voucher
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
@@ -459,11 +469,6 @@ msgstr "Importe pagado"
 msgid "Pay Directly"
 msgstr "Pagar directamente"
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Voucher Items"
-msgstr "Elementos comprobante"
-
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -492,9 +497,9 @@ msgid "Payable and Receivables"
 msgstr "A pagar y a cobrar"
 
 #. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
-msgstr "Cuenta :"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr "Pagar tarde o agrupar fondos"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -505,20 +510,15 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: account_voucher
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
 msgstr "Moneda:"
 
-#. module: account_voucher
-#: field:account.move.line,amount_unreconciled:0
-msgid "Unreconciled Amount"
-msgstr "Importe no conciliado"
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -561,8 +561,8 @@ msgstr "Plazos de pago"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Compute Tax"
-msgstr "Calcular impuestos"
+msgid "Are you sure to unreconcile this record ?"
+msgstr "¿Seguro que desea romper la conciliación de este registro?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -581,10 +581,9 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
-msgstr "Número:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -601,12 +600,22 @@ msgstr "Líneas de gastos"
 msgid "Previous Payments ?"
 msgstr "¿Pagos previos?"
 
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Comment"
+msgstr "Comentario"
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
 msgstr "Diarios de comprobantes"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr "Calcular impuestos"
+
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 #: report:voucher.cash_receipt.drcr:0
@@ -625,6 +634,11 @@ msgstr "¡Defina una secuencia en el diario!"
 msgid "Through :"
 msgstr "A través de :"
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Without Write-off"
+msgstr "Sin desajuste"
+
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
@@ -641,10 +655,10 @@ msgid "Bill Date"
 msgstr "Fecha factura"
 
 #. module: account_voucher
-#: view:account.voucher:0
-#: view:account.voucher.unreconcile:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Número:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -690,9 +704,9 @@ msgid "Invoice"
 msgstr "Factura"
 
 #. module: account_voucher
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Elementos comprobante"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -707,11 +721,6 @@ msgstr "Cancelado"
 msgid "Pro-forma"
 msgstr "Pro-forma"
 
-#. module: account_voucher
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
@@ -728,12 +737,9 @@ msgid "Customer Payment"
 msgstr "Pago cliente"
 
 #. module: account_voucher
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
+msgstr "Importe no conciliado"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -752,6 +758,11 @@ msgstr "Pagar"
 msgid "Debit"
 msgstr "Debe"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr "¿Desea confirmar este registro?"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
@@ -780,6 +791,11 @@ msgstr "Facturas de Proveedor y transacciones de salida"
 msgid "Journal"
 msgstr "Diario"
 
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Option"
+msgstr "Opción de pago"
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "-"
@@ -796,6 +812,11 @@ msgstr "Notas internas"
 msgid "Credits"
 msgstr "Haber"
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Writeoff Amount"
+msgstr "Importe desajuste"
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -824,6 +845,11 @@ msgstr "Contabilizado"
 msgid "Customer"
 msgstr "Cliente"
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "With Write-off"
+msgstr "Con desajuste"
+
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
@@ -840,11 +866,6 @@ msgstr "Entradas por extracto desde facturas"
 msgid "Account Entry"
 msgstr "Entrada contable"
 
-#. module: account_voucher
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
@@ -882,6 +903,11 @@ msgstr "Total"
 msgid "Memo"
 msgstr "Memoria"
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
+
 #~ msgid "State :"
 #~ msgstr "Estado :"
 
@@ -903,9 +929,18 @@ msgstr "Memoria"
 #~ msgid "Type"
 #~ msgstr "Tipo"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Reference Type"
 #~ msgstr "Tipo de referencia"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Other Info"
 #~ msgstr "Otra información"
 
@@ -1008,6 +1043,9 @@ msgstr "Memoria"
 #~ msgid "Level"
 #~ msgstr "Nivel"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "Entry Lines"
 #~ msgstr "Líneas de asiento"
 
@@ -1062,6 +1100,9 @@ msgstr "Memoria"
 #~ msgid "Form view not available for Payment Lines"
 #~ msgstr "Vista formulario no disponible para líneas de pago"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
 #~ msgid "Extended options..."
 #~ msgstr "Opciones extras..."
 
@@ -1072,3 +1113,18 @@ msgstr "Memoria"
 #, python-format
 #~ msgid "Please change partner and try again !"
 #~ msgstr "¡Cambie la empresa y pruebe de nuevo!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index ca503a9b808..690b7552672 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 02:27+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 04:17+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -48,11 +48,6 @@ msgstr "Agrupar por..."
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr "No puede borrar pagos que están ya cerrados"
 
-#. module: account_voucher
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
@@ -118,6 +113,10 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Cuando usted vende productos a un cliente, puede darle un recibo de compra o "
+"una factura. Cuando el recibo de compra es confirmada, crea elementos del "
+"diario de forma automática y se puede registrar el pago de los clientes "
+"relacionados con este recibo de compra"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -182,6 +181,11 @@ msgstr "Ok"
 msgid "Due Date"
 msgstr "Fecha de Vencimiento"
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Usted no puede crear la línea de avanzar en cuenta cerrada."
+
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
@@ -196,6 +200,11 @@ msgid ""
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
 msgstr ""
+"Ventas de pago le permite registrar los pagos que recibe de sus clientes. "
+"Con el fin de grabar un pago, usted debe entrar en el cliente, la forma de "
+"pago (= el diario) y el importe del pago. OpenERP propondrá de forma "
+"automática, la conciliación de este pago con las facturas o recibos de venta "
+"libre."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -223,6 +232,11 @@ msgstr "Importe"
 msgid "Payment Options"
 msgstr "Opciones de Pago"
 
+#. module: account_voucher
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor crédito o débito erróneo en apunte contable!"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
@@ -255,11 +269,22 @@ msgstr "Detalle de Extracto bancario"
 msgid "Supplier Vouchers"
 msgstr "Comprobantes de Proveedor"
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr "Romper Conciliación"
+
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
 msgstr "Impuesto"
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr "Diario de desajuste"
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -267,6 +292,7 @@ msgid "Amount (in words) :"
 msgstr "Importe (en palabras):"
 
 #. module: account_voucher
+#: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -276,6 +302,14 @@ msgstr "Cuenta analítica"
 msgid "Journal:"
 msgstr "Diario:"
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Usted no puede crear la línea de pasar por cobrar / cuentas por pagar sin "
+"empresa relacionada"
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -308,9 +342,9 @@ msgstr ""
 "impuesto '%s'"
 
 #. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
-msgstr "Pagar después o agrupar fondos"
+#: report:voucher.print:0
+msgid "Account :"
+msgstr "Cuenta :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -340,11 +374,6 @@ msgstr "Fecha:"
 msgid "Period"
 msgstr "Período"
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
@@ -356,11 +385,6 @@ msgstr "Estado"
 msgid "Accounting Voucher Entries"
 msgstr "Comprobantes contables"
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@@ -412,11 +436,6 @@ msgstr "Otra Información"
 msgid "Unreconciliation"
 msgstr "Romper conciliación"
 
-#. module: account_voucher
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
@@ -456,11 +475,6 @@ msgstr "Monto Pagado"
 msgid "Pay Directly"
 msgstr "Pagar Directamente"
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Voucher Items"
-msgstr "Items de Comprobante"
-
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -489,9 +503,9 @@ msgid "Payable and Receivables"
 msgstr "Por Cobrar y por Pagar"
 
 #. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
-msgstr "Cuenta :"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr "Pagar después o agrupar fondos"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -502,20 +516,15 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: account_voucher
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Error ! No puede crear menús recursivos"
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr "Cuenta de desajuste"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
 msgstr "Moneda:"
 
-#. module: account_voucher
-#: field:account.move.line,amount_unreconciled:0
-msgid "Unreconciled Amount"
-msgstr "Monto no conciliado"
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -530,6 +539,10 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"La forma de pago a los proveedores le permite realizar el seguimiento del "
+"pago que hace a sus proveedores. Al seleccionar un proveedor, la forma de "
+"pago y una cantidad para el pago, OpenERP propondrá a conciliar su pago con "
+"las facturas de proveedores abierto o facturas."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -558,8 +571,8 @@ msgstr "Términos de Pago"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Compute Tax"
-msgstr "Calcular Impuesto"
+msgid "Are you sure to unreconcile this record ?"
+msgstr "Seguro de romper la conciliación del registro ?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -575,13 +588,12 @@ msgstr "Fijar"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
-msgstr "Número:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -598,12 +610,22 @@ msgstr "Detalle de egresos"
 msgid "Previous Payments ?"
 msgstr "Pagos Previos ?"
 
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Comment"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
 msgstr "Diario de Comprobantes"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr "Calcular Impuesto"
+
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 #: report:voucher.cash_receipt.drcr:0
@@ -622,6 +644,11 @@ msgstr "Por favor defina una secuencia en el diario !"
 msgid "Through :"
 msgstr "A través de :"
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Without Write-off"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
@@ -638,10 +665,10 @@ msgid "Bill Date"
 msgstr "Fecha Factura"
 
 #. module: account_voucher
-#: view:account.voucher:0
-#: view:account.voucher.unreconcile:0
-msgid "Unreconcile"
-msgstr "Romper Conciliación"
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Número:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -687,9 +714,9 @@ msgid "Invoice"
 msgstr "Factura"
 
 #. module: account_voucher
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Items de Comprobante"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -704,11 +731,6 @@ msgstr "Cancelado"
 msgid "Pro-forma"
 msgstr "Pro-forma"
 
-#. module: account_voucher
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
@@ -725,12 +747,9 @@ msgid "Customer Payment"
 msgstr "Pago de Cliente"
 
 #. module: account_voucher
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
+msgstr "Monto no conciliado"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -749,6 +768,11 @@ msgstr "Pagar"
 msgid "Debit"
 msgstr "Debe"
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
@@ -777,6 +801,11 @@ msgstr "Facturas de Proveedor y transacciones pendientes"
 msgid "Journal"
 msgstr "Diario"
 
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Option"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "-"
@@ -793,6 +822,11 @@ msgstr "Notas Internas"
 msgid "Credits"
 msgstr "Créditos"
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Writeoff Amount"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -821,6 +855,11 @@ msgstr "Contabilizado"
 msgid "Customer"
 msgstr "Cliente"
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "With Write-off"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
@@ -837,11 +876,6 @@ msgstr "Entradas por extracto desde facturas"
 msgid "Account Entry"
 msgstr "Asiento contable"
 
-#. module: account_voucher
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Reglas no son soportadas para objetos osv_menory !"
-
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
@@ -877,3 +911,8 @@ msgstr "Total"
 #: field:account.voucher,name:0
 msgid "Memo"
 msgstr "Memo"
+
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index ca8bab39ca3..58d39a80ba5 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -6,30 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-02 23:59+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-07 21:40+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
-
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Form view not available for Payment Lines"
-msgstr ""
+msgstr "Transações não reconciliadas"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Referência de pagamento"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -45,7 +40,7 @@ msgstr "Particulares"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -53,20 +48,15 @@ msgstr ""
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
-msgstr "Ref. :"
+msgstr "Referência :"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
@@ -109,6 +99,15 @@ msgstr ""
 msgid "Account voucher unreconcile"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"When you sell products to a customer, you can give him a sales receipt or an "
+"invoice. When the sales receipt is confirmed, it creates journal items "
+"automatically and you can record the customer payment related to this sales "
+"receipt."
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
@@ -123,7 +122,7 @@ msgstr "Empresa"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr "Definido como rascunho"
+msgstr "Definir para Rascunho"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
@@ -138,7 +137,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -159,7 +158,7 @@ msgstr "Conta"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "Débitos"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -172,15 +171,30 @@ msgstr ""
 msgid "Due Date"
 msgstr ""
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"Sales payment allows you to register the payments you receive from your "
+"customers. In order to record a payment, you must enter the customer, the "
+"payment method (=the journal) and the payment amount. OpenERP will propose "
+"to you automatically the reconciliation of this payment with the open "
+"invoices or sales receipts."
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Venda"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -201,6 +215,11 @@ msgstr "Montante"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
+msgstr "Opções de pagamento"
+
+#. module: account_voucher
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
 
 #. module: account_voucher
@@ -216,13 +235,13 @@ msgstr ""
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Data de pagamento"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Assinatura do Receptor"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -235,31 +254,49 @@ msgstr ""
 msgid "Supplier Vouchers"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Montante (em palavras):"
 
 #. module: account_voucher
+#: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "Conta da contabilidade analítica"
+msgstr "Conta Analítica"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Journal:"
+msgstr "Diário:"
+
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Informação de pagamento"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -276,7 +313,7 @@ msgstr "Terceiro"
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Importar faturas"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -288,18 +325,18 @@ msgstr ""
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Account :"
-msgstr ""
+msgstr "Conta:"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Recibo"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Em Conta de :"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -310,7 +347,7 @@ msgstr ""
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -327,19 +364,19 @@ msgstr "Estado"
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
 msgid "Accounting Voucher Entries"
-msgstr ""
+msgstr "Movimentos Contabilisticos Voucher"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
 msgid "Voucher Entries"
-msgstr "Entradas de vouchers"
+msgstr "Movimentos Voucher"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -355,36 +392,31 @@ msgstr ""
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Assinatura Autorizada"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipt"
-msgstr ""
+msgstr "Recibo de venda"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Ação inválida!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Outra informação"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
@@ -396,7 +428,7 @@ msgstr ""
 #: code:addons/account_voucher/invoice.py:0
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Pagar fatura"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -407,7 +439,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Valor do imposto"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -417,7 +449,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "Montante pago"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -428,7 +460,7 @@ msgstr ""
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Faturas"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
@@ -465,30 +497,34 @@ msgid "Draft"
 msgstr "Rascunho"
 
 #. module: account_voucher
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
 msgstr ""
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
-
-#. module: account_voucher
-#: field:account.move.line,amount_unreconciled:0
-msgid "Unreconciled Amount"
-msgstr ""
+msgstr "Divisa"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"The supplier payment form allows you to track the payment you do to your "
+"suppliers. When you select a supplier, the payment method and an amount for "
+"the payment, OpenERP will propose to reconcile your payment with the open "
+"supplier invoices or bills."
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Montante total"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
@@ -512,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Compute Tax"
+msgid "Are you sure to unreconcile this record ?"
 msgstr ""
 
 #. module: account_voucher
@@ -527,9 +563,13 @@ msgid "Post"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: view:account.voucher:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_voucher
@@ -545,6 +585,11 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
+msgstr "Pagamentos anteriores?"
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Comment"
 msgstr ""
 
 #. module: account_voucher
@@ -553,17 +598,17 @@ msgstr ""
 msgid "Journal Vouchers"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 #: report:voucher.cash_receipt.drcr:0
 msgid "Credit"
 msgstr "Crédito"
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Extended options..."
-msgstr ""
-
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
@@ -574,6 +619,11 @@ msgstr ""
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Through :"
+msgstr "Através de :"
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Without Write-off"
 msgstr ""
 
 #. module: account_voucher
@@ -592,16 +642,16 @@ msgid "Bill Date"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-#: view:account.voucher.unreconcile:0
-msgid "Unreconcile"
-msgstr ""
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
+msgstr "Número:"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Contabilidade Voucher"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -616,12 +666,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "To Review"
-msgstr ""
+msgstr "Para rever"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Informação de vendas"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -638,7 +688,7 @@ msgstr "Voucher"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -674,11 +724,9 @@ msgid "Customer Payment"
 msgstr ""
 
 #. module: account_voucher
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -689,7 +737,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Pagar"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -699,9 +747,14 @@ msgstr "Débito"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Payment Method"
+msgid "Are you sure to confirm this record ?"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Método de pagamento"
+
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
@@ -711,12 +764,11 @@ msgstr "Descrição"
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "Canceled"
-msgstr ""
+msgstr "Candelado"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
-#, python-format
-msgid "Please change partner and try again !"
+#: view:account.voucher:0
+msgid "Vendor Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
@@ -726,10 +778,15 @@ msgstr ""
 msgid "Journal"
 msgstr "Diário"
 
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Option"
+msgstr "Opção de pagamento"
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -740,13 +797,18 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
+msgstr "Créditos"
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Writeoff Amount"
 msgstr ""
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "Estado:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -755,7 +817,7 @@ msgstr ""
 #: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Pagamento"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -768,6 +830,11 @@ msgstr "Publicado"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
+msgstr "Cliente"
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "With Write-off"
 msgstr ""
 
 #. module: account_voucher
@@ -784,18 +851,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr "Entrada da conta"
-
-#. module: account_voucher
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
-#, python-format
-msgid "Invalid Error !"
-msgstr ""
+msgstr "Movimento da Conta"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
@@ -829,25 +885,24 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
 msgstr ""
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
 #~ msgid "State :"
 #~ msgstr "Estado :"
 
 #~ msgid "Voucher Line"
 #~ msgstr "Linha de Voucher"
 
-#~ msgid "Journal Sale Voucher"
-#~ msgstr "Voucher do diario de venda"
-
-#~ msgid "Payment Vouchers"
-#~ msgstr "Vouchers de pagamento"
-
 #~ msgid "Create"
 #~ msgstr "Criar"
 
@@ -860,80 +915,23 @@ msgstr ""
 #~ msgid "Vouchers"
 #~ msgstr "Vouchers"
 
-#~ msgid "New Bank Payment"
-#~ msgstr "Novo pagamento bancário"
-
 #~ msgid "Narration"
 #~ msgstr "Narração"
 
-#~ msgid "Voucher Reference"
-#~ msgstr "Referencia do voucher"
-
-#~ msgid "Voucher Report"
-#~ msgstr "Relatório do voucher"
-
-#~ msgid "Opening Balance"
-#~ msgstr "Saldo Inicial"
-
-#~ msgid "New Cash Payment"
-#~ msgstr "Novo pagamento a dinheiro"
-
 #~ msgid "Dr/Cr"
 #~ msgstr "Dr/Cr"
 
-#~ msgid "Reference Type"
-#~ msgstr "Tipo de referência"
-
-#~ msgid "Bank Payments"
-#~ msgstr "Pagamentos bancários"
-
 #~ msgid "Other Info"
 #~ msgstr "Outras Informações"
 
-#~ msgid "Other Vouchers"
-#~ msgstr "Outros vouchers"
-
-#~ msgid "Cash Payment Voucher"
-#~ msgstr "Voucher do pagamento a dinheiro"
-
-#~ msgid "Journal Purchase Voucher"
-#~ msgstr "Voucher do diário de compra"
-
-#~ msgid "Closing Balance"
-#~ msgstr "Fechar balanço"
-
-#~ msgid "Ref."
-#~ msgstr "Referencia"
-
 #~ msgid "Name"
 #~ msgstr "Nome"
 
-#~ msgid "Real Entry"
-#~ msgstr "Entrada real"
-
-#~ msgid "Cash Payments"
-#~ msgstr "Pagamentos a dinheiro"
-
-#~ msgid "Total Credit"
-#~ msgstr "Crédito total"
-
-#~ msgid "Account Entry Line"
-#~ msgstr "Linha de movimento de conta"
-
-#~ msgid "Total Debit"
-#~ msgstr "Debito total"
-
 #~ msgid "Optional Information"
 #~ msgstr "Informação Opcional"
 
-#~ msgid "General Information"
-#~ msgstr "Informação geral"
-
 #~ msgid "Bank Receipts"
 #~ msgstr "Recibos do Banco"
 
-#~ msgid "Opening Balance Entry"
-#~ msgstr "Movimento de abertura do exercício"
-
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra Voucher"
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index e3f8abf4d25..9ffa26440a1 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -395,7 +395,7 @@ msgstr "Nevažeći XML za pregled arhitekture"
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
 msgstr "Placanja Proizvodjaca"
 
 #. module: account_voucher
@@ -509,7 +509,7 @@ msgstr "Pregled KOmpletan?"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
 msgstr "proizvođač"
 
 #. module: account_voucher
@@ -632,7 +632,7 @@ msgstr "Informacije Prodaje"
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
 msgstr "Otvori Dnevnik Proizvodjaca"
 
 #. module: account_voucher
@@ -820,7 +820,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
 msgstr "Proizvodjacevi racuni i neobradjene transakcije"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 70ca25c6789..8c68e310c55 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-02 07:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 16:07+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -40,7 +40,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera efter"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -48,11 +48,6 @@ msgstr ""
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modellen i händelsedefinitionen."
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
@@ -97,7 +92,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr ""
+msgstr "Importera poster"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
@@ -116,7 +111,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr ""
+msgstr "Betala räkning"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -127,12 +122,12 @@ msgstr "Företag"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sätt till utkast"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Ej avstämda transaktioner"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -142,7 +137,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Validera"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -152,7 +147,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "Köp"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -163,18 +158,23 @@ msgstr "Konto"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "Debet"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
 #: field:account.voucher.line,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Förfallodatum"
+
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Du kan inte skapa transaktioner för ett avslutat konto."
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Försäljning"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -215,6 +215,11 @@ msgstr "Belopp"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
+msgstr "Betalningsalternativ"
+
+#. module: account_voucher
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
 
 #. module: account_voucher
@@ -249,11 +254,22 @@ msgstr ""
 msgid "Supplier Vouchers"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:account.voucher.unreconcile:0
+msgid "Unreconcile"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -261,6 +277,7 @@ msgid "Amount (in words) :"
 msgstr "Belopp (verbalt):"
 
 #. module: account_voucher
+#: field:account.voucher,analytic_id:0
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
 msgstr ""
@@ -270,6 +287,12 @@ msgstr ""
 msgid "Journal:"
 msgstr ""
 
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
@@ -300,8 +323,8 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
+#: report:voucher.print:0
+msgid "Account :"
 msgstr ""
 
 #. module: account_voucher
@@ -332,11 +355,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
@@ -348,11 +366,6 @@ msgstr ""
 msgid "Accounting Voucher Entries"
 msgstr "Accounting Voucher Entries"
 
-#. module: account_voucher
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@@ -404,11 +417,6 @@ msgstr ""
 msgid "Unreconciliation"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
@@ -448,11 +456,6 @@ msgstr ""
 msgid "Pay Directly"
 msgstr ""
 
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Voucher Items"
-msgstr ""
-
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -481,8 +484,8 @@ msgid "Payable and Receivables"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
 msgstr ""
 
 #. module: account_voucher
@@ -494,8 +497,8 @@ msgid "Draft"
 msgstr ""
 
 #. module: account_voucher
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
 msgstr ""
 
 #. module: account_voucher
@@ -503,11 +506,6 @@ msgstr ""
 msgid "Currency:"
 msgstr ""
 
-#. module: account_voucher
-#: field:account.move.line,amount_unreconciled:0
-msgid "Unreconciled Amount"
-msgstr ""
-
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -550,7 +548,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Compute Tax"
+msgid "Are you sure to unreconcile this record ?"
 msgstr ""
 
 #. module: account_voucher
@@ -570,9 +568,8 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_voucher
@@ -590,12 +587,22 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Comment"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Compute Tax"
+msgstr ""
+
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 #: report:voucher.cash_receipt.drcr:0
@@ -614,6 +621,11 @@ msgstr ""
 msgid "Through :"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Without Write-off"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
@@ -630,9 +642,9 @@ msgid "Bill Date"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-#: view:account.voucher.unreconcile:0
-msgid "Unreconcile"
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
 msgstr ""
 
 #. module: account_voucher
@@ -679,8 +691,8 @@ msgid "Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: view:account.voucher:0
+msgid "Voucher Items"
 msgstr ""
 
 #. module: account_voucher
@@ -696,11 +708,6 @@ msgstr "ångra"
 msgid "Pro-forma"
 msgstr ""
 
-#. module: account_voucher
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,move_ids:0
@@ -717,11 +724,9 @@ msgid "Customer Payment"
 msgstr ""
 
 #. module: account_voucher
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:account.move.line,amount_unreconciled:0
+msgid "Unreconciled Amount"
 msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -740,6 +745,11 @@ msgstr ""
 msgid "Debit"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to confirm this record ?"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
@@ -768,6 +778,11 @@ msgstr ""
 msgid "Journal"
 msgstr "Journal"
 
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Option"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 msgid "-"
@@ -784,6 +799,11 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Writeoff Amount"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
 #: report:voucher.print:0
@@ -812,6 +832,11 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "With Write-off"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
@@ -828,11 +853,6 @@ msgstr ""
 msgid "Account Entry"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
@@ -866,3 +886,19 @@ msgstr ""
 #: field:account.voucher,name:0
 msgid "Memo"
 msgstr ""
+
+#. module: account_voucher
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modellen i händelsedefinitionen."
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 16f44c6d45a..5bef0c26718 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -133,7 +133,7 @@
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                     <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
@@ -240,7 +240,7 @@
                                 </group>
                                 <group col="4" colspan="1">
                                     <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
                                     <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1da95285c24..1c0c00bd662 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -38,7 +38,7 @@
                 <form string="Import Entries">
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
-                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
+                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 58f2357d452..c852c6d93b9 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -206,7 +206,7 @@ class account_analytic_line(osv.osv):
         'date': fields.date('Date', required=True, select=1),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 35f2c714289..59bf80245d3 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:39+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:01+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -23,14 +23,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
-#. module: analytic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account Name"
@@ -50,11 +42,6 @@ msgstr ""
 "Módulo para definir objetos contables analíticos.\n"
 "    "
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
@@ -95,11 +82,6 @@ msgstr "Plantilla"
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: analytic
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
@@ -122,11 +104,6 @@ msgstr "Normal"
 msgid "Company"
 msgstr "Compañía"
 
-#. module: analytic
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
@@ -197,6 +174,11 @@ msgstr "Cancelado"
 msgid "Balance"
 msgstr "Balance"
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
 #. module: analytic
 #: help:account.analytic.account,type:0
 msgid ""
@@ -211,11 +193,6 @@ msgstr ""
 msgid "Date End"
 msgstr "Fecha final"
 
-#. module: analytic
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
@@ -238,11 +215,6 @@ msgstr "Cuenta analítica"
 msgid "View"
 msgstr "Vista"
 
-#. module: analytic
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
@@ -263,7 +235,26 @@ msgstr "Abrir"
 msgid "Analytic Entries"
 msgstr "Entradas analíticas"
 
-#. module: analytic
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index 7107fe48d00..51570e996e7 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-03 07:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-09 03:12+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -30,7 +30,7 @@ msgstr "Nome da Conta"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Especifica o total da quantidade para contar."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Módulo para a definição de objeto de contabilidade analítica.\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -138,11 +140,13 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Calculado multiplicando a quantidade e o preço dado no preço de custo do "
+"produto. Sempre expressos na moeda principal da empresa."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Define o limite da maior quantidade de horas."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -172,7 +176,7 @@ msgstr "Balanço"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erro! Você não pode criar contas analíticas recursivas"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -180,6 +184,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Se você selecionar o tipo de modo de exibição, significa que você não vai "
+"permitir criar entradas de diário usando essa conta."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index a3a1d88f5e2..851e8f09017 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/i18n/es.po
@@ -6,40 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:19+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: analytic_journal_billing_rate
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: analytic_journal_billing_rate
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
 msgstr "Diario analítico"
 
-#. module: analytic_journal_billing_rate
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
@@ -51,11 +33,6 @@ msgstr "Tasa de facturación por diario para esta cuenta analítica"
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
-#. module: analytic_journal_billing_rate
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
@@ -85,15 +62,33 @@ msgstr "Factura"
 msgid "Invoicing Rate"
 msgstr "Tasa de facturación"
 
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
 msgstr "Línea hoja de servicios"
 
-#. module: analytic_journal_billing_rate
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Tasa facturación diario analítico"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index f6921455faf..67b421e4d91 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -6,26 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:45+0000\n"
+"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"PO-Revision-Date: 2010-12-08 19:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:0
@@ -38,30 +33,12 @@ msgstr "¡Error!"
 msgid "Timesheet Line"
 msgstr "Línea de hoja de servicios"
 
-#. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr "Producto"
-
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
@@ -85,21 +62,30 @@ msgstr ""
 msgid "Relation table between users and products on a analytic account"
 msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
 
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr "Función analítica de usuario"
 
-#. module: analytic_user_function
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #, python-format
 #~ msgid ""
 #~ "There is no expense account define ' \\n                                'for "
@@ -115,3 +101,12 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "No se ha definido una cuenta de gastos \r\n"
 #~ "para este producto: \"%s\" (id:%d)"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index 45a4d2132ae..093f94dd486 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 16:09+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -29,7 +29,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Sätt till utkast"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -38,12 +38,7 @@ msgstr ""
 #: view:report.auction:0
 #: field:report.auction,seller:0
 msgid "Seller"
-msgstr ""
-
-#. module: auction
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Säljare"
 
 #. module: auction
 #: field:auction.lots,name:0
@@ -53,7 +48,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots.sms.send,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "SMS meddelande"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
@@ -86,7 +81,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Authors"
-msgstr ""
+msgstr "Författare"
 
 #. module: auction
 #: view:auction.bid:0
@@ -211,6 +206,13 @@ msgstr ""
 msgid "January"
 msgstr ""
 
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
 #. module: auction
 #: view:auction.lots:0
 msgid "Ref"
@@ -221,16 +223,6 @@ msgstr ""
 msgid "Total Price"
 msgstr ""
 
-#. module: auction
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: auction
-#: constraint:hr.attendance:0
-msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
-
 #. module: auction
 #: view:auction.lots:0
 msgid "Total Adj."
@@ -263,11 +255,6 @@ msgstr ""
 msgid "List number in depositer inventory"
 msgstr ""
 
-#. module: auction
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: auction
 #: report:auction.total.rml:0
 msgid "Items"
@@ -309,6 +296,12 @@ msgstr ""
 msgid "Object Image"
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
 #. module: auction
 #: code:addons/auction/auction.py:0
 #, python-format
@@ -340,13 +333,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: auction
-#: help:auction.lot.category,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the auction "
-"lot category without removing it."
-msgstr ""
-
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
 msgid "Map buyer username to Partners"
@@ -392,13 +378,9 @@ msgid "June"
 msgstr ""
 
 #. module: auction
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
-#. module: auction
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
+#, python-format
+msgid "No Lots belong to this Auction Date"
 msgstr ""
 
 #. module: auction
@@ -540,8 +522,8 @@ msgid "Last Auction Date"
 msgstr ""
 
 #. module: auction
-#: field:report.object.encoded,obj_num:0
-msgid "# of Encoded obj."
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
 msgstr ""
 
 #. module: auction
@@ -668,16 +650,11 @@ msgstr ""
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "UserError"
 msgstr ""
 
-#. module: auction
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
-msgstr ""
-
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
 msgid "Auction Management"
@@ -700,11 +677,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: auction
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
-msgstr ""
-
 #. module: auction
 #: help:auction.lots,state:0
 msgid ""
@@ -755,11 +727,6 @@ msgstr "Auktion"
 msgid "Object Categories"
 msgstr ""
 
-#. module: auction
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: auction
 #: field:auction.lots.sms.send,app_id:0
 msgid "API ID"
@@ -791,6 +758,11 @@ msgstr ""
 msgid "Net limit ?"
 msgstr ""
 
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr ""
+
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of commissions:"
@@ -803,8 +775,8 @@ msgid "Auction Name"
 msgstr ""
 
 #. module: auction
-#: model:account.tax,name:auction.tax_seller
-msgid "Seller Costs (12%)"
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
 msgstr ""
 
 #. module: auction
@@ -835,8 +807,9 @@ msgid "Bailiffs Listing"
 msgstr ""
 
 #. module: auction
-#: field:aie.category,child_ids:0
-msgid "unknown"
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "This record does not exist !"
 msgstr ""
 
 #. module: auction
@@ -1086,8 +1059,10 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "Active IDs not Found"
 msgstr ""
 
 #. module: auction
@@ -1241,12 +1216,6 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#. module: auction
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
-
 #. module: auction
 #: view:auction.lots.auction.move:0
 msgid "Move to Auction date"
@@ -1300,11 +1269,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: auction
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: auction
 #: view:board.board:0
 msgid "Latest objects"
@@ -1345,6 +1309,12 @@ msgstr ""
 msgid "Deposit Date"
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
 #. module: auction
 #: selection:report.auction,month:0
 msgid "July"
@@ -1366,12 +1336,6 @@ msgstr ""
 msgid "Minimum Estimation"
 msgstr ""
 
-#. module: auction
-#: selection:auction.dates,state:0
-#: selection:report.auction.adjudication,state:0
-msgid "Closed"
-msgstr "Stängd"
-
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_sms_send
 msgid "Sms send "
@@ -1405,6 +1369,12 @@ msgstr ""
 msgid "Auction Analysis"
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
@@ -1463,12 +1433,6 @@ msgstr ""
 msgid "Create invoices"
 msgstr ""
 
-#. module: auction
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id5
 msgid "VAT 5%"
@@ -1607,13 +1571,6 @@ msgstr ""
 msgid "Seller limit"
 msgstr ""
 
-#. module: auction
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
 #. module: auction
 #: field:auction.deposit,transfer:0
 msgid "Transfer"
@@ -1725,13 +1682,6 @@ msgstr ""
 msgid "Names"
 msgstr "Namn"
 
-#. module: auction
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
-#, python-format
-msgid "Active IDs not Found"
-msgstr ""
-
 #. module: auction
 #: view:auction.artists:0
 #: model:ir.ui.menu,name:auction.menu_auction_artist
@@ -1835,6 +1785,13 @@ msgstr ""
 msgid "Net revenue"
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
 #. module: auction
 #: report:auction.total.rml:0
 msgid "# of items:"
@@ -1882,9 +1839,10 @@ msgid "Gross Margin (%)"
 msgstr ""
 
 #. module: auction
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "Stängd"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1946,6 +1904,13 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
 #. module: auction
 #: model:ir.model,name:auction.model_auction_pay_buy
 msgid "Pay buy"
@@ -2028,11 +1993,6 @@ msgstr ""
 msgid "Deposit Costs"
 msgstr ""
 
-#. module: auction
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr ""
-
 #. module: auction
 #: field:auction.lot.category,name:0
 msgid "Category Name"
@@ -2118,6 +2078,8 @@ msgstr ""
 #. module: auction
 #: code:addons/auction/wizard/auction_aie_send.py:0
 #: code:addons/auction/wizard/auction_aie_send_result.py:0
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2164,11 +2126,6 @@ msgstr "Stäng"
 msgid "Object encoded"
 msgstr ""
 
-#. module: auction
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: auction
 #: view:auction.bid:0
 msgid "Search Auction Bid"
@@ -2204,6 +2161,12 @@ msgstr "Sista auktionsdag"
 msgid "Objects Description"
 msgstr ""
 
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:0
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
 #. module: auction
 #: view:auction.deposit:0
 #: field:auction.deposit,info:0
@@ -2302,6 +2265,14 @@ msgstr ""
 msgid "Auction history"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
 #~ msgid ""
 #~ "This module provides functionality to \n"
 #~ "     manage artists, articles, sellers, buyers and auction.\n"
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 62e01158070..838229c0a63 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:34+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -23,28 +23,22 @@ msgid "Audit Trail"
 msgstr "Rastro de Auditoría"
 
 #. module: audittrail
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr "Aviso: Auditoría no forma parte del pool"
 
 #. module: audittrail
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Registro"
 
 #. module: audittrail
+#: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#. module: audittrail
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
@@ -58,16 +52,24 @@ msgid "Audit Logs"
 msgstr "Auditar registros"
 
 #. module: audittrail
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: audittrail
+#: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#. module: audittrail
+#: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
 msgstr "Borrador"
@@ -77,11 +79,6 @@ msgstr "Borrador"
 msgid "Old Value"
 msgstr "Valor anterior"
 
-#. module: audittrail
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
@@ -107,9 +104,9 @@ msgid "Log From"
 msgstr "Registrar desde"
 
 #. module: audittrail
-#: field:audittrail.log.line,log_id:0
-msgid "Log"
-msgstr "Registro"
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "ID registro"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
@@ -140,17 +137,13 @@ msgstr "Usuarios"
 msgid "Log Lines"
 msgstr "Líneas de registro"
 
-#. module: audittrail
-#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree_sub
-msgid "Subscribed Rules"
-msgstr "Reglas suscritas"
-
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Rules"
 msgstr "Reglas"
 
 #. module: audittrail
+#: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
@@ -171,6 +164,11 @@ msgstr "Registrar hasta"
 msgid "New Value Text: "
 msgstr "Texto valor nuevo: "
 
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr "Buscar regla auditoría"
+
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
 msgid "Audit Rules"
@@ -187,6 +185,7 @@ msgid "Resource Name"
 msgstr "Nombre recurso"
 
 #. module: audittrail
+#: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
 msgstr "Fecha"
@@ -200,11 +199,6 @@ msgstr ""
 "Seleccione esta opción si desea realizar el seguimiento de la modificación "
 "de cualquier registro del objeto de esta regla."
 
-#. module: audittrail
-#: field:audittrail.log.line,log:0
-msgid "Log ID"
-msgstr "ID registro"
-
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
@@ -225,11 +219,6 @@ msgstr "Texto valor anterior: "
 msgid "Log Workflow"
 msgstr "Registros flujo de trabajo"
 
-#. module: audittrail
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
@@ -268,6 +257,7 @@ msgstr ""
 "cualquier registro del objeto de esta regla."
 
 #. module: audittrail
+#: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
 msgstr "Usuario"
@@ -289,17 +279,6 @@ msgstr ""
 msgid "UnSubscribe"
 msgstr "Des-suscribir"
 
-#. module: audittrail
-#: code:addons/audittrail/audittrail.py:0
-#, python-format
-msgid "WARNING: audittrail is not part of the pool"
-msgstr "Aviso: Auditoría no forma parte del pool"
-
-#. module: audittrail
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
@@ -310,6 +289,11 @@ msgstr "Registros eliminaciones"
 msgid "Field Description"
 msgstr "Descripción campo"
 
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr "Buscar registro auditoría"
+
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
@@ -340,11 +324,6 @@ msgstr "Valor nuevo"
 msgid "AuditTrail Logs"
 msgstr "Registros auditoría"
 
-#. module: audittrail
-#: view:audittrail.rule:0
-msgid "Subscribe"
-msgstr "Suscribir"
-
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
@@ -406,6 +385,12 @@ msgstr ""
 "Seleccione esta opción si desea realizar el seguimiento de la creación de "
 "cualquier registro del objeto de esta regla."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Create"
 #~ msgstr "Creación"
 
@@ -415,9 +400,18 @@ msgstr ""
 #~ msgid "Audittrails"
 #~ msgstr "Auditorías"
 
+#~ msgid "Subscribe"
+#~ msgstr "Suscribir"
+
 #~ msgid "Read"
 #~ msgstr "Lectura"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Subscribed Rules"
+#~ msgstr "Reglas suscritas"
+
 #~ msgid "Log writes"
 #~ msgstr "Registrar escrituras"
 
@@ -461,3 +455,18 @@ msgstr ""
 
 #~ msgid "audittrail.log.line"
 #~ msgstr "auditoria.registro.linea"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 8a05669cd2f..ae11984c053 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 08:56+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-06 08:57+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -26,7 +25,7 @@ msgstr "Rapport de l' audit"
 #: code:addons/audittrail/audittrail.py:0
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "ATTENTION : le module audittrail ne fait pas partie de la liste"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
@@ -55,7 +54,7 @@ msgstr "Journaux d'audits"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grouper par..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -178,7 +177,7 @@ msgstr "Ancienne valeur "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nom de la ressource"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -257,7 +256,7 @@ msgstr "Utilisateur"
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "ID de l'Action"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -287,7 +286,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "Enregistrer les modifications"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index 133239b7922..0810e4e2e67 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-03 07:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 12:43+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -54,7 +54,7 @@ msgstr "Registos de Auditória"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -177,7 +177,7 @@ msgstr "Valor Antigo : "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nome do recurso"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -255,7 +255,7 @@ msgstr "Utilizador"
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "ID da Ação"
 
 #. module: audittrail
 #: view:audittrail.rule:0
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index 891b095708f..136b5cacb08 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -37,17 +37,9 @@ msgid "Partner Category"
 msgstr "Categoría empresa"
 
 #. module: base_action_rule
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: base_action_rule
-#: help:base.action.rule,act_remind_user:0
-msgid ""
-"Check this if you want the rule to send a reminder by email to the user."
-msgstr ""
-"Seleccione esta opción si desea que la regla envíe un recordatorio por "
-"correo electrónico al usuario."
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Enviar correo a observadores (CC)"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_to:0
@@ -161,11 +153,6 @@ msgstr "Recordatorios email"
 msgid "Special Keywords to Be Used in The Body"
 msgstr "Palabras especiales a usar en el mensaje"
 
-#. module: base_action_rule
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
@@ -178,11 +165,6 @@ msgstr ""
 "ID del email de las personas a quienes el correo electrónico debe ser "
 "enviado."
 
-#. module: base_action_rule
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 #: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
@@ -268,11 +250,6 @@ msgstr ""
 msgid "Delay type"
 msgstr "Tipo retraso"
 
-#. module: base_action_rule
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
 msgid ""
@@ -324,11 +301,6 @@ msgstr ""
 "Utilice una expresión Python para especificar el campo apropiado cuyo "
 "contenido se utilizará para el campo \"Desde\" de la cabecera del correo."
 
-#. module: base_action_rule
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
@@ -413,29 +385,21 @@ msgstr "ir.cron"
 msgid "%(object_description)s = Object description"
 msgstr "%(object_description)s = Descripción objeto"
 
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Error: El email no está bien formateado"
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
 msgstr "Acciones email"
 
-#. module: base_action_rule
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
 msgstr "Información email"
 
-#. module: base_action_rule
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
@@ -467,9 +431,12 @@ msgid "Mail body"
 msgstr "Mensaje correo"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_mail_to_watchers:0
-msgid "Mail to Watchers (CC)"
-msgstr "Enviar correo a observadores (CC)"
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Seleccione esta opción si desea que la regla envíe un recordatorio por "
+"correo electrónico al usuario."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -558,3 +525,27 @@ msgstr "Condiciones en estados"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Fecha disparo"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 151796d1355..cf06dfc35dd 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 16:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 22:02+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -35,14 +35,8 @@ msgid "Partner Category"
 msgstr "Catégorie de partenaire"
 
 #. module: base_action_rule
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: base_action_rule
-#: help:base.action.rule,act_remind_user:0
-msgid ""
-"Check this if you want the rule to send a reminder by email to the user."
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
 msgstr ""
 
 #. module: base_action_rule
@@ -58,7 +52,7 @@ msgstr "Objet"
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
 msgid "Mail to these Emails"
-msgstr ""
+msgstr "Envoyer un e-mail à ces adresses"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_state:0
@@ -73,7 +67,7 @@ msgstr "e-mail provenant de"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
-msgstr ""
+msgstr "Corps du message"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -148,32 +142,22 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Reminders"
-msgstr ""
+msgstr "E-mails de rappel"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr ""
-
-#. module: base_action_rule
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "Mots-clés spéciaux à utiliser dans le corps du texte"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
-msgstr "État"
+msgstr "Status"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
-
-#. module: base_action_rule
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Identité courriel de la personne à qui le message va être envoyé"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -204,7 +188,7 @@ msgstr "Heures"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_id)s = Object ID"
-msgstr ""
+msgstr "%(object_id)s = Object ID"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -214,12 +198,12 @@ msgstr "Délai après la date de déclenchement"
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "Envoyer un rappel avec pièce jointe"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Arguments non valides"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
@@ -229,7 +213,7 @@ msgstr "Attribuer la responsabilité à"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Aucun(e)"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_to:0
@@ -237,11 +221,13 @@ msgid ""
 "Use a python expression to specify the right field on which one than we will "
 "use for the 'To' field of the header"
 msgstr ""
+"Utilisez une expression Python pour définir le champ qui sera utilisé en "
+"tant que destinataire (champ \"À\" de l'entête)"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(object_user_phone)s = Responsible phone"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -255,11 +241,6 @@ msgstr ""
 msgid "Delay type"
 msgstr "Type de délai"
 
-#. module: base_action_rule
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
 msgid ""
@@ -272,7 +253,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Appel de la Méthode Objet"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_to:0
@@ -289,12 +270,12 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Nom du partenaire"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Remarque"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_email_from:0
@@ -303,20 +284,15 @@ msgid ""
 "use for the 'From' field of the header"
 msgstr ""
 
-#. module: base_action_rule
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Délai après la date de déclenchement"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Conditions"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -325,11 +301,14 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Délai après la date de déclenchement. Ce nombre peut être négatif si vous "
+"avez besoin d'un délai avant la date de déclenchement,  par exemple envoyer "
+"un rappel 15 minutes avant une réunion."
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: base_action_rule
 #: code:addons/base_action_rule/base_action_rule.py:0
@@ -340,7 +319,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
 msgid "Remind Responsible"
-msgstr ""
+msgstr "Envoyer un rappel au Responsable"
 
 #. module: base_action_rule
 #: model:ir.module.module,description:base_action_rule.module_meta_information
@@ -351,21 +330,22 @@ msgstr ""
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
 msgstr ""
+"Donne l'ordre de la séquence lors de l'affichage d'une liste de règles."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Mois"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtrer"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: base_action_rule
 #: help:base.action.rule,server_action_id:0
@@ -373,6 +353,8 @@ msgid ""
 "Describes the action name.\n"
 "eg:on which object which action to be taken on basis of which condition"
 msgstr ""
+"Décrit le nom de l'action.\n"
+"C.à d. : quelle action réaliser, sur quel objet, sur quelle condition"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_cron
@@ -382,43 +364,37 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_description)s = Object description"
-msgstr ""
+msgstr "%(object_description)s = Object description"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Erreur : email mal formé."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Actions"
-msgstr ""
-
-#. module: base_action_rule
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Actions e-mail"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
 msgstr ""
 
-#. module: base_action_rule
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Règles d'action"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Contenu de l'e-mail"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -433,22 +409,25 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Corps de l'e-mail"
 
 #. module: base_action_rule
-#: field:base.action.rule,act_mail_to_watchers:0
-msgid "Mail to Watchers (CC)"
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
+"Cochez cette case si vous voulez que cette règle envoie un rappel par e-mail "
+"à l'utilisateur"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Action Serveur à déclencher"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_user:0
 msgid "Mail to Responsible"
-msgstr ""
+msgstr "Envoyer un e-mail au responsable"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_email_cc:0
@@ -458,13 +437,13 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Fields"
-msgstr ""
+msgstr "Conditions sur les champs du Modèle"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
 #: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
 msgid "Automated Actions"
-msgstr ""
+msgstr "Actions automatisées"
 
 #. module: base_action_rule
 #: field:base.action.rule,server_action_id:0
@@ -474,7 +453,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,regex_name:0
 msgid "Regex on Resource Name"
-msgstr ""
+msgstr "Expression régulière sur le nom de la ressource"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_attach:0
@@ -491,12 +470,12 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -508,12 +487,12 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user)s = Responsible name"
-msgstr ""
+msgstr "%(object_user)s = Responsible name"
 
 #. module: base_action_rule
 #: field:base.action.rule,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -523,4 +502,4 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Date de déclenchement"
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index 17f61aa85b0..918901aacb4 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:56+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 18:17+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -149,7 +150,7 @@ msgstr "Marzo"
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
 #, python-format
 msgid "Warning !"
-msgstr "¡ Advertencia !"
+msgstr "¡Aviso!"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
new file mode 100644
index 00000000000..31981cd8d79
--- /dev/null
+++ b/addons/base_calendar/i18n/pt.po
@@ -0,0 +1,1592 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 18:11+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr "A cada hora"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Mensalmente"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Utilizador convidado"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Função"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat max that times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Março"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Atenção!"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Sexta-Feira"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Dia inteiro"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr "Gratuito"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Qua"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Ter"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Anualmente"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dias"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Exclude range"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Select data for Custom Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr "Tip de convite"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr "Especifique o tipo de convite"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Anos"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every x"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr "Prazo limite"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Atenção!"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+#, python-format
+msgid "Event"
+msgstr "Evento"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr "Participantes"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr "Tipo de convite"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr "Dia do mês"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr "Executar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir até"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Seconds"
+msgstr "Segundos"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr "Exige resposta?"
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Julho"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Aceite"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "Qui"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+msgid "Set Exclude range"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Diariamente"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr "Terceiro"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr "Contactos do terceiro"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr "Primeiro"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr "Privacidade"
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Fuso horário"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr "Disponibilidade"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr "Dono"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr "Data de início"
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr "Os meus eventos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr "Recusar"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Sex"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr "Membro"
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr "Anexo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr "Lembrete"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr "Eventos"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Segunda-Feira"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr "Terceiro"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "Junho"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Data do evento"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Seg"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Sem repetição"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr "Incerto"
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Língua"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Quarta-Feira"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Convite"
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr "Ação"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr "Selecione quem quer convidar"
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr "Referência do evento"
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr "Procurar eventos"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não se pode ter dois utilizadores com os mesmos dados de acesso"
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr "Para rever"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr "Frequência"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr "Utilizadores"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "of"
+msgstr "de"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Terça-Feira"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Procedimento"
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr "Utilizador responsável"
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "Quinta-Feira"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Custom"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "Maio"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr "Depois"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Convidar pessoas"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr "Objetos"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr "A cada minuto"
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr "Data de fim"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr "Dia de semana"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr "Por dia"
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr "Áudio"
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr "Convidar"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr "ID do recurso"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr "Enviado por"
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr "Aceitar"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr "Livre/Ocupado"
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr "Duração"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that can be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index 4e153186db4..37a8498fe3c 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-03 16:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 17:39+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -147,27 +147,27 @@ msgstr "Mars"
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Fredag"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Hela dagen"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,select1:0
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Alternativ"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -196,7 +196,7 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegerad till"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,we:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "Visa tiden som"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
@@ -220,21 +220,21 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Årligen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Senaste"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
@@ -244,7 +244,7 @@ msgstr ""
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Rum"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -252,7 +252,7 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr ""
+msgstr "Dagar"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -266,7 +266,7 @@ msgstr ""
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -295,7 +295,7 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuter"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -327,7 +327,7 @@ msgstr ""
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera efter"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
@@ -348,7 +348,7 @@ msgstr ""
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Years"
-msgstr ""
+msgstr "År"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -377,12 +377,12 @@ msgstr ""
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
@@ -395,7 +395,7 @@ msgstr ""
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organisatör"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -416,7 +416,7 @@ msgstr ""
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bekräftad"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
@@ -428,12 +428,12 @@ msgstr ""
 #: field:calendar.event,attendee_ids:0
 #: field:calendar.todo,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagare"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr ""
+msgstr "Bekräfta"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
@@ -475,19 +475,19 @@ msgstr ""
 #: field:calendar.event.edit.all,location:0
 #: field:calendar.todo,location:0
 msgid "Location"
-msgstr ""
+msgstr "Plats"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
 msgid "Send mail?"
-msgstr ""
+msgstr "Skicka mail?"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,email:0
 #: selection:calendar.alarm,action:0
 #: field:calendar.attendee,email:0
 msgid "Email"
-msgstr ""
+msgstr "Epost"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -508,7 +508,7 @@ msgstr ""
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Konfidentiellt"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,end_date:0
@@ -521,12 +521,12 @@ msgstr ""
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunder"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
-msgstr ""
+msgstr "Synlighet"
 
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
@@ -550,13 +550,13 @@ msgstr ""
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Accepterad"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,th:0
@@ -584,7 +584,7 @@ msgstr ""
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Skapad"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
@@ -595,14 +595,14 @@ msgstr ""
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Dagligen"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -614,7 +614,7 @@ msgstr ""
 #: field:calendar.event,class:0
 #: field:calendar.todo,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Markera som"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -632,7 +632,7 @@ msgstr ""
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegera"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
@@ -650,7 +650,7 @@ msgstr ""
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -673,21 +673,21 @@ msgstr "Tidszon"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Rubrik"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 4c2c26b79d4..50783f91c71 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/i18n/de.po
@@ -6,248 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 16:13+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 12:34+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: 2010-12-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Partner Titel"
-
-#. module: base_contact
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "# Kontakte"
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr "Beschäftigt seit"
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr "Aufgabenbereich des Ansprechpartners beim Partner"
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr "Status der Adresse"
-
-#. module: base_contact
-#: help:res.partner.job,name:0
-msgid ""
-"You may                     enter Address first,Partner will be linked "
-"automatically if any."
-msgstr ""
-"Sie könnten zuerst die Adresse eingeben, der Partner wird dann "
-"automatischverlinkt, wenn er existiert."
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr "Arbeit Fax"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Personen Team"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Definiere Funktion und Adresse"
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr "Beschäftigt Bis"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr "Migration"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Beschäftigt an derselben Adresse"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partner"
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr "Aufgabenbereich"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Basis Kontakt"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Beschäftigt Bis"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Arbeitsbereiche Kontakte"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Categories"
-msgstr "Kategorien"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance                 of this job title in the list of job "
-"title of the linked partner"
-msgstr ""
-"Priorität                         der Aufgabenbereiche in der Aufgabenliste  "
-"dieses Kontakts beim Partner"
-
-#. module: base_contact
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Durchwahl"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "interne/externe Durchwahl"
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr "Arbeit Tel. Nr."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Arbeitsbereiche und Adressen"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr "Arbeit E-Mail"
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Partner Seq."
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Zu kontaktieren"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Nachname"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr "Kommunikation"
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr "Bild"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Vergangenheit"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner Adressen"
-
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
 msgstr "Kontakt Seq."
 
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr "Wenn Sie diese Option wählen, werden alle Adressen migriert."
+
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
@@ -264,159 +43,9 @@ msgid "Contacts"
 msgstr "Kontakte"
 
 #. module: base_contact
-#: view:base.contact.installer:0
-msgid ""
-"Due to changes in Address and Partner's relation, some of the details from "
-"address are needed to be migrated into contact information."
-msgstr ""
-"Aufgrund technischer Änderungen bei der Datenbeziehung von Adresse zu "
-"Partner, müssen einige Details der Adressdaten zu den Kontaktdaten migriert "
-"werden."
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Arbeitgeber- und Privatadresse"
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr "Adresse beim Partner"
-
-#. module: base_contact
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
-#. module: base_contact
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Zusätzliche Telefon Nr."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Website"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
-"Ansonsten sind diese Detaildaten nicht über die Kontakte und Adressen "
-"ersichtlich."
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Fortschritt Konfiguration"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to true,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Wenn Feld de-aktiviert wird,                        ist es möglich die "
-"Partner Kontaktdaten zu verbergen, ohne die Daten zu entfernen."
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Kontakt Aufgabenbereich"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Tel"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr "Möchten Sie die Adressdaten zum Kontakt übernehmen?"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Haupt Funktion"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "definiere Partner und Anschrift"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Seq."
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Sprache"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra Information"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Kooperationspartner"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt bei Partner"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Allgemein"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr "Photo"
-
-#. module: base_contact
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Geburtsdatum"
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr "Wenn Sie diese Option wählen, werden alle Adressen migriert."
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Partner Seq."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -438,16 +67,74 @@ msgstr "Kontakt Partner Aufgabenbereich"
 msgid "Other"
 msgstr "Anderes"
 
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr "Status der Adresse"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Kontaktdaten"
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Funktion bei Partner"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Anschreiben Partner"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "# Kontakte"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Zusätzliche Telefon Nr."
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Seq."
+
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Aufgabenbereich"
 
 #. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr "Haupt-Beruf"
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+"Ansonsten sind diese Detaildaten nicht über die Kontakte und Adressen "
+"ersichtlich."
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Fortschritt Konfiguration"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Tel"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -455,9 +142,61 @@ msgid "Defines contacts and functions."
 msgstr "Definieren Kontakte und Funktionen"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Kontaktdaten"
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Partner Titel"
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr "Funktion des Ansprechpartners beim Partner"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Funktion des Kontakts"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Basis Kontakt"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+"Aufgrund technischer Änderungen bei der Datenbeziehung von Adresse zu "
+"Partner, müssen einige Details der Adressdaten zu den Kontaktdaten migriert "
+"werden."
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr "Möchten Sie die Adressdaten zum Kontakt übernehmen?"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Partner"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Beschäftigt Bis"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -465,35 +204,166 @@ msgstr "Kontaktdaten"
 msgid "Address"
 msgstr "Adresse"
 
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Funktion des Ansprechpartners"
+
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
 msgstr "Nationalität"
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr "Offene Stellen"
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Postal. Anschrift"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Haupt-Beruf"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Kategorien"
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+"Sie könnten zuerst die Adresse eingeben, der Partner wird dann automatisch "
+"verlinkt, wenn er existiert."
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Haupt Funktion"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "definiere Partner und Anschrift"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Durchwahl"
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Mobil"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Personen Team"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Bemerkungen"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "interne/externe Durchwahl"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+"Priorität bei der Anzeige der Funktion der Kontaktperson beim  Partner"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Extra Information"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Aufgabenbereiche und Adressen"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr "Arbeit Tel. Nr."
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Sprache"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Kooperationspartner"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "Arbeit E-Mail"
+
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
 msgstr "Arbeitgeber"
 
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Zu kontaktieren"
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr "Beschäftigt Bis"
+
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
 msgstr "Adresse Migration"
 
 #. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr "Postal. Anschrift"
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Kontakt bei Partner"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr "Offene Stellen"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Partner Adressen"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -502,15 +372,99 @@ msgid "Addresses"
 msgstr "Partner Anschriften"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Anschreiben Partner"
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Arbeitgeber- und Privatadresse"
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Nachname"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Kommunikation"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr "Beschäftigt seit"
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr "Adresse beim Partner"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "Allgemein"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Vergangenheit"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr "Migration"
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "Arbeit Fax"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Photo"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Beschäftigt an derselben Adresse"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
 msgstr "gültig von"
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definiere Funktion und Adresse"
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Website"
+
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
@@ -518,9 +472,20 @@ msgid ""
 "addresses of the linked contact"
 msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
 
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Geburtsdatum"
+
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid ""
 #~ "Order of importance of this job title in the list of job title of the linked "
 #~ "partner"
@@ -531,6 +496,9 @@ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
 #~ "contact"
 #~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Base Contact Process"
 #~ msgstr "Basis Kontakt Prozess"
 
@@ -539,3 +507,25 @@ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
 
 #~ msgid "General Information"
 #~ msgstr "Grundinformation"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid ""
+#~ "If the active field is set to true,                 it will allow you to "
+#~ "hide the partner contact without removing it."
+#~ msgstr ""
+#~ "Wenn Feld de-aktiviert wird,                        ist es möglich die "
+#~ "Partner Kontaktdaten zu verbergen, ohne die Daten zu entfernen."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index b16fb3df025..f189848bd97 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/i18n/es.po
@@ -6,248 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:25+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:21+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Número de Contactos"
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr "Función de este contacto con esta empresa."
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr "Estado de la dirección."
-
-#. module: base_contact
-#: help:res.partner.job,name:0
-msgid ""
-"You may                     enter Address first,Partner will be linked "
-"automatically if any."
-msgstr ""
-"Puede introducir primero una dirección, se relacionará automáticamente con "
-"la empresa si hay una."
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr "Número del Fax del trabajo."
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Definir cargos y direcciones."
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr "Fecha final del trabajo."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr "Migrar"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Trabajos en la misma dirección de empresa."
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr "Función en empresa"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Fecha finalización"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Trabajos del contacto"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Categories"
-msgstr "Categorías"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance                 of this job title in the list of job "
-"title of the linked partner"
-msgstr ""
-"Orden de importancia de este título de trabajo en la lista de títulos de "
-"trabajo de la empresa relacionada."
-
-#. module: base_contact
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Extensión"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Número de extensión telefónica interior/exterior"
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr "Número de teléfono del trabajo."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr "Correo electrónico del trabajo."
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Sec. empresa"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Cargo a dirección"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr "Comunicación"
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Anterior"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
 msgstr "Sec. contacto"
 
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
+
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
@@ -264,157 +43,9 @@ msgid "Contacts"
 msgstr "Contactos"
 
 #. module: base_contact
-#: view:base.contact.installer:0
-msgid ""
-"Due to changes in Address and Partner's relation, some of the details from "
-"address are needed to be migrated into contact information."
-msgstr ""
-"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-"los detalles de las direcciones son necesarios migrarlos a la información de "
-"contactos."
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr "Dirección que está relacionada con la empresa."
-
-#. module: base_contact
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: base_contact
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Campo para teléfono adicional"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr "base.contacto.instalador"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to true,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo Activo está marcado, permitirá ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Funciones contacto"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Sec."
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Sec. empresa"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -436,16 +67,74 @@ msgstr "Función contacto en empresa"
 msgid "Other"
 msgstr "Otro"
 
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr "Estado de la dirección."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Contacto a cargo"
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Función en empresa"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Empresa a dirección"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Número de Contactos"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Campo para teléfono adicional"
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
+"sin eliminarlo."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Sec."
+
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Cargo"
 
 #. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr "Trabajo principal"
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Teléfono"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -453,9 +142,61 @@ msgid "Defines contacts and functions."
 msgstr "Define contactos y cargos."
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Contacto a cargo"
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr "base.contacto.instalador"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr "Función de este contacto con esta empresa."
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Funciones contacto"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Contacto base"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
+"los detalles de las direcciones son necesarios migrarlos a la información de "
+"contactos."
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Fecha finalización"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -463,35 +204,167 @@ msgstr "Contacto a cargo"
 msgid "Address"
 msgstr "Dirección"
 
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Trabajos del contacto"
+
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
 msgstr "Nacionalidad"
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr "Abrir trabajos"
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Dirección postal"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Trabajo principal"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+"Puede introducir primero una dirección, se relacionará automáticamente con "
+"la empresa si hay una."
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Función principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Definir empresas y sus direcciones."
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
 msgstr "Nombre"
 
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extensión"
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Móvil"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Gente con la que trabaja."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Número de extensión telefónica interior/exterior"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+"Orden de importancia de este título de trabajo en la lista de títulos de "
+"trabajo de la empresa relacionada."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Información extra"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Cargos y direcciones"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr "Número de teléfono del trabajo."
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Empresas en las que trabaja."
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "Correo electrónico del trabajo."
+
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
 msgstr "Empleado principal"
 
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Cargo a dirección"
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr "Fecha final del trabajo."
+
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
 msgstr "Migración direcciones"
 
 #. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr "Dirección postal"
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contacto empresa"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr "Abrir trabajos"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Direcciones de empresa"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -500,15 +373,99 @@ msgid "Addresses"
 msgstr "Direcciones"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Direcciones de trabajo y privadas."
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Apellido"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr "Fecha inicial del trabajo (fecha de unión)."
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr "Dirección que está relacionada con la empresa."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "General"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Anterior"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr "Migrar"
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "Número del Fax del trabajo."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Trabajos en la misma dirección de empresa."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
 msgstr "Fecha de inicio"
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definir cargos y direcciones."
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Sitio web"
+
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
@@ -518,9 +475,20 @@ msgstr ""
 "Orden de importancia de esta dirección en la lista de direcciones del "
 "contacto relacionado."
 
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Fecha nacimiento"
+
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid ""
 #~ "Order of importance of this job title in the list of job title of the linked "
 #~ "partner"
@@ -535,6 +503,9 @@ msgstr ""
 #~ "Orden de importancia de esta dirección en la lista de direcciones del "
 #~ "contacto relacionado"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Base Contact Process"
 #~ msgstr "Proceso contacto base"
 
@@ -543,3 +514,25 @@ msgstr ""
 
 #~ msgid "General Information"
 #~ msgstr "Información general"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "If the active field is set to true,                 it will allow you to "
+#~ "hide the partner contact without removing it."
+#~ msgstr ""
+#~ "Si el campo Activo está marcado, permitirá ocultar el contacto de la empresa "
+#~ "sin eliminarlo."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index 5d4cd3f538a..edb2525bc14 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-03 17:32+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 14:49+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -29,7 +29,7 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Chercher un contact"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index 6f0bf5abf97..91843da775d 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-05 00:54+0000\n"
-"Last-Translator: Balint (eSolve) <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pt_BR.po b/addons/base_contact/i18n/pt_BR.po
index 2322863cd53..e2c8ad25b78 100644
--- a/addons/base_contact/i18n/pt_BR.po
+++ b/addons/base_contact/i18n/pt_BR.po
@@ -6,247 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 11:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-09 03:15+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Num. de Contatos"
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr "Data de Início do Trabalho (Unindo Datas)"
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr "A função deste contato com este parceiro"
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr "Situação do Endereço"
-
-#. module: base_contact
-#: help:res.partner.job,name:0
-msgid ""
-"You may                     enter Address first,Partner will be linked "
-"automatically if any."
-msgstr ""
-"Você pode informar endereços primeiro, Os parceiros serão vinculados "
-"automaticamente se existir algum."
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr "FAX"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "As pessoas com quem trabalha."
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Definir Funções e Endereços"
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr "Último dia de Trabalho"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr "Migrar"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Trabalhos em um mesmo endereço de parceiro."
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Parceiros"
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr "Função do parceiro"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: base_contact
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contato Base"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Data de Parada"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Trabalhos do Contato"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Categories"
-msgstr "Categorias"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance                 of this job title in the list of job "
-"title of the linked partner"
-msgstr ""
-"Ordem de importância deste título de trabalho na lista de títulos de "
-"trabalho do parceiro vinculado"
-
-#. module: base_contact
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Extensão"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Numero do Ramal Interno/Externo"
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr "Nro do telefone do trabalho"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funções e Endereços"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Contato"
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr "E-Mail do trabalho"
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Seq. Parceiro"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Função de Tratar"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Sobrenome"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr "Comunicação"
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr "Imagem"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Passado"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Endereços do parceiro"
-
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
 msgstr "Seq. Contato"
 
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr "Se você selecionar isso, todos os endereços serão migrados."
+
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
@@ -263,156 +42,9 @@ msgid "Contacts"
 msgstr "Contatos"
 
 #. module: base_contact
-#: view:base.contact.installer:0
-msgid ""
-"Due to changes in Address and Partner's relation, some of the details from "
-"address are needed to be migrated into contact information."
-msgstr ""
-"Devido a alterações nos Endereços e relacionamentos de Parceiros, alguns "
-"detalhes dos endereços precisam ser migrados para as informações do contato."
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Endereços de trabalho e privado."
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr "Endereço que está vinculado ao Parceiro"
-
-#. module: base_contact
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Você não pode criar um Menu recursivo."
-
-#. module: base_contact
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Campo de Telefone adicional"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Página da Web"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
-"Caso contrário estes detalhes de endereço/contato não estarão visíveis."
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progresso da configuração"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr "base.contact.installer"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to true,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Se o campo ativo for configurado para verdadeiro será permitido ocultar o "
-"contato do parceiro sem removê-lo"
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Funções do Contato"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Telefone"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr "Você deseja migrar seus dados de endereço para os dados do contato?"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Ativo"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Função Principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir Parceiros e seus Endereços"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Seq."
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informação Extra"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas com as quais você trabalha."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contato do Parceiro"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Geral"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data de Nascimento"
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr "Se você selecionar isso, todos os endereços serão migrados."
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Seq. Parceiro"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -434,16 +66,75 @@ msgstr "Função do contato do parceiro"
 msgid "Other"
 msgstr "Outro"
 
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr "Situação do Endereço"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Função do Contato"
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Função do parceiro"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Endereço do Parceiro"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Num. de Contatos"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Campo de Telefone adicional"
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to False,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+"Se o campo ativo é definido como falso, isso permitirá que você ocultar o "
+"contato do parceiro sem removê-lo."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Seq."
+
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Função"
 
 #. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr "Trabalho Principal"
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+"Caso contrário estes detalhes de endereço/contato não estarão visíveis."
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progresso da configuração"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Telefone"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -451,9 +142,60 @@ msgid "Defines contacts and functions."
 msgstr "Definir Contatos e Funções"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Função do Contato"
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr "base.contact.installer"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr "A função deste contato com este parceiro"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Funções do Contato"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Contato Base"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+"Devido a alterações nos Endereços e relacionamentos de Parceiros, alguns "
+"detalhes dos endereços precisam ser migrados para as informações do contato."
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "E-mail"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr "Você deseja migrar seus dados de endereço para os dados do contato?"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Parceiros"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Data de Parada"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -461,35 +203,167 @@ msgstr "Função do Contato"
 msgid "Address"
 msgstr "Endereço"
 
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Trabalhos do Contato"
+
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
 msgstr "Nacionalidade"
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr "Trabalhos Abertos"
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr "Endereço Postal"
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Trabalho Principal"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+"Você pode informar endereços primeiro, Os parceiros serão vinculados "
+"automaticamente se existir algum."
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Função Principal"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Definir Parceiros e seus Endereços"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extensão"
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Celular"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "As pessoas com quem trabalha."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Numero do Ramal Interno/Externo"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+"Ordem de importância deste título de trabalho na lista de títulos de "
+"trabalho do parceiro vinculado"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Informação Extra"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Funções e Endereços"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr "Nro do telefone do trabalho"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contato"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Empresas com as quais você trabalha."
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr "E-Mail do trabalho"
+
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
 msgstr "Principal Empregador"
 
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Função de Tratar"
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr "Último dia de Trabalho"
+
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
 msgstr "Migração de Endereço"
 
 #. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr "Endereço Postal"
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contato do Parceiro"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
+msgstr "Trabalhos Abertos"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Endereços do parceiro"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -498,15 +372,99 @@ msgid "Addresses"
 msgstr "Endereços"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Endereço do Parceiro"
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Endereços de trabalho e privado."
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Sobrenome"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr "Imagem"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr "Data de Início do Trabalho (Unindo Datas)"
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr "Endereço que está vinculado ao Parceiro"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "Geral"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Passado"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr "Migrar"
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr "FAX"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr "Trabalhos em um mesmo endereço de parceiro."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
 msgstr "Data de Início"
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Definir Funções e Endereços"
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Página da Web"
+
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
@@ -516,6 +474,11 @@ msgstr ""
 "Ordem de importância deste endereço na lista de endereços vinculada ao "
 "contato"
 
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Data de Nascimento"
+
 #~ msgid "res.partner.contact"
 #~ msgstr "res.partner.contact"
 
@@ -533,6 +496,9 @@ msgstr ""
 #~ "Ordem de importância deste endereço na lista de endereços ligados aos "
 #~ "contatos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
 #~ msgid "Partner Contacts"
 #~ msgstr "Contatos do Parceiro"
 
@@ -541,3 +507,30 @@ msgstr ""
 
 #~ msgid "Base Contact Process"
 #~ msgstr "Processo de Contato Base"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Você não pode criar um Menu recursivo."
+
+#~ msgid ""
+#~ "If the active field is set to true,                 it will allow you to "
+#~ "hide the partner contact without removing it."
+#~ msgstr ""
+#~ "Se o campo ativo for configurado para verdadeiro será permitido ocultar o "
+#~ "contato do parceiro sem removê-lo"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_module_doc_rst/base_module_doc_rst_view.xml b/addons/base_module_doc_rst/base_module_doc_rst_view.xml
index 9a40bc86df3..2fa4e220d0d 100644
--- a/addons/base_module_doc_rst/base_module_doc_rst_view.xml
+++ b/addons/base_module_doc_rst/base_module_doc_rst_view.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-		<!--
-			Relationshio Graph on Module object
-		-->
+        <!--
+            Relationship Graph on Module object
+        -->
 
-		<record model="ir.ui.view" id="view_module_module_graph">
-			<field name="name">ir.module.module.form.graph</field>
-			<field name="model">ir.module.module</field>
-			<field name="inherit_id" ref="base.module_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Relationship Graph">
-						<separator colspan="4" string="You can save this image as .png file"/>
-						<field name="file_graph" widget="image" nolabel="1" />
-					</page>
-				</notebook>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_module_module_graph">
+            <field name="name">ir.module.module.form.graph</field>
+            <field name="model">ir.module.module</field>
+            <field name="inherit_id" ref="base.module_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Relationship Graph">
+                        <separator colspan="4" string="You can save this image as .png file"/>
+                        <field name="file_graph" widget="image" nolabel="1" />
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml b/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml
index 2912dfed040..338791e29f1 100644
--- a/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml
+++ b/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml
@@ -2,21 +2,19 @@
 <openerp>
     <data>
         <wizard
-		  	id="wiz_tech_guide_rst"
-			model="ir.module.module"
-			name="tech.guide.rst"
-			string="Create RST Technical Guide"
-  			keyword="client_action_multi"
- 			multi="True"
-				/>
+            id="wiz_tech_guide_rst"
+            model="ir.module.module"
+            name="tech.guide.rst"
+            string="Create RST Technical Guide"
+            keyword="client_action_multi"
+            multi="True" />
 
         <wizard
-			id="wiz_gen_graph"
-			model="ir.module.module"
-			name="create.relation.graph"
-			string="Generate Relationship Graph"
-  			multi="False"
-				/>
+            id="wiz_gen_graph"
+            model="ir.module.module"
+            name="create.relation.graph"
+            string="Generate Relationship Graph"
+            multi="False" />
 
     </data>
 </openerp>
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index e52ff38ad2a..9a05c99aba5 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 18:18+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 12:35+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -148,17 +148,6 @@ msgstr "Terp Test"
 msgid "Object Test"
 msgstr "Objekt Test"
 
-#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid ""
-"Error in Read method:\" + str(e))]\n"
-"                else:\n"
-"                    if size < 5:\n"
-"                        speed_list = [obj, size, code_base_complexity, "
-"code_half_complexity, code_size_complexity, _(\"Warning! Not enough demo data"
-msgstr ""
-
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
@@ -201,11 +190,6 @@ msgstr "Abfrage Komplexität"
 msgid "Result of pep8_test in %"
 msgstr "Ergebnis pep8_test in %"
 
-#. module: base_module_quality
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
@@ -237,11 +221,6 @@ msgstr ""
 "Einige Tests sind bedeutsamer als andere, somit haben diese eine höhere "
 "Gewichtung in Gesamtergebnis"
 
-#. module: base_module_quality
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
@@ -271,11 +250,6 @@ msgstr "Keine Daten"
 msgid "module.quality.detail"
 msgstr "module.quality.detail"
 
-#. module: base_module_quality
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
@@ -469,6 +443,10 @@ msgid ""
 "of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
+"Dieser Test nutzt Pylint und  prüft ob ein Modul die Programmierrichlinien "
+"von Python einhält. Siehe  http://www.logilab.org/project/name/pylint für "
+"weitere Informationen.\n"
+" "
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
@@ -492,24 +470,11 @@ msgstr "Erledigt"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: base_module_quality
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
 msgstr "Endergebnis (%)"
 
-#. module: base_module_quality
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
@@ -545,6 +510,10 @@ msgid ""
 "'unit_test/test.py' is needed in module.\n"
 "\n"
 msgstr ""
+"\n"
+"Dieser Test überprüft die Unit Test (pyUnit) Fälle des Moduls. Beachten Sie "
+"das 'unit_test/test.py' im Modul vorhanden sein muss.\n"
+"\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
@@ -554,12 +523,21 @@ msgid ""
 "This test checks if the module classes are raising exception when calling "
 "basic methods or not.\n"
 msgstr ""
+"\n"
+"Dieser Test prüft ob die Modulklassen einen Fehler auslösen wenn sie eine "
+"Basismethode aufrufen.\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
 msgstr "Details"
 
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr ""
+
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
@@ -620,6 +598,21 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"Der Zweck dieses Moduls ist es, die Qualität anderer Module zu überprüfen.\n"
+"\n"
+"Es stellt einen Assistenten auf Basis der Module in OpenERP zur Verfügung, "
+"der es Ihnen erlaubt, verschiedene Kriterien zu prüfen. Zum Beispiel: "
+"Einhaltung der Programmierrichtlinien von OpenERP, Effizienz des Codes...\n"
+"\n"
+"Das Modul stellt außerdem ein Framework zum erstellen eigener Tests zur "
+"Verfügung. Für weitere Informationen lesen Sie bitte  base_module_quality\\"
+"README.txt.\n"
+"\n"
+"\n"
+"Achtung: Dieses Modul kann nicht als ZIP-Datei funktionieren. Es muss vor "
+"der Benutzung entpackt werden, da es sonst Abstürzen kann.\n"
+"    "
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
@@ -704,6 +697,15 @@ msgstr "Qualität"
 msgid "Feed back About terp file of Module"
 msgstr "Feedback über terp Datei des Moduls"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Base module quality"
 #~ msgstr "Basis Qualtitätsmodul"
 
@@ -787,3 +789,9 @@ msgstr "Feedback über terp Datei des Moduls"
 #~ "Vergleichen Sie http://www.logilab.org/project/name/pylint für weitere "
 #~ "Details.\n"
 #~ " \"\""
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index 9deed8c0331..790d66ba08d 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 03:39+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 16:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -23,71 +23,64 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Suggestion"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid ""
-"<html>O(1) means that the number of SQL requests to read the object does not "
-"depand on the number of objects we are reading. This feature is mostly "
-"wished.\n"
-"</html>"
-msgstr ""
+msgstr "Sugerencia"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
 #, python-format
 msgid "Programming Error"
-msgstr ""
+msgstr "Error de programación"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Test del método"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality - To check the quality of other modules"
-msgstr ""
+msgstr "Módulo base de calidad - Para comprobar la calidad de otros módulos"
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid ""
-"\"\"\n"
-"This test checks if the module satisfy tiny structure\n"
-"\"\""
+"\n"
+"Test checks for fields, views, security rules, dependancy level\n"
 msgstr ""
-
-#. module: base_module_quality
-#: selection:module.quality.detail,state:0
-msgid "Skipped"
-msgstr "Ignorado"
+"\n"
+"Test para comprobar los campos, vistas, reglas de seguridad y niveles de "
+"dependencia\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
-msgid ""
-"\"\"\n"
-"This test checks the speed of the module. Note that at least 5 demo data is "
-"needed in order to run it.\n"
-"\n"
-"\"\""
-msgstr ""
+msgid "O(n) or worst"
+msgstr "O(n) o peor"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr "Omitido"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:0
+#, python-format
+msgid "Module has no objects"
+msgstr "El módulo no tiene objetos"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "Test de velocidad"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
-msgstr ""
+msgstr "El módulo no contiene el archivo __openerp__.py"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
@@ -98,13 +91,13 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "Nombre del objeto"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -113,28 +106,20 @@ msgid ""
 "This test checks if the module satisfies the current coding standard used by "
 "OpenERP."
 msgstr ""
+"Este test comprueba si el módulo satisface los estándares de código actuales "
+"de OpenERP."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "¡No hay informe a guardar!"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Result of dependancy in %"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
-#, python-format
-msgid ""
-"\"\"\n"
-"This test checks if the module classes are raising exception when calling "
-"basic methods or not.\n"
-"\"\""
-msgstr ""
+msgstr "Resultado de la dependencia en %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -142,40 +127,26 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
-"La prueba solo se podrá completarse si se instala el módulo or si se puede "
-"procesar con el módulo desinstalado."
+"El test sólo se podrá completar si el módulo está instalado o si se puede "
+"probar con el módulo desinstalado."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "Resultado (/10)"
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
-msgid ""
-"\"\"\n"
-"Test checks for fields, views, security rules, dependancy level\n"
-"\"\""
-msgstr ""
+msgid "Terp Test"
+msgstr "Test terp"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Object Test"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid ""
-"Error in Read method:\" + str(e))]\n"
-"                else:\n"
-"                    if size < 5:\n"
-"                        speed_list = [obj, size, code_base_complexity, "
-"code_half_complexity, code_size_complexity, _(\"Warning! Not enough demo data"
-msgstr ""
+msgstr "Test objeto"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -193,59 +164,42 @@ msgstr "Comprobar la calidad"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "No es eficiente"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
-#, python-format
-msgid "Feedback about structure of module"
-msgstr ""
+msgstr "Aviso"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Unit Test"
-msgstr ""
+msgstr "Test unitario"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Reading Complexity"
-msgstr ""
+msgstr "Complejidad de lectura"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Result of pep8_test in %"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
-#, python-format
-msgid ""
-"\"\"\n"
-"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
-"'unit_test/test.py' is needed in module.\n"
-"\n"
-"\"\""
-msgstr ""
+msgstr "Resultado del test pep8 en %"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr "Estado / provincia"
+msgstr "Estado"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
-msgstr ""
+msgstr "El módulo no tiene un archivo 'unit_test/test.py'"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
@@ -256,7 +210,7 @@ msgstr "Ponderación"
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "Resultado de seguridad en %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -267,54 +221,34 @@ msgstr ""
 "Algunas pruebas son más críticas que otras, por lo que tienen un mayor peso "
 "en el cálculo de la valoración final."
 
-#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
-#, python-format
-msgid ""
-"\"\"\n"
-"PEP-8 Test , copyright of py files check, method can not call from loops\n"
-"\"\""
-msgstr ""
-
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "No hay datos suficientes"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Result (/1)"
-msgstr ""
+msgstr "Resultado (/1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "N (Number of Records)"
-msgstr ""
+msgstr "N (Número de registros)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "Sin datos"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr "detalles.calidad.módulo"
-
-#. module: base_module_quality
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML no válido para ver arquitectura"
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid "O(n) or worst"
-msgstr ""
+msgstr "módulo.calidad.detalle"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
@@ -328,30 +262,27 @@ msgid ""
 "This test checks where object has workflow or not on it if there is a state "
 "field and several buttons on it and also checks validity of workflow xml file"
 msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
-#, python-format
-msgid "Module has no objects"
-msgstr ""
+"Este test comprueba si el objeto tiene un flujo de trabajo, si hay un campo "
+"de estado y varios botones y también comprueba la validez del archivo xml "
+"del flujo de trabajo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "Resultado en %"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr "Asientos normales"
+msgstr "Entradas estándar"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "No se ha encontrado un archivo Python"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
@@ -374,19 +305,33 @@ msgstr "Detalle"
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr "Notas"
+msgstr "Nota"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#, python-format
+msgid ""
+"<html>O(1) means that the number of SQL requests to read the object does not "
+"depand on the number of objects we are reading. This feature is mostly "
+"wished.\n"
+"</html>"
+msgstr ""
+"<html>O(1) significa que el número de peticiones SQL para leer el objeto no "
+"depende el número de objetos que estamos leyendo. Esta característica sería "
+"la más deseable.\n"
+"</html>"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "__openerp__.py file"
-msgstr ""
+msgstr "archivo __openerp__.py"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -394,70 +339,84 @@ msgstr ""
 msgid "Tests"
 msgstr "Pruebas"
 
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#, python-format
+msgid ""
+"\n"
+"This test checks the speed of the module. Note that at least 5 demo data is "
+"needed in order to run it.\n"
+"\n"
+msgstr ""
+"\n"
+"Este test comprueba la velocidad del módulo. Observe que se necesitan por lo "
+"menos 5 datos de demostración para poder ejecutarlo.\n"
+"\n"
+
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "Unable to parse the result. Check the details."
+msgstr "No se pudo parsear el resultado. Compruebe los detalles."
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module satisfy tiny structure\n"
 msgstr ""
+"\n"
+"Este test comprueba si el módulo satisface la estructura de tiny.\n"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Nombre del módulo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Error! Module is not properly loaded/installed"
-msgstr ""
+msgstr "¡Error! El módulo no está cargado/instalado correctamente"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Error in Read method"
-msgstr ""
+msgstr "Error en el método de lectura"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Score is below than minimal score(%s%%)"
-msgstr ""
+msgstr "La puntuación está por debajo de la mínima(%s%%)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "N/2"
-msgstr ""
+msgstr "N/2"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "Excepción"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
 #, python-format
 msgid "Test Is Not Implemented"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
-#, python-format
-msgid ""
-"\"\"This test uses Pylint and checks if the module satisfies the coding "
-"standard of Python. See http://www.logilab.org/project/name/pylint for "
-"further info.\n"
-" \"\""
-msgstr ""
+msgstr "El test no está implementado"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
@@ -465,10 +424,10 @@ msgid "Report Save"
 msgstr "Guardar informe"
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
-msgid "Feed back About Workflow of Module"
-msgstr ""
+msgid "Feedback about structure of module"
+msgstr "Información sobre la estructura del módulo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
@@ -477,12 +436,33 @@ msgid ""
 "Given module has no objects.Speed test can work only when new objects are "
 "created in the module along with demo data"
 msgstr ""
+"El módulo no tiene objetos. El test de velocidad sólo puede ejecutarse "
+"cuando se crean nuevos objetos en el módulo junto con datos de demostración"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#, python-format
+msgid ""
+"This test uses Pylint and checks if the module satisfies the coding standard "
+"of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
+" "
+msgstr ""
+"Este test utiliza Pylint y comprueba si el módulo satisface los estándares "
+"de código Python. Consulte http://www.logilab.org/project/name/pylint para "
+"más información.\n"
+" "
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#, python-format
+msgid "Feed back About Workflow of Module"
+msgstr "Información sobre el flujo de trabajo del módulo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "No Workflow define"
-msgstr ""
+msgstr "No se ha definido flujo de trabajo"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
@@ -499,26 +479,20 @@ msgstr "Cancelar"
 msgid "Final Score (%)"
 msgstr "Puntuación final (%)"
 
-#. module: base_module_quality
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nombre del objeto debe comenzar por x_ y no contener ningún símbolo "
-"especial"
-
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid ""
 "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
 msgstr ""
+"Error. ¿Está pylint correctamente instalado? "
+"(http://pypi.python.org/pypi/pylint)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Efficient"
-msgstr ""
+msgstr "Eficiente"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
@@ -529,58 +503,127 @@ msgstr "Módulo evaluado"
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Workflow Test"
+msgstr "Test del flujo de trabajo"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#, python-format
+msgid ""
+"\n"
+"This test checks the Unit Test(PyUnit) Cases of the module. Note that "
+"'unit_test/test.py' is needed in module.\n"
+"\n"
 msgstr ""
+"\n"
+"Este test comprueba los casos del test unitario (PyUnit) del módulo. Observe "
+"que es necesario definir 'unit_test/test.py' en el módulo.\n"
+"\n"
+
+#. module: base_module_quality
+#: code:addons/base_module_quality/method_test/method_test.py:0
+#, python-format
+msgid ""
+"\n"
+"This test checks if the module classes are raising exception when calling "
+"basic methods or not.\n"
+msgstr ""
+"\n"
+"Este test comprueba si las clases del módulo están lanzando una excepción o "
+"no cuando se llaman a los métodos básicos.\n"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
 msgstr "Detalles"
 
+#. module: base_module_quality
+#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#, python-format
+msgid "Warning! Not enough demo data"
+msgstr "¡Aviso! No hay suficientes datos de demostración."
+
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "Pylint Test"
-msgstr ""
+msgstr "Test Pylint"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "PEP-8 Test"
-msgstr ""
+msgstr "Test PEP-8"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "Nombre del campo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "¡Aviso! El objeto no tiene datos de demostración"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "Nombre de etiqueta"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
 msgstr "Nombre del archivo"
 
+#. module: base_module_quality
+#: model:ir.module.module,description:base_module_quality.module_meta_information
+msgid ""
+"\n"
+"The aim of this module is to check the quality of other modules.\n"
+"\n"
+"It defines a wizard on the list of modules in OpenERP, which allows you to\n"
+"evaluate them on different criteria such as: the respect of OpenERP coding\n"
+"standards, the speed efficiency...\n"
+"\n"
+"This module also provides generic framework to define your own quality "
+"test.\n"
+"For further info, coders may take a look into base_module_quality\\"
+"README.txt\n"
+"\n"
+"WARNING: This module can not work as a ZIP file, you must unzip it before\n"
+"using it, otherwise it may crash.\n"
+"    "
+msgstr ""
+"\n"
+"El propósito de este módulo es el de comprobar la calidad de otros módulos.\n"
+"\n"
+"Proporciona un asistente en la lista de módulos de OpenERP, el cual le "
+"permitirá\n"
+"evaluarlos bajo diferentes criterios como: la conformidad a los estándares\n"
+"de código OpenERP, la eficiencia en velocidad, ...\n"
+"\n"
+"El módulo también proporciona una plataforma genérica para definir sus "
+"propios tests de calidad.\n"
+"Para más información, los programadores pueden mirar base_module_quality\\"
+"README.txt\n"
+"\n"
+"AVISO: Este módulo no puede trabajar como archivo ZIP, debe descomprimirlo "
+"antes\n"
+"de utilizarlo, en caso contrario puede fallar.\n"
+"    "
+
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr "comprobar.calidad.módulo"
+msgstr "módulo.calidad.comprobación"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
@@ -592,7 +635,7 @@ msgstr "Nombre"
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Result of views in %"
-msgstr ""
+msgstr "Resultado de las vistas en %"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
@@ -608,19 +651,19 @@ msgstr "Guardar el informe como archivo con formato .html"
 #: code:addons/base_module_quality/base_module_quality.py:0
 #, python-format
 msgid "The module has to be installed before running this test."
-msgstr ""
+msgstr "El módulo tiene que estar instalado antes de ejecutar este test."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "O(1)"
-msgstr ""
+msgstr "O(1)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Result of fields in %"
-msgstr ""
+msgstr "Resultado de los campos en %"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
@@ -635,25 +678,19 @@ msgstr "Resumen"
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Nombre del archivo"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "Número de línea"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "Structure Test"
-msgstr ""
-
-#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
-#, python-format
-msgid "Terp Test"
-msgstr ""
+msgstr "Test de estructura"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
@@ -664,7 +701,16 @@ msgstr "Calidad"
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Feed back About terp file of Module"
-msgstr ""
+msgstr "Información sobre el archivo terp del módulo"
 
 #~ msgid "Base module quality"
 #~ msgstr "Calidad del módulo base"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML no válido para ver arquitectura"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nombre del objeto debe comenzar por x_ y no contener ningún símbolo "
+#~ "especial"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index f2d46739dc5..6b2229933aa 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:32+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 18:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -81,11 +81,6 @@ msgstr "Datos demostración"
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#. module: base_module_record
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,version:0
 msgid "Version"
@@ -99,30 +94,12 @@ msgstr "Versión"
 msgid "Objects Recording"
 msgstr "Grabación de objetos"
 
-#. module: base_module_record
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,init,check_date:0
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
 msgstr "Grabar desde fecha"
 
-#. module: base_module_record
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: base_module_record
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_data,end:0
 #: wizard_view:base_module_record.module_record_objects,end:0
@@ -287,13 +264,19 @@ msgstr "Cancelar"
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
 msgid "Close"
-msgstr "Cerrado"
+msgstr "Cerrar"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_data,init,filter_cond:0
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr "Creado(s) & Modificado(s)"
+msgstr "Creado(s) y Modificado(s)"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Recording Information"
 #~ msgstr "Información de la grabación"
@@ -360,3 +343,12 @@ msgstr "Creado(s) & Modificado(s)"
 
 #~ msgid "Stop Recording"
 #~ msgstr "Detener la grabación"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/base_report_creator/i18n/es.po b/addons/base_report_creator/i18n/es.po
index fb18281a201..871dfba1115 100644
--- a/addons/base_report_creator/i18n/es.po
+++ b/addons/base_report_creator/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:35+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:24+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -132,11 +132,6 @@ msgstr "Informes personalizados"
 msgid "No Related Models!!"
 msgstr "¡No existen modelos relacionados!"
 
-#. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: base_report_creator
 #: view:report.menu.create:0
 msgid "Menu Information"
@@ -147,6 +142,11 @@ msgstr "Información del menú"
 msgid "Sum"
 msgstr "Suma"
 
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr "Debe indicar color, fecha inicial y retraso de la vista calendario."
+
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
@@ -162,11 +162,6 @@ msgstr "Lista de campos"
 msgid "Report Type"
 msgstr "Tipo de informe"
 
-#. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
@@ -205,9 +200,9 @@ msgid "Starting Date"
 msgstr "Fecha inicial"
 
 #. module: base_report_creator
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtros en campos"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -248,9 +243,10 @@ msgid "AND"
 msgstr "Y"
 
 #. module: base_report_creator
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr ""
+"No puede mostrar un campo que no esté almacenado en la base de datos."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -337,14 +333,6 @@ msgstr "Método agrupación"
 msgid "Condition"
 msgstr "Condición"
 
-#. module: base_report_creator
-#: help:base_report_creator.report,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the report "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -394,17 +382,9 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_report_creator
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#. module: base_report_creator
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr "Puede aplicar la función de agregado para el campo no calculado."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -432,9 +412,12 @@ msgid "Unique Colors"
 msgstr "Colores únicos"
 
 #. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "Filters on Fields"
-msgstr "Filtros en campos"
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -551,12 +534,21 @@ msgstr ""
 #~ msgid "Valid"
 #~ msgstr "Válido"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
 #~ msgid "Status"
 #~ msgstr "Estado"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Uniq Colors"
 #~ msgstr "Colores únicos"
 
@@ -577,3 +569,21 @@ msgstr ""
 #~ "\n"
 #~ "Después de instalar el módulo se añade un menú para definir informes\n"
 #~ "personalizados dentro del menú \"Tableros\".\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the report "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar el informe sin eliminarlo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index cd35b860e44..5384fb68f80 100644
--- a/addons/base_report_creator/i18n/fr.po
+++ b/addons/base_report_creator/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:50+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-06 14:47+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -246,6 +245,8 @@ msgstr "AND"
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
 msgstr ""
+"Vous ne pouvez pas faire apparaître les champs qui ne sont pas stockés en "
+"base de données."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -385,6 +386,7 @@ msgstr "Annuler"
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
+"Vous pouvez appliquer une fonction d'aggregat sur un champ non calculé."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -417,6 +419,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Si le champ 'actif' est égal à False, il vous permetta de faire disparaitre "
+"le rapport sans le supprimer."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index a34bd092154..f54a33e82ce 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 10:35+0000\n"
+"PO-Revision-Date: 2010-12-05 07:38+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index e01f865b61d..b40790b1fef 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 10:32+0000\n"
+"PO-Revision-Date: 2010-12-05 07:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 54241199f9d..80ea0f05da7 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -6,32 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 12:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 12:31+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
 msgid "base.report.sxw"
-msgstr ""
-
-#. module: base_report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: base_report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "base.report.sxw"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -39,29 +27,19 @@ msgid "Report designer interface module"
 msgstr "Report designer interface module"
 
 #. module: base_report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Upload the modified report"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "The .SXW report"
 msgstr "The .SXW report"
 
-#. module: base_report_designer
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fel! Ni kan inte skapa rekursiva menyer"
-
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
-msgstr ""
+msgstr "base_report_designer.installer"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
@@ -71,7 +49,7 @@ msgstr "Beskrivning"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Stäng"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
@@ -81,18 +59,13 @@ msgstr "RML rapporten"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
 msgstr "titel"
 
-#. module: base_report_designer
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Namnet på gruppen måste vara unikt!"
-
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
 #: field:base.report.sxw,report_id:0
@@ -104,11 +77,6 @@ msgstr "Report"
 msgid "base.report.rml.save"
 msgstr "base.report.rml.save"
 
-#. module: base_report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
 msgid "Report Designer"
@@ -117,7 +85,7 @@ msgstr "Report Designer"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "Filnamn"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -125,15 +93,10 @@ msgstr ""
 msgid "Get a report"
 msgstr "Get a report"
 
-#. module: base_report_designer
-#: view:base.report.file.sxw:0
-msgid "Upload the modified report"
-msgstr "Upload the modified report"
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
-msgstr ""
+msgstr "OpenERP rapportdesigner"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -166,12 +129,12 @@ msgstr "Your .SXW file"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Installations- och konfigureringssteg"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurationsförlopp"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -185,12 +148,12 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Hoppa över"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
@@ -200,22 +163,17 @@ msgstr ""
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
 msgid "base.report.file.sxw"
-msgstr ""
+msgstr "base.report.file.sxw"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
 msgstr ""
 
-#. module: base_report_designer
-#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr ""
-
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "OpenERP rapportdesigner installation"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -225,9 +183,9 @@ msgid "Cancel"
 msgstr "Cancel"
 
 #. module: base_report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -288,3 +246,17 @@ msgstr "Select your report"
 
 #~ msgid "Report designer introduction"
 #~ msgstr "Report designer introduction"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Namnet på gruppen måste vara unikt!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fel! Ni kan inte skapa rekursiva menyer"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index b76ee0f14b7..996f922613b 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 10:32+0000\n"
+"PO-Revision-Date: 2010-12-05 07:57+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index f9b18d5e666..9cef85b740a 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-27 14:25+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:46+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -21,18 +21,6 @@ msgstr ""
 msgid "City"
 msgstr "Ort"
 
-#. module: base_setup
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: base_setup
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
@@ -48,11 +36,6 @@ msgstr "Företagsnamn"
 msgid "E-mail"
 msgstr "E-post"
 
-#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
@@ -95,7 +78,7 @@ msgstr "Försäljningsställen"
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Associationer"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -103,12 +86,14 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Hjälper dig att hantera dina bokföringsbehov. Om du inte jobbar med "
+"redovisning rekommenderar vi dig att enbart installera faktureringsmodulen "
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:0
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Följande användere har nu blivit installerade \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -160,11 +145,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Du kan börja konfigurera systemet eller koppla dig direkt till databasen som "
+"en administratör."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Avancerad rapportering"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -174,7 +161,7 @@ msgstr "Telefon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -186,11 +173,6 @@ msgstr "titel"
 msgid "Knowledge Management"
 msgstr ""
 
-#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Namnet på modulen måste vara unikt!"
-
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
 msgid ""
@@ -216,7 +198,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Hoppa över konfigureringsguide"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -232,11 +214,6 @@ msgid ""
 "version of the accounting module for managers who are not accountants."
 msgstr ""
 
-#. module: base_setup
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
@@ -263,12 +240,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Gata 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -283,7 +260,7 @@ msgstr "Ställ in"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Bokföring och finans"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -293,7 +270,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -310,7 +287,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Företagskonfiguration"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -320,7 +297,7 @@ msgstr "Logga"
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Inköpshantering"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -335,17 +312,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projekthantering"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Installerade användare"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Ny databas"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
@@ -385,24 +362,24 @@ msgstr "Rapporthuvud"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Information om din nya databas"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Matindustri"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Tillverkning"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -423,7 +400,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Företagets hemsida"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -438,17 +415,17 @@ msgstr "Gata"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Exempel: http://openerp.com"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Installera applikationer"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -480,12 +457,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
-
-#. module: base_setup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "base.setup.config"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -559,3 +531,17 @@ msgstr ""
 
 #~ msgid "Previous"
 #~ msgstr "Föregårende"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Namnet på modulen måste vara unikt!"
diff --git a/addons/base_synchro/i18n/es.po b/addons/base_synchro/i18n/es.po
index 1f523235d07..e3de9070431 100644
--- a/addons/base_synchro/i18n/es.po
+++ b/addons/base_synchro/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:59+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:24+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
@@ -201,7 +202,7 @@ msgstr "Ids afectados"
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_63
 msgid "History"
-msgstr ""
+msgstr "Historial"
 
 #. module: base_synchro
 #: model:ir.ui.menu,name:base_synchro.next_id_62
@@ -259,7 +260,7 @@ msgstr "Sincronización finalizada!"
 #. module: base_synchro
 #: model:ir.model,name:base_synchro.model_base_synchro
 msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
 
 #. module: base_synchro
 #: field:base.synchro.obj.line,local_id:0
diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
index 291e2c4385e..c0c140f3791 100644
--- a/addons/base_synchro/wizard/base_synchro_view.xml
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <form string="Transfer Data To Server">
                 <field name="server_url" colspan="4"/>
-                <field name="user_id" default="uid"/>
+                <field name="user_id"/>
                 <newline/>
                 <separator string="" colspan="4"/>
                 <button special="cancel" string="_Close" icon="gtk-cancel"/>
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 3923b287e06..4ff153497b1 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -1028,7 +1028,7 @@ class res_partner(osv.osv):
         if len(vat) not in(9, 10):
             return False
 
-        if int(vat[0:2]) == 0 and len(vat) == 10:
+        if int(vat[0:2]) in (0, 10, 20) and len(vat) == 10:
             return True
 
         if len(vat) == 10:
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 7e4f3be41cd..a55f7e638e3 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -6,22 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-23 09:39+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:25+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: base_vat
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
 #, python-format
@@ -32,33 +27,15 @@ msgstr ""
 "El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
 "esto %s"
 
-#. module: base_vat
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: base_vat
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "Base VAT - To check VAT number validity"
 msgstr "Base CIF/NIF - Para comprobar la validez de los CIF/NIF"
 
 #. module: base_vat
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: base_vat
-#: field:res.partner,vat_subjected:0
-msgid "VAT Legal Statement"
-msgstr "Sujeto a IVA"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
@@ -81,9 +58,12 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_vat
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "Sujeto a IVA"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
 
 #~ msgid ""
 #~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
@@ -93,3 +73,18 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "VAT"
 #~ msgstr "IVA"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 1d5b6224ab1..539f6b548a2 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 11:48+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -33,7 +33,7 @@ msgstr "Base VAT - Para verificar a estrutura do NIF"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro! Não pode criar membros associados recursivamente."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index e7a21cd73ff..fc3adeacb1b 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 10:28+0000\n"
+"PO-Revision-Date: 2010-12-05 07:36+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index b547abcdafe..419eaa31e82 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-29 07:48+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:29+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -28,9 +28,11 @@ msgid "Menu Create"
 msgstr "Crear menú"
 
 #. module: board
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de nota"
 
 #. module: board
 #: view:board.note:0
@@ -54,11 +56,6 @@ msgstr "Últimas conexiones"
 msgid "User Error!"
 msgstr "¡Error de usuario!"
 
-#. module: board
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
@@ -84,11 +81,6 @@ msgstr "Agrupar por..."
 msgid "Board"
 msgstr "Tablero"
 
-#. module: board
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
@@ -101,14 +93,6 @@ msgstr "Actividad global semanal"
 msgid "Title"
 msgstr "Título"
 
-#. module: board
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
@@ -125,11 +109,6 @@ msgstr "Mes"
 msgid "Open Dashboard"
 msgstr "Abrir tablero"
 
-#. module: board
-#: model:ir.model,name:board.model_board_note_type
-msgid "NOte Type"
-msgstr "Tipo nota"
-
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
@@ -137,15 +116,10 @@ msgstr "Tipo nota"
 msgid "Monthly Activity per Document"
 msgstr "Actividad mensual por documento"
 
-#. module: board
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Análisis de registros"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -156,12 +130,12 @@ msgstr "Definición tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: board
 #: view:board.board:0
@@ -172,7 +146,7 @@ msgstr "Conexiones de usuario"
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -188,7 +162,7 @@ msgstr "Información del menú"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: board
 #: field:board.note,type:0
@@ -203,7 +177,7 @@ msgstr "Vistas de acciones"
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Informe registro"
 
 #. module: board
 #: view:board.note:0
@@ -214,18 +188,18 @@ msgstr "Fecha"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: board
 #: view:board.menu.create:0
@@ -235,12 +209,12 @@ msgstr "Crear menú para tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -255,7 +229,7 @@ msgstr "Menú padre"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: board
 #: view:board.note:0
@@ -265,7 +239,7 @@ msgstr "Notas"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -276,15 +250,10 @@ msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de líneas de "
 "tablero."
 
-#. module: board
-#: selection:res.log.report,month:0
-msgid "September"
-msgstr ""
-
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: board
 #: view:board.board:0
@@ -303,7 +272,7 @@ msgstr "Módulo base para todos los tableros."
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -313,7 +282,7 @@ msgstr "Posición"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -326,11 +295,6 @@ msgstr "Nombre menú"
 msgid "Latest Activities"
 msgstr "Últimas actividades"
 
-#. module: board
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
@@ -354,7 +318,7 @@ msgstr "Ancho"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -362,15 +326,14 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: board
-#: view:board.note:0
-#: field:board.note.type,name:0
-msgid "Note Type"
-msgstr "Tipo de nota"
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Setiembre"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: board
 #: view:board.board:0
@@ -391,18 +354,18 @@ msgstr "Crear menú del tablero"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objeto"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: board
 #: view:board.menu.create:0
@@ -420,17 +383,18 @@ msgstr "Vista tablero"
 msgid "Please Insert Dashboard View(s) !"
 msgstr "¡Por favor inserte vista(s) de tablero!"
 
-#. module: board
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: board
 #: view:board.note:0
 #: field:board.note,name:0
 msgid "Subject"
 msgstr "Asunto"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "board.board"
 #~ msgstr "board.board"
 
@@ -440,6 +404,9 @@ msgstr "Asunto"
 #~ msgid "Configuration"
 #~ msgstr "Configuración"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "board.note.type"
 #~ msgstr "board.nota.tipo"
 
@@ -448,3 +415,12 @@ msgstr "Asunto"
 
 #~ msgid "board.board.line"
 #~ msgstr "board.board.line"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "NOte Type"
+#~ msgstr "Tipo nota"
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index c880b76d7ef..8724db38029 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.po
@@ -6,25 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 13:50+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-07 21:11+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
 msgstr ""
 
 #. module: board
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da aclção."
+#: view:board.note:0
+#: field:board.note.type,name:0
+#: model:ir.model,name:board.model_board_note_type
+msgid "Note Type"
+msgstr "Tipo de Nota"
 
 #. module: board
 #: view:board.note:0
@@ -37,6 +44,11 @@ msgstr "Autor"
 msgid "Dashboard main module"
 msgstr "Módulo Principal do Painel"
 
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr ""
+
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:0
 #, python-format
@@ -59,8 +71,9 @@ msgstr "Nota"
 
 #. module: board
 #: view:board.note:0
+#: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -68,8 +81,10 @@ msgid "Board"
 msgstr ""
 
 #. module: board
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
 msgstr ""
 
 #. module: board
@@ -78,40 +93,75 @@ msgid "Title"
 msgstr "Título"
 
 #. module: board
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: board
-#: model:ir.model,name:board.model_board_note_type
-msgid "NOte Type"
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Abrir Painel"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
 msgstr ""
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr "Definição do painel"
+msgstr "Definição do Painel"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr ""
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Data de criação"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr "Publicar nota"
+msgstr "Publicar uma nota"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr "Informação do menu"
+msgstr "Informação do Menu"
 
 #. module: board
-#: view:board.board:0
-#: model:ir.actions.act_window,name:board.action_user_connection_tree
-#: view:res.users:0
-msgid "Latest Connections"
-msgstr ""
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Junho"
 
 #. module: board
 #: field:board.note,type:0
@@ -121,7 +171,12 @@ msgstr "Tipo de nota"
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr "Vista de acções"
+msgstr "Vista de Acções"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr ""
 
 #. module: board
 #: view:board.note:0
@@ -130,20 +185,35 @@ msgid "Date"
 msgstr "Data"
 
 #. module: board
-#: view:board.note:0
-#: field:board.note.type,name:0
-msgid "Note Type"
-msgstr "Tipo de Nota"
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dia"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr "Criar menu para o painel"
+msgstr "Criar Menu para o painel"
 
 #. module: board
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Outubro"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -153,13 +223,23 @@ msgstr ""
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Menu pai"
+msgstr "Menu Ascendente"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Janeiro"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
 msgstr "Notas"
 
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "Novembro"
+
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
@@ -168,10 +248,9 @@ msgid ""
 msgstr ""
 
 #. module: board
-#: code:addons/board/wizard/board_menu_create.py:0
-#, python-format
-msgid "Please Insert Dashboard View(s) !"
-msgstr "Por favor insira a(s) vista(s) do painel !"
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "Abril"
 
 #. module: board
 #: view:board.board:0
@@ -187,26 +266,31 @@ msgstr "Painel"
 msgid "Base module for all dashboards."
 msgstr "Módulo base para todos os painéis."
 
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Ação"
+
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
 msgstr "Posição"
 
 #. module: board
-#: model:ir.actions.act_window,name:board.dashboard_open
-msgid "Open Dashboard"
-msgstr "Abrir painel"
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modelo"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
 msgid "Menu Name"
-msgstr "Nome do menu"
+msgstr "Nome do Menu"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Atividades mais recentes"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -216,7 +300,7 @@ msgstr "Esquerda"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr "Vista de quadro"
+msgstr "Vista de Quadro"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -228,16 +312,31 @@ msgstr "Direita"
 msgid "Width"
 msgstr "Largura"
 
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Mês   "
+
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
 #. module: board
 #: view:board.board:0
 #: view:board.menu.create:0
 msgid "Create Menu"
-msgstr "Criar menu"
+msgstr "Criar Menu"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -247,7 +346,23 @@ msgstr "Altura"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr "Criar menu de quadro"
+msgstr "Criar Menu de Quadro"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "Ano"
 
 #. module: board
 #: view:board.menu.create:0
@@ -257,7 +372,13 @@ msgstr "Cancelar"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "Vista de painel"
+msgstr "Painel de Vista"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:0
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "Por favor Insira a(s) Vista(s) do Painel !"
 
 #. module: board
 #: view:board.note:0
@@ -268,9 +389,6 @@ msgstr "Assunto"
 #~ msgid "Configuration"
 #~ msgstr "Configuração"
 
-#~ msgid "Dashboards"
-#~ msgstr "Painel"
-
 #~ msgid "board.board.line"
 #~ msgstr "board.board.line"
 
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index 9ab08f6c387..0e8775679b8 100644
--- a/addons/caldav/i18n/es.po
+++ b/addons/caldav/i18n/es.po
@@ -8,24 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 23:00+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:30+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Value Mapping"
-msgstr ""
+msgstr "Relaciones entre valores"
 
 #. module: caldav
 #: field:basic.calendar.alias,name:0
 msgid "Filename"
-msgstr "Nombre de archivo"
+msgstr "Nombre del fichero"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_export
@@ -40,7 +41,7 @@ msgstr "Indicar ruta del calendario remoto"
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
 msgid "Import .ics File"
-msgstr "Importar archivo .ics"
+msgstr "Importar fichero .ics"
 
 #. module: caldav
 #: view:calendar.event.export:0
@@ -56,14 +57,14 @@ msgstr "Asistente"
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
 msgid "Can not map a field more than once"
-msgstr ""
+msgstr "No se puede relacionar un campo más de una vez"
 
 #. module: caldav
 #: selection:basic.calendar,type:0
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "TODO"
-msgstr ""
+msgstr "PENDIENTE"
 
 #. module: caldav
 #: field:basic.calendar.lines,object_id:0
@@ -79,75 +80,75 @@ msgstr "Expresión como constante"
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
+msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
 
 #. module: caldav
 #: field:calendar.event.export,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nombre del fichero"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Exportar ICS"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Usar el campo"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "No se puede crear la línea \"%s\" más de una vez"
 
 #. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,line_ids:0
 #: model:ir.model,name:caldav.model_basic_calendar_lines
 msgid "Calendar Lines"
-msgstr ""
+msgstr "Líneas de calendario"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_subscribe
 msgid "Event subscribe"
-msgstr ""
+msgstr "Suscribir evento"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importar ICS"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_event
 msgid "basic.calendar.event"
-msgstr ""
+msgstr "base.calendario.evento"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -155,17 +156,17 @@ msgstr ""
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Event"
-msgstr ""
+msgstr "Evento"
 
 #. module: caldav
 #: field:document.directory,calendar_collection:0
 msgid "Calendar Collection"
-msgstr ""
+msgstr "Colección del calendario"
 
 #. module: caldav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "¡Error! No puede crear directorios recursivos."
 
 #. module: caldav
 #: field:basic.calendar,type:0
@@ -173,58 +174,58 @@ msgstr ""
 #: field:basic.calendar.fields,type_id:0
 #: field:basic.calendar.lines,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: caldav
 #: field:basic.calendar,description:0
 msgid "description"
-msgstr ""
+msgstr "descripción"
 
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Guardar en formato .ics"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
 msgid "Calendar attributes"
-msgstr ""
+msgstr "Atributos del calendario"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Attributes Mapping"
-msgstr ""
+msgstr "Relaciones entre atributos"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Directorio"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Indicar ruta del calendario remoto"
 
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Dominio"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Propietario"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -232,60 +233,60 @@ msgstr ""
 #: field:basic.calendar.lines,calendar_id:0
 #: model:ir.ui.menu,name:caldav.menu_calendar
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid ""
 "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
+msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
+msgstr "Formato de ics incorrecto, el fichero no se puede importar"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
 msgid "OpenObject Field"
-msgstr ""
+msgstr "Campo de OpenObject"
 
 #. module: caldav
 #: field:basic.calendar.alias,res_id:0
 msgid "Res. ID"
-msgstr ""
+msgstr "ID recurso"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "Mensaje..."
 
 #. module: caldav
 #: view:basic.calendar:0
 #: field:basic.calendar,has_webcal:0
 msgid "WebCal"
-msgstr ""
+msgstr "WebCal"
 
 #. module: caldav
 #: view:document.directory:0
 #: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
 #: model:ir.ui.menu,name:caldav.menu_calendar_collection
 msgid "Calendar Collections"
-msgstr ""
+msgstr "Colecciones de calendario"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
-msgstr ""
+msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "¡El directorio no puede ser su propio padre!"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -293,69 +294,69 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "Calendarios"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
 msgid "Collection"
-msgstr ""
+msgstr "Colección"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "¡El nombre de directorio debe ser único!"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "¡Introduza una URL correcta!"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_timezone
 msgid "basic.calendar.timezone"
-msgstr ""
+msgstr "base.calendario.timezone"
 
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Expresión"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
 msgid "basic.calendar.attendee"
-msgstr ""
+msgstr "base.calendario.asistencia"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alias
 msgid "basic.calendar.alias"
-msgstr ""
+msgstr "base.calendario.alias"
 
 #. module: caldav
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Seleccionar fichero ICS"
 
 #. module: caldav
 #: field:basic.calendar.lines,mapping_ids:0
 msgid "Fields Mapping"
-msgstr ""
+msgstr "Relaciones entre campos"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar
 msgid "basic.calendar"
-msgstr ""
+msgstr "base.calendario"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "Otra información"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Suscribir"
 
 #. module: caldav
 #: help:basic.calendar,has_webcal:0
@@ -363,149 +364,154 @@ msgid ""
 "Also export a <name>.ics entry next to the calendar folder, with WebCal "
 "content."
 msgstr ""
+"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
+"con el contenido WebCal."
 
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Función"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
 msgid "The calendar/line this mapping applies to"
-msgstr ""
+msgstr "El calendario/línea a la que esta relación se refiere."
 
 #. module: caldav
 #: field:basic.calendar.fields,mapping:0
 msgid "Mapping"
-msgstr ""
+msgstr "Relaciones"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importar"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Modifided Date"
-msgstr ""
+msgstr "Fecha de modificación"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_calendar_event_import
 msgid "Event Import"
-msgstr ""
+msgstr "Importar evento"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Intervalo en horas"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Subscribe to Remote Calendar"
-msgstr ""
+msgstr "Suscribir a calendario remoto"
 
 #. module: caldav
 #: help:basic.calendar,calendar_color:0
 msgid "For supporting clients, the color of the calendar entries"
 msgstr ""
+"Para clientes que lo soporten, el color de las entradas del calendario"
 
 #. module: caldav
 #: field:basic.calendar,name:0
 #: field:basic.calendar.attributes,name:0
 #: field:basic.calendar.fields,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
 msgid "basic.calendar.alarm"
-msgstr ""
+msgstr "base.calendario.alarma"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Attendee must have an Email Id"
-msgstr ""
+msgstr "Los asistentes deben tener un identificador de correo electrónico"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
 msgid "Export .ics File"
-msgstr ""
+msgstr "Exportar fichero .ics"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "¡Error de importación vobject!"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "MY"
-msgstr ""
+msgstr "MI"
 
 #. module: caldav
 #: field:calendar.event.export,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Guardar fichero ICS"
 
 #. module: caldav
 #: field:basic.calendar,calendar_order:0
 msgid "Order"
-msgstr ""
+msgstr "Orden"
 
 #. module: caldav
 #: model:ir.module.module,shortdesc:caldav.module_meta_information
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Compartir calendario usando CalDAV"
 
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "Color"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "Por hacer"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
 msgid "Calendar fields"
-msgstr ""
+msgstr "Campos del calendario"
 
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importar mensaje"
 
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
 msgid "Subscribe"
-msgstr ""
+msgstr "Suscribir"
 
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "El directorio debe tener un padre o un almacenamiento."
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_todo
 msgid "basic.calendar.todo"
-msgstr ""
+msgstr "base.calendario.todo"
 
 #. module: caldav
 #: help:basic.calendar,calendar_order:0
 msgid "For supporting clients, the order of this folder among the calendars"
 msgstr ""
+"Para clientes que lo soporten, el orden de esta carpeta entre los "
+"calendarios."
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dff880c7fce..cda3c4fcc1f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -289,7 +289,7 @@
             <search string="Search Leads">
                 <filter icon="terp-check"
                     string="Current"
-                    default="1" name="current" help="Draft and Open Leads"
+                    name="current" help="Draft and Open Leads"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-camera_test"
                     string="Open"
@@ -315,7 +315,7 @@
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
-                <field name="section_id" default="context.get('section_id', False)" widget="selection"
+                <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+" groups="base.group_extended"
                         context="{'invisible_section': False}"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a13c3675fa1..5ca69c22790 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -290,7 +290,6 @@
                                 help="Unassigned Opportunities" />
                         </field>
                         <field name="section_id"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}"
                             widget="selection">
                             <filter icon="terp-personal+" groups="base.group_extended"
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 9dbf41c03fd..ed28a3dd997 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 11:51+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:29+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "Leads"
+msgstr "Verkaufskontakte"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr "Lead"
+msgstr "Verkaufskontakt"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -54,11 +54,6 @@ msgstr "Phase des Falls"
 msgid "Visibility"
 msgstr "Anzeige"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -96,7 +91,7 @@ msgstr " "
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Zeit f. Beendigung"
+msgstr "Dauer für Beendigung"
 
 #. module: crm
 #: view:crm.lead:0
@@ -137,7 +132,7 @@ msgstr "Der Verkaufskontakt '%s' wurde zu einer Verkauschance gewandelt."
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr "Der Lead '%s' wurde beendet."
+msgstr "Der Verkaufskontakt '%s' wurde beendet."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -150,7 +145,6 @@ msgid "Resource's Calendar"
 msgstr "Ressourcen Kalender"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -293,18 +287,13 @@ msgstr "Kriterien"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr "Ausgeschlossene Antworten:"
+msgstr "Ausgeschlossene Antworten"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
 msgstr "Vertriebssektionen"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -315,7 +304,7 @@ msgstr "Zusammenfassen"
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr "Analye Leads"
+msgstr "Statistik Verkaufskontakte"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -325,8 +314,8 @@ msgid ""
 "partner."
 msgstr ""
 "Wenn Sie Zusammenfassen mit existierender Verkaufschance auswählen, werden "
-"die historischen Informationen zum zugrundeliegenden Lead zusammengefasst "
-"mit der existierenden Verkaufschance des ausgewählten Partners."
+"die historischen Informationen zum vorhandenen Verkaufskontakt  mit der "
+"existierenden Verkaufschance des ausgewählten Partners zusammengefasst."
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -407,7 +396,7 @@ msgstr "Suchausdruck in Fallhistorie"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr "Der Lead '%s' wurde eröffnet."
+msgstr "Der Verkaufskontakt '%s' wurde eröffnet."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -434,7 +423,7 @@ msgstr "Fördermittel & Spenden"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Leads & Verkaufschancen"
+msgstr "Verkaufskontakte & Verkaufschancen"
 
 #. module: crm
 #: view:crm.send.mail:0
@@ -513,12 +502,12 @@ msgstr "Vertraulichkeit"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "Analyse Verkaufschancen"
+msgstr "Statistik Verkaufschancen"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "Veranstaltungsort"
+msgstr "Terminort"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -559,11 +548,6 @@ msgstr "Erstelle Verkaufschance"
 msgid "August"
 msgstr "August"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Aktiviere Verkauf / Einkauf Regel"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -642,7 +626,7 @@ msgstr "Bezeichnung"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "Kundenzufriedenheit Berechnung"
+msgstr "Berechnung der Kundenzufriedenheit"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
@@ -676,9 +660,14 @@ msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
 msgstr ""
-"Die Bewertung der Kundenzufriedenheit wird geg. durch eine Neuberechnung "
-"gemindert, insbesondere wenn es innerhalb eines festzulegenden Intervalls "
-"keinen Kundenkontakt gab."
+"Die Bewertung der Kundenzufriedenheit wird gegebenfalls durch eine "
+"Neuberechnung gemindert, insbesondere wenn es innerhalb eines festzulegenden "
+"Intervalls keinen Kundenkontakt gab."
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -688,7 +677,7 @@ msgstr "Kunden Profilerstellung"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "# Anrufe"
+msgstr "# Kundenanrufe"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -702,7 +691,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication history"
-msgstr "Historie Kommunikation"
+msgstr "Kommunikations Historie"
 
 #. module: crm
 #: help:crm.phonecall,canal_id:0
@@ -712,7 +701,7 @@ msgid ""
 "indicate                         the canall which is this opportunity source."
 msgstr ""
 "Der Kanal repräsentiert die unterschiedlichen Wege der Kommunikation mit "
-"Kunden. Für jede Verkaufschance können Sie hinterlegen welcher Kanal diesen "
+"Kunden. Für jede Verkaufschance können Sie hinterlegen, welcher Kanal diesen "
 "Vorgang ermöglicht hat."
 
 #. module: crm
@@ -758,7 +747,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Partner Segmentierung Positionen"
+msgstr "Partner Segmentierungspositionen"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -828,13 +817,13 @@ msgstr "Wahrscheinlichk. (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr "Generierung Leads"
+msgstr "Generierung Verkaufskontakte"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr "Pinnwand"
+msgstr "Pinnwand Statistiken"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -845,7 +834,6 @@ msgstr "Pinnwand"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -903,7 +891,7 @@ msgstr "Setze Team auf"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr "Veranstaltungsart"
+msgstr "Terminart"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -961,31 +949,31 @@ msgid ""
 "    * Jobs Tracking (graph)\n"
 msgstr ""
 "Die generische OpenERP Customer Relationshsip Management (CRM) Anwendung\n"
-"ermöglicht einem Team intelligent und effizient Leads, Verkaufschancen, "
-"Termine, Telefonanrufe etc. zu managen.\n"
+"ermöglicht einem Team intelligent und effizient Verkaufskontakte, "
+"Verkaufschancen, Termine, Telefonanrufe etc. zu managen.\n"
 "Es steuert Kernprozesse in Vertrieb und Kundendienst, wie z.B. die "
 "Kommunikation mit Kunden und Interessenten,\n"
 " Identifikation neuer Chancen, die Priorisierung von Aktivitäten, Zuweisung "
 "von Verantwortlichkeiten,\n"
 " Erledigung und Benachrichtigungen an Kunden und Lieferanten (SRM).\n"
 "OpenERP sichert eine vollständige Rückverfolgung vomErstkontakt über das "
-"Angbot bis hin zum Verkauf und gegebenenfalls Aktivitäten des Kundendiensts "
+"Angebot bis hin zum Verkauf und gegebenenfalls Aktivitäten des Kundendiensts "
 "nach dem Verkauf. \n"
 "\n"
 "Hierbei erfolgen zahlreiche Aktionen automatisiert, z.B. Statusberichte, "
 "Erinnerung an gemeinsame Termine,\n"
-" Überwachung von Fristen.\n"
+"Überwachung von Fristen.\n"
 "Es reicht sogar ein EMail Kommunikationskanal, der in OpenERP zu jeder EMail "
 "einen Vorgang erzeugt und diesen direkt den richtigen Mitarbeitern zuweist\n"
 "oder einfach Emails zu existierenden Vorgängen und damit auch zur "
 "Vorgangshistorie zuweist.\n"
 "Ausserdem ermöglichen die Pinnwände übersichtliche grafische Auswertungen "
 "zu:\n"
-"  * Meine Leads (Arbeitsliste)\n"
-"  * Leads nach Vertriebsstufe (Grafik)\n"
+"  * Meine Kundenkontakte (Arbeitsliste)\n"
+"  * Kundenkontakte nach Vertriebsstufe (Grafik)\n"
 "  * Meine Termine (Terminliste)\n"
 "  * Verkaufschancen nach Stufe (Grafik)\n"
-"  * Meine Vertriebsfälle (Arbeitsliste)\n"
+"  * Meine Vertriebsvorfälle (Arbeitsliste)\n"
 "  * Stellenausschreibungen (Grafik)\n"
 
 #. module: crm
@@ -1057,7 +1045,7 @@ msgstr "Lieferant"
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr "Antwort An EMailanschrift des Verkaufsteams für diesen Fall"
+msgstr "Antwort An EMail des Verkaufsteams für diesen Fall"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1095,7 +1083,7 @@ msgstr "Tage b. Eröffnung"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr "Zeige Zeit als"
+msgstr "Verfügbarkeit"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1115,6 +1103,15 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Mobil"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"Es gibt keine weiteren 'Offen' oder 'Im Wartezustand' befindlichen "
+"Verkaufschancen für den Partner '%s'."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1342,11 +1339,6 @@ msgstr "Stufe"
 msgid "History Information"
 msgstr "Historie"
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1406,7 +1398,7 @@ msgstr "Max Partner ID verarbeitet"
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr "Analyse Telefonanrufe"
+msgstr "Statistik Kundenanrufe"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1554,6 +1546,11 @@ msgstr "Verkaufschance Ergebnis"
 msgid "Search"
 msgstr "Suche"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1658,18 +1655,13 @@ msgstr "Aktiviere, wenn diese Regel eine EMail an Partner versenden wollen"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr "Anrufe Kategorien"
+msgstr "Kundenanruf Kategorien"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
 msgstr "Personen Einladen"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Verkaufschancen nach Kategorien"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1768,11 +1760,6 @@ msgstr "Der"
 msgid "Wizard"
 msgstr "Assistent"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1903,7 +1890,7 @@ msgstr "Der Fall '%s' wurde eröffnet."
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "Bezeichnung"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1925,7 +1912,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "Telefonanrufe"
+msgstr "Kundenanrufe"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -1976,7 +1963,7 @@ msgstr "Wert"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "Verkaufschancen nach Kategorien"
+msgstr "Verkaufschancen nach Vertriebskategorien"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2000,7 +1987,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr "Telefonate zu Verkaufschance"
+msgstr "Anrufe zu Verkaufschance"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -2015,16 +2002,12 @@ msgstr "Minuten"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr "Wähle Stufen f. d. Team"
+msgstr "Wähle Vertriebsstufen für das Vertriebsteam"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
-"Es gibt keine weiteren 'Offen' oder 'Im Wartezustand' befindlichen "
-"Verkaufschancen für den Partner '%s'."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2106,14 +2089,14 @@ msgid "Priority"
 msgstr "Priorität"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Aktiviere Verkauf / Einkauf Regel"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Lead zu Verkaufschance Partner"
+msgstr "Verkaufskontakt zu Verkaufschance Partner"
 
 #. module: crm
 #: field:crm.meeting,location:0
@@ -2170,7 +2153,7 @@ msgstr "Caldav URL"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "Erw. Umsatz"
+msgstr "Erwarteter Umsatz"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2181,7 +2164,9 @@ msgstr "Google Adwords 2"
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Typ wird zur Unterscheidung von Leads und Verkaufschancen verwendet."
+msgstr ""
+"Typ wird zur Unterscheidung von Verkaufskontakten und Verkaufschancen "
+"verwendet."
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2202,7 +2187,7 @@ msgstr "Juli"
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr "Verkauf Teams"
+msgstr "Vertriebsteams"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
@@ -2303,6 +2288,11 @@ msgstr "Zurücksetzen"
 msgid "Note"
 msgstr "Bemerkung"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2343,6 +2333,10 @@ msgid ""
 "leads and opportunities. You can use categories to reflect your product "
 "structure or the different types of sales you do."
 msgstr ""
+"Erstellen Sie spezifische Kategorien, die Sie bei neuen Verkaufskontakten "
+"oder Verkaufschancen zum Zweck von Analysen und Auswertungen zuweisen "
+"können. Sie können diese Kategorien beliebig verwenden, zum Beispiel um Ihre "
+"Produktstruktur oder die verschiedenen Typen von Verkäufen zu beschreiben."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2373,6 +2367,12 @@ msgid ""
 "The opportunities and sales order he will see, will be automatically "
 "filtered according to his team."
 msgstr ""
+"Die Definition von Vertriebsteams ermöglicht Ihnen Ihre verschiedenen "
+"Verkäufer oder Abteilungen  in separate Teams aufzuteilen. Jedes Team "
+"arbeitet mit seinen eigenen Verkaufschancen, Verkaufaufträgen und so weiter. "
+"Jeder Benutzer kann dann sein Team als persönliche Voreinstellung wählen. "
+"Die Verkaufschancen und Verkaufaufträge werden dann anhand seiner "
+"Teamzugehörigkeit automatisch gefiltert."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2414,6 +2414,7 @@ msgstr "Aktiv"
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
 msgstr ""
+"Dies Stufe für die Verkaufschance ist von '%s' nach '%s' geändert worden."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2487,6 +2488,12 @@ msgid ""
 "contact you get with a customer. You can import a .CSV file with a list of "
 "calls to be done for your sales team."
 msgstr ""
+"Ausgehende Anrufe listen alle Kundengespräche auf, die von Ihrem "
+"Verkaufsteam getätigt wurden. Informationen zum Telefonat werden in der "
+"Formular Ansicht eingegeben. Sämtliche Informationen zu Anrufen werden "
+"ebenfalls in der Formular Ansicht der Partner angezeigt. Sie können "
+"ausserdem eine .CSV Datei mit einer Liste der Anrufe Ihres Verkaufsteams "
+"importieren."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2517,17 +2524,12 @@ msgstr "Anhänge"
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "Analyse Verkaufschancen"
+msgstr "Statistik Verkaufschancen"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2541,6 +2543,10 @@ msgid ""
 "your partners to better manage your interactions with them. The segmentation "
 "tool will assign categories to partners based on defined criteria."
 msgstr ""
+"Erstellen Sie spezifische Partner Kategorien zu denen Sie dann Ihre Partner "
+"hinzufügen um Ihre Interaktionen mit selbigen besser zu Verwalten. Das "
+"Segmentierungswerkzeug wird Partner aufgrund von definierten Kriterien zu "
+"Kategorien hinzufügen."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2555,11 +2561,6 @@ msgstr "Andere"
 msgid "Done"
 msgstr "Erledigt"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2600,14 +2601,6 @@ msgstr "Stadt"
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2681,7 +2674,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr "Veranstaltungstyp"
+msgstr "Terminart"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -2780,7 +2773,7 @@ msgstr "Wiederkehrer"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr "Lead zu Verkaufschance"
+msgstr "Verkaufskontakt zu Verkaufschance"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2971,7 +2964,7 @@ msgstr "Nachrichten"
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr "Ändere Wahrscheinlichkeit für diese und andere Stufen."
+msgstr "Ändere Wahrscheinlichkeit für diese und andere Vertriebstufen."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3040,6 +3033,9 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Mit diesem Bericht können Sie die Leistung Ihres Verkaufsteams auf Basis "
+"ihrer Telefonanrufe analysieren. Sie können ausserdem Informationen anhand "
+"verschiedener Kriterien filtern und gründlich untersuchen."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3058,7 +3054,8 @@ msgstr "Mailgateway"
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
-msgstr "Verkäufer ist Standardmässig Administartor"
+msgstr ""
+"Im Standard ist der Verkäufer beim erstellen neuer Benutzer Administrator"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3082,6 +3079,11 @@ msgstr "Anruf Ergebnis"
 msgid "Operator"
 msgstr "Operator"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Kundenanruf zu Kundenanruf"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -3106,11 +3108,6 @@ msgstr ""
 "Diese Adressen erhalten eine Kopie der EMail. Um die allgemeine CC EMail "
 "Empfängerliste zu modifizieren bearbeiten Sie bitte diese Adressliste."
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3209,8 +3206,8 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
-"Prüfe ob diese Katgorie für Partner genutzt wird.\n"
-"Wenn aktiviert, entferne die Kategorie vom Partner, die diese Bedingung "
+"Prüfe ob diese Kategorie für Partner bereits genutzt wird.\n"
+"Wenn aktiviert, entferne die Kategorie bei Partnern, die diese Bedingung "
 "nicht erfüllen."
 
 #. module: crm
@@ -3310,7 +3307,7 @@ msgstr "Qualifikation"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr "Definition Stufen"
+msgstr "Definition Vertriebsstufen"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3387,7 +3384,7 @@ msgstr "Erw. Abschlussdatum"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr "Verkaufschance zu Telefonanruf"
+msgstr "Verkaufschance zu Kundenanruf"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3421,7 +3418,7 @@ msgstr "Eröffnet"
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr "Team Mitarbeiter"
+msgstr "Teammitglieder"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3457,6 +3454,11 @@ msgstr ""
 "ausgehenden EMails. Separiere mehrere EMails einfach durch Kommata zwischen "
 "den Datensätzen"
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3500,7 +3502,7 @@ msgstr "Termine"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "Fall Kategorie"
+msgstr "Vertriebskategorie"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3516,7 +3518,7 @@ msgstr "Geplanter Umsatz nach Stufe und Benutzer"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr "Auswertung Leads"
+msgstr "Auswertung Verkaufskontakte"
 
 #. module: crm
 #: field:crm.installer,progress:0
@@ -3552,15 +3554,7 @@ msgstr "Sie sollten prüfen ob Partner bereits existiert."
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr "Dauer b. Eröff."
-
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-"Es gibt aktuell keine Stufe für erfolgreich abgeschlossene Verkaufschancen "
-"dieses Verkaufsteams."
+msgstr "Dauer bis Eröffnung"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
@@ -3582,7 +3576,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Keine EMail Adresse für Ihr Unternehmen !"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr "Verkaufschancen nach Stufe"
@@ -3627,9 +3620,9 @@ msgid "Need Consulting"
 msgstr "Benötigt Beratung"
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Telefonanruf zu Telefonanruf"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3649,6 +3642,11 @@ msgstr "Partner Kontakt"
 msgid "Recurrent ID date"
 msgstr "Wiederkehrende ID"
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3663,11 +3661,6 @@ msgstr "Zusammeng. in Verkaufschance: %s"
 msgid "Close"
 msgstr "Fertig"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -3688,7 +3681,7 @@ msgstr "Wiederholung"
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr "Telefonanruf"
+msgstr "Kundenanruf"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3749,7 +3742,7 @@ msgstr "Beschreibung"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr "Verkauf Team"
+msgstr "Vertriebsteam"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -3849,7 +3842,7 @@ msgstr "Kampagnen Bezeichnung"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr "Telefonate nach Benutzer und Sektion"
+msgstr "Kundenanrufe nach Benutzer und Sektion"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
@@ -3905,7 +3898,7 @@ msgstr "Schätzung Umsatzpotenzial"
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "Telefon Anrufe"
+msgstr "Kundenanrufe"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -4056,6 +4049,9 @@ msgstr "Newsletter"
 #~ msgid "Mail to these emails"
 #~ msgstr "EMail an diese Adressen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "My Histories"
 #~ msgstr "Meine Historie"
 
@@ -4218,6 +4214,12 @@ msgstr "Newsletter"
 #~ msgid "Tree View"
 #~ msgstr "Baumansicht"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "General Description"
 #~ msgstr "Allgemeine Beschreibung"
 
@@ -4315,6 +4317,9 @@ msgstr "Newsletter"
 #~ msgid "    7 Days    "
 #~ msgstr "    7 Tage    "
 
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Verkaufschancen nach Kategorien"
+
 #, python-format
 #~ msgid "Lead "
 #~ msgstr "Lead "
@@ -4332,7 +4337,28 @@ msgstr "Newsletter"
 #~ "Beendet/Abgebrochen \\nLeads konnten nicht zu Verkaufschance konvertiert "
 #~ "werden"
 
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#, python-format
+#~ msgid "There is no stage for won opportunities defined for this Sale Team."
+#~ msgstr ""
+#~ "Es gibt aktuell keine Stufe für erfolgreich abgeschlossene Verkaufschancen "
+#~ "dieses Verkaufsteams."
+
 #, python-format
 #~ msgid "Closed/Cancelled Phone \\nCall Could not convert into Opportunity"
 #~ msgstr ""
 #~ "Beendet/Abgebrochen Telefonanruf \\nKann nicht in Verkaufschance konvertieren"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 8da24d31cec..efd8f43b260 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-05 00:23+0000\n"
+"PO-Revision-Date: 2010-12-08 19:31+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -274,7 +274,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "Enviar nuevo correo eléctronico"
+msgstr "Enviar nuevo email"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -589,7 +589,7 @@ msgstr "FAQ de ventas"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.enviar.mail.adjunto"
 
 #. module: crm
 #: field:crm.meeting,count:0
@@ -664,7 +664,7 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr "Error: el email no está bien formateado"
+msgstr "Error: El email no está bien formateado"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1176,7 +1176,7 @@ msgstr "Fecha límite"
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr "Cancelar"
+msgstr "_Cancelar"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
@@ -1746,7 +1746,7 @@ msgstr "Alarma"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr "Mi(s) Caso(s)"
+msgstr "Mi(s) caso(s)"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
@@ -2055,7 +2055,7 @@ msgstr "Google Adwords"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.llamadateléfono"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
@@ -3201,7 +3201,7 @@ msgstr "Planificar llamada"
 #: field:crm.meeting,date_action_next:0
 #: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "Próxima acción"
+msgstr "Acción siguiente"
 
 #. module: crm
 #: view:crm.segmentation:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 96e502b76cd..b4fb0e0673d 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-02 07:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 15:45+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: 2010-12-03 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -53,11 +53,6 @@ msgstr "Estágio do Caso"
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#. module: crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação"
-
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
@@ -149,7 +144,6 @@ msgid "Resource's Calendar"
 msgstr "Calendário de Recursos"
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
@@ -292,11 +286,6 @@ msgstr "Respostas Excluídas :"
 msgid "Sections"
 msgstr "Sessões"
 
-#. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
@@ -551,11 +540,6 @@ msgstr "Criar Oportunidade"
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm
-#: field:crm.segmentation,sales_purchase_active:0
-msgid "Use The Sales Purchase Rules"
-msgstr "Usar as Regras de Compra e Venda"
-
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.lead:0
@@ -666,6 +650,11 @@ msgstr ""
 "processado. Este é o estado emocional padrão se o parceiro não tem nenhum "
 "evento."
 
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
@@ -826,7 +815,6 @@ msgstr "Painel de Estatísticas"
 #: selection:crm.lead.report,type:0
 #: field:crm.lead2opportunity,name:0
 #: field:crm.meeting,opportunity_id:0
-#: view:crm.phonecall:0
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
@@ -1065,6 +1053,14 @@ msgstr "<"
 msgid "Mobile"
 msgstr "Celular"
 
+#. module: crm
+#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#, python-format
+msgid ""
+"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+msgstr ""
+"Não há outras Oportunidades 'Abertas' ou 'Pendentes' para este parceiro '%s'."
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
@@ -1283,11 +1279,6 @@ msgstr "Estágio"
 msgid "History Information"
 msgstr "Informação Histórica"
 
-#. module: crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
@@ -1329,7 +1320,7 @@ msgstr "Estágios"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr "Receita Experada"
+msgstr "Receita Esperada"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1492,6 +1483,11 @@ msgstr "Sumário da Oportunidade"
 msgid "Search"
 msgstr "Pesquisar"
 
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
@@ -1604,11 +1600,6 @@ msgstr "Categorias de Chamada Telefônica"
 msgid "Invite People"
 msgstr "Convidar Pessoas"
 
-#. module: crm
-#: view:board.board:0
-msgid "Opportunities By Categories"
-msgstr "Oportunidades Por Categorias"
-
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
@@ -1697,11 +1688,6 @@ msgstr "O"
 msgid "Wizard"
 msgstr "Assistente"
 
-#. module: crm
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regras não são suportadas por objetos osv_memory !"
-
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
@@ -1935,12 +1921,9 @@ msgid "Select stages for this Sales Team"
 msgstr "Selecione o estágio para este Time de Vendas"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
-#, python-format
-msgid ""
-"There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
+#: view:board.board:0
+msgid "Opportunities by Stage"
 msgstr ""
-"Não há outras Oportunidades 'Abertas' ou 'Pendentes' para este parceiro '%s'."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2022,9 +2005,9 @@ msgid "Priority"
 msgstr "Prioridade"
 
 #. module: crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr "Usar as Regras de Compra e Venda"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2085,7 +2068,7 @@ msgstr "Caldav URL"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Receitas Esperadas"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -2216,6 +2199,11 @@ msgstr "Voltar para Não Confirmado"
 msgid "Note"
 msgstr "Nota"
 
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead,priority:0
 #: selection:crm.lead.report,priority:0
@@ -2430,11 +2418,6 @@ msgstr "Anexos"
 msgid "Weekly"
 msgstr "Semanal"
 
-#. module: crm
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "O Atalho para este menu já existe!"
-
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
@@ -2468,11 +2451,6 @@ msgstr "Outros"
 msgid "Done"
 msgstr "Concluído"
 
-#. module: crm
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Regra precisa ter ao menos um direito de acesso marcado."
-
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2513,14 +2491,6 @@ msgstr "Cidade"
 msgid "Busy"
 msgstr "Ocupado"
 
-#. module: crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
@@ -2988,6 +2958,11 @@ msgstr "Sumário do Telefonêma"
 msgid "Operator"
 msgstr "Operador"
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr "Chamada Telefônica para Chamada Telefônica"
+
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
@@ -3010,11 +2985,6 @@ msgid ""
 "CC list, edit the global CC field of this case"
 msgstr ""
 
-#. module: crm
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Você não pode criar um Menu recursivo."
-
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
@@ -3349,6 +3319,11 @@ msgid ""
 "addresses with a comma"
 msgstr ""
 
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
@@ -3446,12 +3421,6 @@ msgstr "Você deve verificar se este parceiro não existe no cadastro."
 msgid "Delay to Open"
 msgstr "Espera para Abrir"
 
-#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#, python-format
-msgid "There is no stage for won opportunities defined for this Sale Team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
@@ -3472,7 +3441,6 @@ msgid "No E-Mail ID Found for your Company address!"
 msgstr "Email ID Não Encontrado para o Endereço da Empresa!"
 
 #. module: crm
-#: view:board.board:0
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
 msgstr "Oportunidade por Estágio"
@@ -3517,9 +3485,9 @@ msgid "Need Consulting"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2phonecall
-msgid "Phonecall To Phonecall"
-msgstr "Chamada Telefônica para Chamada Telefônica"
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3539,6 +3507,11 @@ msgstr "Contato do Parceiro"
 msgid "Recurrent ID date"
 msgstr "ID de data recorrente"
 
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
@@ -3553,11 +3526,6 @@ msgstr "Mesclar na Oportunidade: %s"
 msgid "Close"
 msgstr "Fechar"
 
-#. module: crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
@@ -4034,6 +4002,12 @@ msgstr ""
 #~ msgid "Section Code"
 #~ msgstr "Codigo da seção"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
 #~ msgid "General Description"
 #~ msgstr "Descrição geral"
 
@@ -4157,6 +4131,9 @@ msgstr ""
 #~ "Não é possível enviar um e-mail com uma mensagem de corpo vazia, escreva a "
 #~ "mensagem"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+
 #~ msgid ""
 #~ "The generic Open ERP Customer Relationship Management\n"
 #~ "system enables a group of people to intelligently and efficiently manage\n"
@@ -4588,6 +4565,9 @@ msgstr ""
 #~ msgid "Open cases"
 #~ msgstr "Casos Abertos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
 #~ msgid "Learning And Education"
 #~ msgstr "Conhecimento e Educação"
 
@@ -5121,3 +5101,27 @@ msgstr ""
 
 #~ msgid "New Jobs"
 #~ msgstr "Novo Trabalho"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid "Opportunities By Categories"
+#~ msgstr "Oportunidades Por Categorias"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regras não são suportadas por objetos osv_memory !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Regra precisa ter ao menos um direito de acesso marcado."
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "O Atalho para este menu já existe!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Você não pode criar um Menu recursivo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index fd27e55fc2e..de6411f52b0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -97,7 +97,6 @@
 
                         <separator orientation="vertical" />
                         <field name="section_id"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
                             <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 5cb8a74b95b..bc2ce828f5e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -78,7 +78,6 @@
                             help="Phone calls which are in pending state"/>
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
                             <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index d037b2884a2..6e7cc710dc2 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -244,8 +244,7 @@
                 <search string="Search Claims">
                     <filter icon="terp-check" string="Current" name="current"
                         domain="[('state','in',('draft', 'open'))]"
-                        separator="1" help="Draft and Open Claims" default="1"
-                    />
+                        separator="1" help="Draft and Open Claims" />
                     <filter icon="terp-camera_test"
                         string="In Progress"
                         domain="[('state','=','open')]"
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 576715e6943..9005e527593 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -8,25 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:43+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:31+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr "nº de casos"
+msgstr "Nº de casos"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Group By..."
-msgstr "Agrupado por..."
+msgstr "Agrupar por..."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -63,12 +64,12 @@ msgstr "Compañía"
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr "e-mail del observador"
+msgstr "Email de los observadores"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr "nº de reclamaciones"
+msgstr "Nº reclamación"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -104,8 +105,8 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
-"Equipo de ventas al cual pertenece el caso. Defina el usuario responsable y "
-"su cuenta de email para la pasarela de correo."
+"Equipo de ventas al cual pertenece el caso. Define el usuario responsable y "
+"la cuenta de email para la pasarela de correo."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -126,7 +127,7 @@ msgstr "Reclamaciones objetivas"
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
@@ -136,12 +137,12 @@ msgstr "Preventivo"
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr "Contacto de empresa"
+msgstr "Contacto empresa"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr "Fecha cierre"
+msgstr "Fecha que fue resuelto"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -156,7 +157,7 @@ msgstr "Referencia"
 #. module: crm_claim
 #: field:crm.claim,action_next:0
 msgid "Next Action"
-msgstr "Siguiente acción"
+msgstr "Acción siguiente"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -192,7 +193,7 @@ msgstr "Sección"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Causas principales"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
@@ -209,12 +210,12 @@ msgstr "Prioridad"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr "Enviar nuevo e-mail"
+msgstr "Enviar nuevo email"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Fecha límite sobrepasada"
+msgstr "Fecha límite excedida"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -249,8 +250,8 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
-"Tenga una visión global de todas las reclamaciones procesadas en el sistema "
-"ordenándolas con criterios específicos"
+"Obtenga una visión global de todas las reclamaciones procesadas en el "
+"sistema ordenándolas con criterios específicos."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -288,7 +289,7 @@ msgstr "Fechas"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr "    Mes 1    "
+msgstr "    Mes-1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -309,7 +310,7 @@ msgstr "Análisis de reclamaciones"
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr "Número de días para cerra el caso"
+msgstr "Número de días para cerrar el caso"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
@@ -329,7 +330,7 @@ msgstr "Correctivo"
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr "Setiembre"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -404,7 +405,7 @@ msgstr "Baja"
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr "Cerrado"
+msgstr "Cerrada"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -428,12 +429,12 @@ msgstr "Normal"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr "CC Global"
+msgstr "CC global"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr "Gestión de la relación cliente & proveedor"
+msgstr "Gestión de las relaciones con los clientes y proveedores"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -473,7 +474,7 @@ msgstr "Cierre"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr "Búsqueda"
+msgstr "Buscar"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -494,7 +495,7 @@ msgstr "Fecha de reclamación"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr "Estas personas recibirán un e-mail"
+msgstr "Estas personas recibirán un email."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -518,7 +519,7 @@ msgstr "Política de reclamaciones"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr "Historia"
+msgstr "Historial"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
@@ -529,7 +530,7 @@ msgstr "Reclamación"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr "Datos adjuntos"
+msgstr "Documentos adjuntos"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -560,12 +561,12 @@ msgstr "Estado"
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr "Realizado"
+msgstr "Realizada"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Persona que ha reportado la reclamación"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -620,12 +621,12 @@ msgstr "Responder"
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr "Causa raíz"
+msgstr "Causa principal"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr "Descripción de la reclamación / acción"
+msgstr "Descripción de la reclamación/acción"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
@@ -635,7 +636,7 @@ msgstr "Descripción"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr "Bsucar reclamaciones"
+msgstr "Buscar reclamaciones"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index 87493c2d485..036f38cebfa 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 18:30+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -214,7 +214,7 @@ msgstr "Échéance dépassée"
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 4128bd7b31f..1fa47c09a9f 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -78,7 +78,6 @@
 
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
 
                             <filter icon="terp-personal+" groups="base.group_extended"
diff --git a/addons/crm_fundraising/i18n/es.po b/addons/crm_fundraising/i18n/es.po
index 3e2474f30c7..7348dc1f686 100644
--- a/addons/crm_fundraising/i18n/es.po
+++ b/addons/crm_fundraising/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:27+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:32+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -46,7 +47,7 @@ msgstr "Marzo"
 #. module: crm_fundraising
 #: field:crm.fundraising.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Demora cierre"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,company_id:0
@@ -140,7 +141,7 @@ msgstr "Acción siguiente"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reset to Draft"
-msgstr "Inicializar a borrador"
+msgstr "Cambiar a borrador"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -175,7 +176,7 @@ msgstr "Recaudación CRM"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Misc"
-msgstr "Misc."
+msgstr "Varios"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,section_id:0
@@ -252,7 +253,7 @@ msgstr "Etapa"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History Information"
-msgstr "Histórico información"
+msgstr "Información histórica"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -278,7 +279,7 @@ msgstr "Enseñanza y educación"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -388,6 +389,10 @@ msgid ""
 "you can track all you fund raising activities. The search list allows you to "
 "filter by funds description, email, history and probability of success."
 msgstr ""
+"Si necesita apoyar su organización o una campaña, con 'Obtención de fondos' "
+"puede hacer un seguimiento de todas sus actividades. La lista de búsqueda le "
+"permite filtrar por descripción de fondo, email, historial y probabilidad de "
+"éxito."
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -483,7 +488,7 @@ msgstr "Usuario"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "Nº obtención fondos"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
@@ -532,7 +537,7 @@ msgstr ""
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
 msgid "These people will receive email."
-msgstr "Estas personas recibirán un email"
+msgstr "Estas personas recibirán un email."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date:0
@@ -552,7 +557,7 @@ msgstr "Historial"
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Attachments"
-msgstr "Datos adjuntos"
+msgstr "Documentos adjuntos"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -565,13 +570,13 @@ msgstr "Estimaciones"
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Realizado"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
@@ -705,7 +710,7 @@ msgstr "Nombre"
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Efectivo"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -725,7 +730,7 @@ msgstr "Mi(s) caso(s)"
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Petición borrador"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
@@ -752,7 +757,7 @@ msgstr "Equipo de ventas"
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
diff --git a/addons/crm_fundraising/i18n/pt.po b/addons/crm_fundraising/i18n/pt.po
new file mode 100644
index 00000000000..d990d170871
--- /dev/null
+++ b/addons/crm_fundraising/i18n/pt.po
@@ -0,0 +1,749 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-07 22:07+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "Número de casos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "Probabilidade média"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "Telemóvel"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "Montante"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "Artes e Cultura"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto do terceiro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "   Month   "
+msgstr "   Mês   "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "Campanha"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "Voltar a rascunho"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "Informação extra"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "Angariação de fundos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "Terceiro"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "Diversos"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "Secção"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "Modo de pagamento"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "Data de criação"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "Prazo limite"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "Referências"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "Cartão de crédito"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "Referência 2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "Categori­a"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to support your organization or a campaign, with 'Fund Raising' "
+"you can track all you fund raising activities. The search list allows you to "
+"filter by funds description, email, history and probability of success."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos previstos"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "Telefone"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "Procurar"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr "Atual"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "Probabilidade (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "Nome do empregado"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "Fundos por categoria"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "Equipa de vendas"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "Data de criação"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 25222a56b2d..50ca70c5576 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -99,7 +99,6 @@
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
                             <filter icon="terp-personal+" groups="base.group_extended"
                                 context="{'invisible_section': False}"
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index 422b6044915..c6eddf7c555 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:51+0000\n"
+"PO-Revision-Date: 2010-12-08 16:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -170,7 +170,7 @@ msgstr "Ganado"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Fecha límite pasada"
+msgstr "Fecha límite excedida"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
@@ -295,7 +295,7 @@ msgstr "Escalar"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,write_date:0
 msgid "Update Date"
-msgstr "Actualizar fecha"
+msgstr "Fecha de actualización"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -495,7 +495,7 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr "Realizdo"
+msgstr "Realizado"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
new file mode 100644
index 00000000000..b3552eef91e
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/pt.po
@@ -0,0 +1,679 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-07 12:38+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "Número de casos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "Hoje"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto do terceiro"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "   Month   "
+msgstr "   Mês   "
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "Informação extra"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "Terceiro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "Secção"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,canal_id:0
+msgid "Channel"
+msgstr "Canal"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "Data de criação"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "Referências"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "Categori­a"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "  Year  "
+msgstr "  Ano  "
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "Custos previstos"
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7 dias"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "Procurar"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "Diversos"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "Enviar lembrete"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr "Atual"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support request."
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"'Helpdesk and Support' allows you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary "
+"and assign a priority level. Depending on your need, you may consider using "
+"the issues system of OpenERP to manage your support activities."
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "Equipa de vendas"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "Duração"
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 998f7c42da5..e7fd1eecb43 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.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: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-12-01 08:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 13:12+0000\n"
+"Last-Translator: Alexsandro Haag <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -25,18 +25,13 @@ msgstr "Espera para Fechar"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
 msgid "# of Cases"
-msgstr "# de Casos"
+msgstr "Nº de Casos"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
-
-#. module: crm_helpdesk
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
+msgstr "Agrupar Por..."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -58,13 +53,13 @@ msgstr "Empresa"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_cc:0
 msgid "Watchers Emails"
-msgstr "Fiscais de Emails"
+msgstr "Emails dos Observadores"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Highest"
-msgstr "Urgente"
+msgstr "Mais Alta"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -80,7 +75,7 @@ msgstr "Adicionar Anotação Interna"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Notes"
-msgstr "Anotações"
+msgstr "Notas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_ids:0
@@ -143,13 +138,6 @@ msgstr "Informações Adicionais"
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: crm_helpdesk
-#: field:crm.helpdesk,date_closed:0
-#: selection:crm.helpdesk,state:0
-#: selection:crm.helpdesk.report,state:0
-msgid "Closed"
-msgstr "Fechado"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
@@ -160,11 +148,6 @@ msgstr "Estimativas"
 msgid "Section"
 msgstr "Seção"
 
-#. module: crm_helpdesk
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,priority:0
@@ -173,11 +156,6 @@ msgstr "XML inválido para Arquitetura da View"
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
@@ -214,12 +192,12 @@ msgstr "Canal"
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Lowest"
-msgstr "Nenhuma"
+msgstr "Mais Baixa"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "# Mails"
-msgstr "# Emails"
+msgstr "Nº de Emails"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -264,7 +242,7 @@ msgstr "Categorias"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History Information"
-msgstr "Informação Histórica"
+msgstr "Histórico"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -274,7 +252,7 @@ msgstr "Datas"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "#Helpdesk"
-msgstr "#Helpdesk"
+msgstr "Nº do Chamado"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -311,12 +289,12 @@ msgstr "Mês"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Escalate"
-msgstr "Escalada"
+msgstr "Escalar"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,write_date:0
 msgid "Update Date"
-msgstr "Data de atualização"
+msgstr "Data de Atualização"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -353,7 +331,7 @@ msgstr "Chamados de Suporte"
 #: field:crm.helpdesk,planned_cost:0
 #: field:crm.helpdesk.report,planned_cost:0
 msgid "Planned Costs"
-msgstr "Custos planejados"
+msgstr "Custos Planejados"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,description:crm_helpdesk.module_meta_information
@@ -378,9 +356,11 @@ msgid "Low"
 msgstr "Baixa"
 
 #. module: crm_helpdesk
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Você não pode criar Menu recursivo."
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "Fechado"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -538,29 +518,16 @@ msgstr "Fechar"
 msgid "Open"
 msgstr "Aberto"
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
-msgstr "Hierarquiva de Suporte Técnico"
+msgstr "Hierarquia de Suporte Técnico"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Categorization"
 msgstr "Categorização"
 
-#. module: crm_helpdesk
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
-
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
@@ -630,7 +597,7 @@ msgstr "Probabilidade (%)"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,email:0
 msgid "# Emails"
-msgstr "# Emails"
+msgstr "Nº de Emails"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
@@ -667,15 +634,10 @@ msgstr ""
 "                  \n"
 "Se o caso está em progresso o estado é definido para 'Aberto'.               "
 "                   \n"
-"Quando o caso termina, o estado é definido como 'Pronto'.                    "
-"              \n"
+"Quando o caso termina, o estado é definido como 'Concluído'.                 "
+"                 \n"
 "Se o caso precisa ser revisto então o estado é definido como 'Pendente'."
 
-#. module: crm_helpdesk
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
@@ -689,7 +651,7 @@ msgstr "Nome"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Lost"
-msgstr "Perda"
+msgstr "Perdido"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
@@ -722,12 +684,12 @@ msgstr "Alta"
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr "Time de Vendas"
+msgstr "Equipe de Vendas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
 msgid "Last Action"
-msgstr "Última ação"
+msgstr "Última Ação"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -739,3 +701,27 @@ msgstr "Ano"
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
 msgstr "Duração"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Você não pode criar Menu recursivo."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index dd782956376..02e3448ca6a 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 11:47+0000\n"
-"Last-Translator: Эдуард <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 1ae9224787b..1fea2a0f2d4 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -72,7 +72,6 @@
                         domain="[('state','=','cancel')]" />
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
-                            default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
                             <filter icon="terp-personal+" groups="base.group_extended"
                             context="{'invisible_section': False}"
@@ -99,8 +98,7 @@
                     <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Salesman" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}"
-                            default="1" />
+                            domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index 4ff5941bf7c..5b767f77956 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 23:14+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:35+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -71,7 +72,7 @@ msgstr "Iniciativa"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Demora cierre"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -240,7 +241,7 @@ msgstr "Tipo"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr ""
+msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -333,7 +334,7 @@ msgstr "Análisis de asignación de op."
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
-msgstr "Número de dias para cerrar el caso"
+msgstr "Número de días para cerrar el caso"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -349,7 +350,7 @@ msgstr "Retraso de apertura"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
-msgstr ""
+msgstr "Nivel"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -375,7 +376,7 @@ msgstr "Asunto"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
-msgstr ""
+msgstr "Comercial"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
@@ -401,7 +402,7 @@ msgstr "Geolocalización empresa"
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -470,7 +471,7 @@ msgstr "Número de días para abrir el caso"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Demora de apertura"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
@@ -498,7 +499,7 @@ msgstr "Filtros extendidos..."
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
-msgstr ""
+msgstr "Longitud Geo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -528,7 +529,7 @@ msgstr "Beneficio previsto"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
-msgstr ""
+msgstr "res.empresa.nivel"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -548,7 +549,7 @@ msgstr "Últimos 30 días"
 #. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
-msgstr ""
+msgstr "Nombre de nivel"
 
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
@@ -597,7 +598,7 @@ msgstr "Mayo"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Ingreso estimado"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -643,7 +644,7 @@ msgstr "Convertir en oportunidad"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
-msgstr ""
+msgstr "Asignar geo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -653,7 +654,7 @@ msgstr "Abril"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.iniciativa"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index a163a7965b0..01d118c9d42 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/i18n/it.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: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-27 14:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 05:21+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\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: 2010-11-28 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -42,11 +42,6 @@ msgstr "# di Casi"
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: crm_partner_assign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #. module: crm_partner_assign
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
@@ -152,14 +147,6 @@ msgstr ""
 "Fornisce la probabilità di assegnare una iniziativa a questo Partner. (0 "
 "significa nessun assegnamento)."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
-#: field:res.partner,grade_id:0
-#: view:res.partner.grade:0
-msgid "Partner Grade"
-msgstr "Qualità del Partner"
-
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
@@ -206,11 +193,12 @@ msgid "From"
 msgstr "Da"
 
 #. module: crm_partner_assign
-#: selection:crm.lead.forward.to.partner,state:0
-#: view:crm.lead.report.assign:0
-#: selection:crm.lead.report.assign,state:0
-msgid "Closed"
-msgstr "Chiuso"
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "Qualità del Partner"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -228,11 +216,6 @@ msgstr "Prossimo"
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: crm_partner_assign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere univoco!"
-
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
@@ -305,11 +288,6 @@ msgstr "Luglio"
 msgid "Stage"
 msgstr "Fase"
 
-#. module: crm_partner_assign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
-
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:0
 #, python-format
@@ -420,6 +398,11 @@ msgstr "# Opportunità"
 msgid "Partner Geo-Localisation"
 msgstr "Geo-localizzazione Partner"
 
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Errore! Non è possibile creare dei membri associati ricorsivi."
+
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
@@ -432,9 +415,11 @@ msgid "Low"
 msgstr "Basso"
 
 #. module: crm_partner_assign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare un menù ricorsivo."
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "Chiuso"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -577,19 +562,6 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: crm_partner_assign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-"speciale!"
-
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
@@ -646,11 +618,6 @@ msgstr "Opportunità"
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
@@ -732,3 +699,21 @@ msgstr ""
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
 msgstr "Anno"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della vista!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
+#~ "speciale!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere univoco!"
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 6562d17012d..9cb0f2e2d28 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -23,7 +23,6 @@
                             domain="[('state','=','done')]"/>
                         <separator orientation="vertical" />
                         <field name="section_id"
-                            default="context.get('section_id', False)"
                             widget="selection"
                             context="{'invisible_section': False}"/>
                         <field name="grade_id"/>
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index 8834b6cdd06..1e549af3368 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:38+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 10:16+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index b9bb927a8ce..655bc9a0641 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-24 08:25+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 05:21+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -21,19 +21,6 @@ msgstr ""
 msgid "Questions List"
 msgstr "Elenco delle Domande"
 
-#. module: crm_profiling
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: crm_profiling
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
-
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
@@ -47,25 +34,30 @@ msgid "Open Questionnaire"
 msgstr "Questionario Aperto"
 
 #. module: crm_profiling
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico!"
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic related questionnaires that will be used to "
+"guide your team(s) in the sales cycle by helping them to ask the right "
+"questions. Using the segmentation tool, you will be able to automatically "
+"assign a partner to a category based on his answers to the different "
+"questionnaires."
+msgstr ""
+"E' possibile creare uno specifico questionario correlato che verrà usato per "
+"guidare il (o i) team, nel ciclo di vendita, aiutandoli a porre le giuste "
+"domande. Usando il tool di segmentazione, è così possible assegnare "
+"automaticamente i partner alla loro corretta categoria, basandosi sulle "
+"risposte ai differenti questionari."
 
 #. module: crm_profiling
-#: field:crm.segmentation,child_ids:0
-msgid "Child Profiles"
-msgstr "Profili figli"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Errore! Non è possibile creare dei membri associati ricorsivi."
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
 msgstr "Segmentazione Partner"
 
-#. module: crm_profiling
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore ! Non puoi creare un menù ricorsivo"
-
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_answer
@@ -115,16 +107,6 @@ msgstr "Nome Questionario"
 msgid "Use a questionnaire"
 msgstr "Utilizza un Questionario"
 
-#. module: crm_profiling
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID certificato del modulo deve essere unico!"
-
-#. module: crm_profiling
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 #: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
@@ -158,26 +140,16 @@ msgstr "Utilizza Regole Peofilatura"
 msgid "Avalaible answers"
 msgstr "Risposte Disponibili"
 
-#. module: crm_profiling
-#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
-msgid ""
-"You can create specific topic related questionnaires that will be used to "
-"guide your team(s) in the sales cycle by helping them to ask the right "
-"questions. Using the segmentation tool, you will be able to automatically "
-"assign a partner to a category based on his answers to the different "
-"questionnaires."
-msgstr ""
-"E' possibile creare uno specifico questionario correlato che verrà usato per "
-"guidare il (o i) team, nel ciclo di vendita, aiutandoli a porre le giuste "
-"domande. Usando il tool di segmentazione, è così possible assegnare "
-"automaticamente i partner alla loro corretta categoria, basandosi sulle "
-"risposte ai differenti questionari."
-
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
 msgstr "Includi Risposte"
 
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Profili figli"
+
 #. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.questionnaire,questions_ids:0
@@ -221,10 +193,17 @@ msgstr "Utilizzare un Questionario"
 msgid "Save Data"
 msgstr "Salva Dati"
 
-#. module: crm_profiling
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La dimensione del campo non può mai essere minore di 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome di modulo non valido nella definizione dell'azione."
 
 #~ msgid "crm_profiling management"
 #~ msgstr "Gestione crm_profiling"
@@ -236,3 +215,15 @@ msgstr "La dimensione del campo non può mai essere minore di 1!"
 #~ "Seleziona questa casella se si desidera utilizzare questa scheda come parte "
 #~ "della regola di segmentazione. Se non è selezionata, i criteri di sotto "
 #~ "verranno ignorati"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore ! Non puoi creare un menù ricorsivo"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID certificato del modulo deve essere unico!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/decimal_precision/i18n/es.po b/addons/decimal_precision/i18n/es.po
index 7ba710900ab..a33f2ce7df5 100644
--- a/addons/decimal_precision/i18n/es.po
+++ b/addons/decimal_precision/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:38+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:28+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
new file mode 100644
index 00000000000..05a6152a7c8
--- /dev/null
+++ b/addons/decimal_precision/i18n/pt.po
@@ -0,0 +1,54 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 12:56+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Dígitos"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr ""
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr ""
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 83b128dfdf7..d69bdc64780 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:36+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 20:56+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -229,6 +230,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la cuadrícula de envío sin "
+"eliminarla."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -270,6 +273,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
 
 #. module: delivery
 #: field:sale.order,carrier_id:0
@@ -296,7 +301,7 @@ msgstr "¡La orden no está en estado borrador!"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivamente."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -306,7 +311,7 @@ msgstr "Lote"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Estña intentando asignar un lote que no es del mismo producto"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 71607cf7e2e..356eee563b1 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-30 12:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 14:52+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -36,6 +36,11 @@ msgstr "Destino"
 msgid "Net weight"
 msgstr "Peso líquido"
 
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr "Ordem de entrega"
+
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
 #, python-format
@@ -47,11 +52,6 @@ msgstr "Nenhum preço disponivel !"
 msgid "Delivery Grid Line"
 msgstr ""
 
-#. module: delivery
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
@@ -124,13 +124,6 @@ msgstr "Fixo"
 msgid "Delivery Method"
 msgstr "Método de expedição"
 
-#. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr ""
-
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
 msgid "Stock Move"
@@ -155,9 +148,10 @@ msgid "Net Weight"
 msgstr "Peso líquido"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linhas da grelha"
+#: code:addons/delivery/stock.py:0
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -180,19 +174,14 @@ msgid "Partner"
 msgstr "Terceiro"
 
 #. module: delivery
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro ! Não pode criar menus recursivos"
-
-#. module: delivery
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Grelha de expedição"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Faturado a"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
@@ -204,11 +193,6 @@ msgstr ""
 msgid "Make Delievery"
 msgstr "Fazer entrega"
 
-#. module: delivery
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
 msgid ""
@@ -221,31 +205,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:0
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Linhas da grelha"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
 msgstr "Grelha"
 
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
 msgstr "Patra zip"
 
-#. module: delivery
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista"
-
-#. module: delivery
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Erro: UdV deve estar numa categoria diferente da UdC"
-
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
@@ -275,6 +255,13 @@ msgstr "Número de embalagens"
 msgid "Weight"
 msgstr "Peso"
 
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
 #. module: delivery
 #: field:sale.order,carrier_id:0
 msgid "Delivery method"
@@ -291,13 +278,6 @@ msgstr ""
 msgid ">="
 msgstr ">="
 
-#. module: delivery
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Erro: A UdM pré-defenida e a UdM de compra devem ser da mesma categoria."
-
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
@@ -315,9 +295,9 @@ msgid "Lot"
 msgstr "Lote"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Grelha de expedição"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -351,6 +331,11 @@ msgstr ""
 "método pode ser associado a uma lista de preços que calcula o preço de "
 "entrega de acordo com os produtos sendo vendidos ou entregues"
 
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
@@ -383,19 +368,6 @@ msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
-#. module: delivery
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#. module: delivery
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
-"especial !"
-
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
@@ -482,15 +454,6 @@ msgstr "A transportadora %s (id: %d) não tem grelha de entrega !"
 msgid "Name"
 msgstr "Nome"
 
-#. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Se o campo 'ativo' estiver selecionado, permitir-lhe-á esconder o "
-"transportador sem ter de o remover"
-
 #. module: delivery
 #: view:delivery.carrier:0
 #: field:delivery.carrier,name:0
@@ -544,11 +507,6 @@ msgstr "Preço de venda"
 msgid "States"
 msgstr "Estados"
 
-#. module: delivery
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Erro: Código ean inválido"
-
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
@@ -557,12 +515,18 @@ msgstr "Tipo de preço"
 #~ msgid "Notes"
 #~ msgstr "Notas"
 
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Erro: Código ean inválido"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "O IVA não parece estar correcto."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção"
+
 #~ msgid ""
 #~ "Complete this field if you plan to invoice the shipping based on packing."
 #~ msgstr "Complete este campo se planeia facturar com base no empacotamento."
@@ -576,6 +540,15 @@ msgstr "Tipo de preço"
 #~ "Pode definir grelhas de transitários e expedição por preços. Ao criar "
 #~ "facturas por recolha, o OpenERP pode calcular a via de expedição."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+#~ "especial !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura da vista"
+
 #~ msgid "This delivery method will be used when invoicing from packing."
 #~ msgstr "Este método de expedição será usado se facturar por empacotamento"
 
@@ -588,8 +561,35 @@ msgstr "Tipo de preço"
 #~ msgid "Carrier and delivery grids"
 #~ msgstr "Grelha de transitário e expedição"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Erro: UdV deve estar numa categoria diferente da UdC"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Erro: A UdM pré-defenida e a UdM de compra devem ser da mesma categoria."
+
 #~ msgid "Add Delivery Costs"
 #~ msgstr "Adicionar custos de expedição"
 
 #~ msgid "Packing to be invoiced"
 #~ msgstr "Empacotamento a facturar."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro ! Não pode criar menus recursivos"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the delivery "
+#~ "carrier without removing it."
+#~ msgstr ""
+#~ "Se o campo 'ativo' estiver selecionado, permitir-lhe-á esconder o "
+#~ "transportador sem ter de o remover"
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 5c0cf160001..0df37eb0f5a 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 23:29+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:30+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -24,7 +25,7 @@ msgstr "Directorio padre"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Auto Directory Configuration"
-msgstr ""
+msgstr "Configuración automática de directorios"
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -34,17 +35,17 @@ msgstr "Campo nombre"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Tablero de documentos"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
 msgid "Process Node"
-msgstr ""
+msgstr "Nodo proceso"
 
 #. module: document
 #: view:document.directory:0
 msgid "Search Document Directory"
-msgstr ""
+msgstr "Buscar directorio de documentos"
 
 #. module: document
 #: help:document.directory,resource_field:0
@@ -52,6 +53,8 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Campo a usar como nombre en directorios. Si está vacío se usará el "
+"\"nombre\"."
 
 #. module: document
 #: code:addons/document/document_directory.py:0
@@ -157,6 +160,9 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Si está marcada, se encontrarán todos los archivos adjuntos que coincidan "
+"con este recurso. Si está desmarcada, sólo se encontrarán aquellos que "
+"tengan este padre."
 
 #. module: document
 #: view:document.directory:0
@@ -190,7 +196,7 @@ msgstr "¡Error!"
 #. module: document
 #: help:document.configuration,product:0
 msgid "Auto directory configuration for Products."
-msgstr "Configuración automática del directorio de productos."
+msgstr "Configuración automática del directorios para productos."
 
 #. module: document
 #: field:document.directory,resource_find_all:0
@@ -239,7 +245,7 @@ msgstr "Error de validación"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.acciones.informe.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -445,7 +451,7 @@ msgstr "Diciembre"
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -484,19 +490,19 @@ msgid ""
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
 "Este es un completo gestor de documentos:\n"
-"    *Autentificación de usuario\n"
-"    *Indexación de documentos :- Los documentos .pptx and .docx no están "
+"    * Autenticación de usuario\n"
+"    * Indexación de documentos. Los documentos .pptx y .docx no están "
 "soportados bajo windows.\n"
-"    *Tablero de documentos que incluye:\n"
-"        *Nuevos ficheros (lista)\n"
-"        *Ficheros por tipo de recurso (gráfico)\n"
-"        *Ficheros por empresa (gráfico)\n"
-"        *Ficheros por mes (gráfico)\n"
+"    * Tablero de documentos que incluye:\n"
+"        * Nuevos archivos (lista)\n"
+"        * Archivos por tipo de recurso (gráfico)\n"
+"        * Archivos por empresa (gráfico)\n"
+"        * Archivos por mes (gráfico)\n"
 "    ATENCIÓN:\n"
-"    -Cuando instale este módulo en una compañía en producción que ya tenga "
+"    - Cuando instale este módulo en una compañía en producción que ya tenga "
 "ficheros PDF guardados en la base de datos,\n"
 "      los perderá todos.\n"
-"    -Tras instalar este módulo, los ficheros PDF ya no se guardarán en la "
+"    - Tras instalar este módulo, los ficheros PDF ya no se guardarán en la "
 "base de datos,\n"
 "      sino en el directorio raíz del servidor como /server/bin/filestore.\n"
 
@@ -505,6 +511,8 @@ msgstr ""
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Sino se marca, media está actualmente fuera de línea y su contenido no está "
+"disponible."
 
 #. module: document
 #: view:document.directory:0
@@ -541,11 +549,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Marque este campo si desea que el nombre del archivo contenga el nombre del "
+"registro.\n"
+"Si está marcado, el directorio tiene que ser un recurso."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr "Auto configurar directorio"
+msgstr "Configuración automática de directorios"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -587,6 +598,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Junto con el modelo padre, este ID adjunta esta carpeta a un registro "
+"específico del modelo padre."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -597,7 +610,7 @@ msgstr "Agosto"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr "El directorio no puede ser su propio padre!"
+msgstr "¡El directorio no puede ser su propio padre!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -642,6 +655,9 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Si pone un objeto aquí, esta plantilla de directorio aparecerá bajo todos "
+"estos objetos. Dichos directorios son \"adjuntados\" al modelo o registro, "
+"como adjuntos. No ponga un directorio padre si selecciona un modelo padre."
 
 #. module: document
 #: view:document.directory:0
@@ -667,12 +683,12 @@ msgstr "Base de datos"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Configuración automática de directorios para proyectos."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Relacionado con"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -697,7 +713,7 @@ msgstr "Archivos por usuarios"
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Sólo lectura"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
@@ -726,7 +742,7 @@ msgstr "Archivos por mes"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr "Setiembre"
 
 #. module: document
 #: field:document.directory.content,prefix:0
@@ -746,7 +762,7 @@ msgstr "Nombre del archivo"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contenidos"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -756,7 +772,7 @@ msgstr "ID recurso"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Almacenamiento externo"
 
 #. module: document
 #: view:board.board:0
@@ -768,7 +784,7 @@ msgstr "Muro de la vergüenza"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Para el almacenamiento de archivos, la ruta raíz donde se almacenan."
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -783,7 +799,7 @@ msgstr "Campo"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Contexto dinámico de directorio"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
@@ -848,27 +864,28 @@ msgstr ""
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
 msgstr ""
+"Para cada entrada, los archivos virtuales aparecerán en esta carpeta."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.adjunto"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Nuevos archivos"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Estático"
 
 #. module: document
 #: view:report.files.partner:0
@@ -881,6 +898,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"El nombre del archivo. Tenga en cuenta que el prefijo \"dctx_\" se "
+"antepondrá a lo que escriba aquí."
 
 #. module: document
 #: view:report.document.user:0
@@ -897,6 +916,8 @@ msgstr "Notas"
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
 msgstr ""
+"Configuración automática de directorios para presupuestos y pedidos de venta "
+"con informes."
 
 #. module: document
 #: help:document.directory,type:0
@@ -907,18 +928,23 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Cada directorio puede tener el tipo estático o asociarlo a otro recurso. Un "
+"directorio estático, como en los sistemas operativos, es el clásico "
+"directorio que puede contener un conjunto de archivos. Los directorios "
+"asociados a recursos del sistema automáticamente poseen subdirectorios para "
+"cada tipo de recurso definido en el directorio padre."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Estadísticas por usuario"
 
 #. module: document
 #: field:document.directory,name:0
@@ -929,23 +955,23 @@ msgstr "Nombre"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "¡La ruta de almacenamiento debe ser única!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Campos"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Si está marcado, media sólo es de lectura."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: document
 #: field:report.document.user,nbr:0
@@ -959,6 +985,8 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Sólo los miembros de estos grupos tendrán acceso a este directorio y a sus "
+"archivos."
 
 #. module: document
 #: view:document.directory:0
@@ -966,11 +994,13 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Sin embargo, estos grupos no se aplican a los directorios hijos, los cuales "
+"deben definir sus propios grupos."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Tipo mime"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -991,18 +1021,18 @@ msgstr "¡El nombre de archivo debe ser único!"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Almacenamiento interno"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "El directorio debe tener un padre o un almacenamiento."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Estructura de directorios"
 
 #. module: document
 #: view:board.board:0
@@ -1015,19 +1045,19 @@ msgstr "Archivos por tipo de registro"
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Medio de almacenamiento"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Buscar almacenamiento documentos"
 
 #. module: document
 #: field:document.directory.content,extension:0
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index b2767943544..70f5924e8c8 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 11:59+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -96,7 +96,7 @@ msgstr "Março"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: document
 #: view:document.directory:0
@@ -756,7 +756,7 @@ msgstr "Nome do ficheiro"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index e91efa560d1..1da6f14f3da 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:11+0000\n"
-"PO-Revision-Date: 2010-11-22 20:23+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 20:03+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-23 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -29,7 +29,7 @@ msgstr ""
 #. module: document
 #: field:document.directory,resource_field:0
 msgid "Name field"
-msgstr ""
+msgstr "Namnfält"
 
 #. module: document
 #: view:board.board:0
@@ -63,12 +63,7 @@ msgstr "Directory name contains special characters!"
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
-
-#. module: document
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
+msgstr "Gruppera efter"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -78,7 +73,7 @@ msgstr "Directory Content Type"
 #. module: document
 #: view:document.directory:0
 msgid "Resources"
-msgstr ""
+msgstr "Resurser"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -95,12 +90,18 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
+msgstr "Mars"
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
 msgstr ""
 
 #. module: document
+#: view:document.directory:0
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Företag"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -110,7 +111,7 @@ msgstr "Directory Content"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dynamiskt sammanhang"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -128,12 +129,12 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "Sökväg"
 
 #. module: document
 #: code:addons/document/document_directory.py:0
@@ -165,7 +166,7 @@ msgstr "Kataloger"
 #. module: document
 #: field:document.configuration,sale_order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Försäljningsorder"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
@@ -175,7 +176,7 @@ msgstr ""
 #. module: document
 #: field:document.configuration,project:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
@@ -206,7 +207,7 @@ msgstr "Suffix"
 #. module: document
 #: field:report.document.user,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Ändrad datum"
 
 #. module: document
 #: view:ir.attachment:0
@@ -235,7 +236,7 @@ msgstr "ValidateError"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -243,12 +244,7 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
-
-#. module: document
-#: field:ir.actions.report.xml,model_id:0
-msgid "Model Id"
-msgstr "Model Id"
+msgstr "Dokument"
 
 #. module: document
 #: constraint:document.directory:0
@@ -259,7 +255,7 @@ msgstr "Error! Du kan inte skapa rekursiva kataloger."
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "Lagring"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -288,11 +284,6 @@ msgstr "Content Type"
 msgid "Type"
 msgstr "Type"
 
-#. module: document
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: document
 #: help:document.directory,ressource_type_id:0
 msgid ""
@@ -337,12 +328,7 @@ msgstr "Report"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
-
-#. module: document
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
+msgstr "Juli"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
@@ -358,7 +344,7 @@ msgstr "Extension"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Skapad"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -368,7 +354,7 @@ msgstr "Virtual Files"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Ändrad"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
@@ -379,7 +365,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "Genererade filer"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -413,7 +399,7 @@ msgstr ""
 #. module: document
 #: field:document.configuration,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfigurationsförlopp"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -448,12 +434,12 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: document
 #: field:document.configuration,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -533,6 +519,11 @@ msgid ""
 "If set, the directory will have to be a resource one."
 msgstr ""
 
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Auto Configure Directory"
+
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
@@ -544,14 +535,14 @@ msgid "Attachment"
 msgstr "Attachment"
 
 #. module: document
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "Model Id"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -578,7 +569,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -589,13 +580,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -606,13 +597,13 @@ msgstr "Groups"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: document
 #: view:ir.attachment:0
@@ -638,7 +629,7 @@ msgstr "Definition"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: document
 #: view:document.directory:0
@@ -658,7 +649,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Relaterad till"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -673,7 +664,7 @@ msgstr "Attached To"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Huvudmeny"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
@@ -693,7 +684,7 @@ msgstr ""
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Katalognamnet måste vara unikt !"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -712,17 +703,12 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
-
-#. module: document
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Prefix"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -732,12 +718,12 @@ msgstr ""
 #. module: document
 #: field:report.document.user,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Filnamn"
 
 #. module: document
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -747,21 +733,14 @@ msgstr "Resource ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+msgstr "Extern fillagring"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Skamvrån"
 
 #. module: document
 #: help:document.storage,path:0
@@ -800,17 +779,17 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Rapportering"
 
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -821,7 +800,7 @@ msgstr "Tree Structure"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -848,23 +827,23 @@ msgstr ""
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Nya filer"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Statisk"
 
 #. module: document
 #: view:report.files.partner:0
@@ -881,7 +860,7 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Month"
-msgstr ""
+msgstr "Denna månad"
 
 #. module: document
 #: view:ir.attachment:0
@@ -908,13 +887,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Statistik per användare"
 
 #. module: document
 #: field:document.directory,name:0
@@ -930,7 +909,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Fält"
 
 #. module: document
 #: help:document.storage,readonly:0
@@ -941,13 +920,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: document
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "# av filer"
 
 #. module: document
 #: view:document.directory:0
@@ -966,12 +945,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
-
-#. module: document
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Mime typ"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -992,7 +966,7 @@ msgstr "File name must be unique!"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Intern fillagring"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -1035,10 +1009,10 @@ msgstr ""
 msgid "Document Type"
 msgstr "Document Type"
 
-#. module: document
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #~ msgid ""
 #~ "Select an object here and Open ERP will create a mapping for each of these "
@@ -1047,6 +1021,9 @@ msgstr ""
 #~ "Select an object here and Open ERP will create a mapping for each of these "
 #~ "objects, using the given domain, when browsing through FTP."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Invalid model name in the action definition."
+
 #~ msgid ""
 #~ "This wizard will automatically configure the document management system "
 #~ "according to modules installed on your system."
@@ -1088,6 +1065,9 @@ msgstr ""
 #~ msgid "Link"
 #~ msgstr "Link"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalid XML for View Architecture!"
+
 #~ msgid "Search a File"
 #~ msgstr "Sök fil"
 
@@ -1097,9 +1077,6 @@ msgstr ""
 #~ msgid "Document Configuration"
 #~ msgstr "Dokumentkonfiguration"
 
-#~ msgid "Auto Configure Directory"
-#~ msgstr "Auto Configure Directory"
-
 #~ msgid ""
 #~ "This wizard will configure the URL of the server of the document management "
 #~ "system."
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index 35220f15a82..f13d430b7d8 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 17:50+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
-msgstr "Configuración automática directorio"
+msgstr "Configuración automática de directorios"
 
 #. module: document_ftp
 #: help:document.ftp.configuration,host:0
@@ -28,79 +29,11 @@ msgid ""
 "Server address or IP and port to which users should connect to for DMS access"
 msgstr "Dirección del servidor o IP y el puerto para acceder al DMS."
 
-#. module: document_ftp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: document_ftp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: document_ftp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear un menú recursivo"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Examinar documento"
-
-#. module: document_ftp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Examinar"
-
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
 msgid "Configuration Progress"
 msgstr "Progreso configuración"
 
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "title"
-msgstr "título"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Biblioteca compartida de módulos (FTP)"
-
-#. module: document_ftp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración de servicor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Examinar documento"
-
 #. module: document_ftp
 #: model:ir.actions.url,name:document_ftp.action_document_browse
 msgid "Browse Files"
@@ -109,7 +42,22 @@ msgstr "Examinar archivos"
 #. module: document_ftp
 #: field:document.ftp.configuration,config_logo:0
 msgid "Image"
-msgstr "Imágen"
+msgstr "Imagen"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "título"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "Servidor FTP"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Configuración de servicor FTP"
 
 #. module: document_ftp
 #: model:ir.module.module,description:document_ftp.module_meta_information
@@ -127,11 +75,21 @@ msgstr ""
 "archivos utilizando el\n"
 "        Cliente FTP.\n"
 
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Examinar"
+
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
 
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Biblioteca compartida de módulos (FTP)"
+
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Cancel"
@@ -148,6 +106,35 @@ msgid "Document FTP Browse"
 msgstr "Examinar documento por FTP"
 
 #. module: document_ftp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Examinar documento"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Examinar documento"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear un menú recursivo"
diff --git a/addons/document_ics/i18n/pt.po b/addons/document_ics/i18n/pt.po
index 82867503854..a613a73e717 100644
--- a/addons/document_ics/i18n/pt.po
+++ b/addons/document_ics/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 03:49+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:13+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -28,13 +28,6 @@ msgstr ""
 msgid "Object"
 msgstr "Objecto"
 
-#. module: document_ics
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "uid"
@@ -45,13 +38,13 @@ msgstr "uid"
 msgid ""
 "This may help associations in their fund raising process and tracking."
 msgstr ""
-"Isto pode ajudar as associações no seu processo de angaração de fundos e "
+"Isto pode ajudar as associações no seu processo de angariação de fundos e "
 "monitoramento."
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr "Processo de contratação de empregados"
+msgstr "Processo de Contratação"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
@@ -65,12 +58,14 @@ msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "participante"
+msgid "dtstamp"
+msgstr "Data"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
 msgstr ""
 
 #. module: document_ics
@@ -81,32 +76,27 @@ msgstr "Conteúdo"
 #. module: document_ics
 #: field:document.ics.crm.wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr "Calendário de reuniões"
+msgstr "Calendário de Reuniões"
 
 #. module: document_ics
 #: model:crm.case.section,name:document_ics.section_meeting
 msgid "Shared Calendar Meetings"
-msgstr "Partilhar calendários de reuniões"
+msgstr "Partilhar Calendários de Reuniões"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
 msgstr "Gere um serviço de Helpdesk"
 
-#. module: document_ics
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
-msgstr "datafim"
+msgstr "Data Final"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Reunião"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
@@ -123,22 +113,24 @@ msgstr "descrição"
 #. module: document_ics
 #: field:document.directory.ics.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Função"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr ""
+msgstr "Configuração do Calendário por Secção "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "Rastreia oportunidade de negócio identificadas para as suas vendas."
+msgstr ""
+"Localiza oportunidades de negócios identificada para as suas linhas de "
+"vendas."
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progresso da configuração"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
@@ -150,12 +142,12 @@ msgstr ""
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr "Operações de angariação de fundos"
+msgstr "Operações de Angariação de Fundos"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_content
@@ -170,7 +162,7 @@ msgstr ""
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr ""
+msgstr "Suporte para iCal baseado no Sistema de Gestão Documental"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -205,9 +197,9 @@ msgid "location"
 msgstr "localização"
 
 #. module: document_ics
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "participante"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
@@ -222,7 +214,7 @@ msgstr ""
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr "Geri a agenda de reuniões dos utilizadores."
+msgstr "Gerência do calendário de reuniões dos utilizadores."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
@@ -232,7 +224,7 @@ msgstr ""
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "last-modified"
-msgstr "modificado ultima vez"
+msgstr "última modificação"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -252,7 +244,7 @@ msgstr "Reclamações"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstart"
-msgstr "datainício"
+msgstr "Data de Ínicio"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,expr:0
@@ -262,7 +254,7 @@ msgstr ""
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Erro Localizado"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -292,17 +284,17 @@ msgstr ""
 #. module: document_ics
 #: field:crm.meeting,code:0
 msgid "Calendar Code"
-msgstr "Código do calendário"
+msgstr "Código do Calendário"
 
 #. module: document_ics
 #: model:ir.module.module,description:document_ics.module_meta_information
 msgid "Allows to synchronise calendars with others applications."
-msgstr ""
+msgstr "Permite sincronizar calendarios com outras aplicações."
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagem"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -329,12 +321,12 @@ msgstr ""
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
 msgid "document.ics.crm.wizard"
-msgstr ""
+msgstr "document.ics.crm.wizard"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
@@ -344,7 +336,7 @@ msgstr "Chamadas Telefónicas"
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
 msgid "Fields Mapping"
-msgstr "Mapeamento de campos"
+msgstr "Mapeamento de Campos"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -354,22 +346,7 @@ msgstr "url"
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr "Oportunidades de negócio"
-
-#. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "dtstamp"
-msgstr ""
-
-#. module: document_ics
-#: help:document.directory.content,fname_field:0
-msgid ""
-"The field of the                         object used in the filename. Has to "
-"be a unique identifier."
-msgstr ""
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Não é possível criar directorias recursivos."
+msgstr "Oportunidades de Negócio"
 
 #~ msgid "Open ERP Field"
 #~ msgstr "Abrir campos Open ERP"
@@ -377,31 +354,8 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Seguinte"
 
-#~ msgid ""
-#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
-#~ "integration..."
-#~ msgstr ""
-#~ "Ajuda-o a organizar o processo de contratação de empregados: Avaliação, "
-#~ "reuniões, integração de e-mail...."
-
-#~ msgid "Error ! You cannot create recursive sections."
-#~ msgstr "Erro! Não pode criar secções recursivamente."
-
-#~ msgid ""
-#~ "Manages the supplier and customers claims, including your corrective or "
-#~ "preventive actions."
-#~ msgstr ""
-#~ "Gere as reclamações de fornecedores e clientes, incluindo as suas acções "
-#~ "correctivas ou preventivas."
-
-#~ msgid "Duration(In Hour)"
-#~ msgstr "Duração (Horas)"
-
-#~ msgid "Create Pre-Configured Calendars"
-#~ msgstr "Cria calendários pre-configurados"
-
-#~ msgid "Prospect"
-#~ msgstr "Pospecto"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção"
 
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index aefde238871..785e830430a 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/i18n/es.po
@@ -7,124 +7,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 06:12+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: document_webdav
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: document_webdav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
-msgid "WebDAV server for Document Management"
-msgstr ""
+msgstr "¡Error! No puede crear directorios recursivos."
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: field:document.webdav.dir.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Espacio de nombres"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "Propiedades DAV"
 
 #. module: document_webdav
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr ""
+#: view:document.webdav.dir.property:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-msgid "Substitute"
-msgstr ""
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "¡Error de importación PyWebDAV!"
 
 #. module: document_webdav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "¡El directorio no puede ser su propio padre!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Contexto dinámico"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "Propiedades WebDAV"
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "¡El nombre de directorio debe ser único!"
 
 #. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Search Document storage"
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Instale PyWebDAV desde "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
 msgid "DAV properties for folders"
-msgstr ""
+msgstr "Propiedades DAV para carpetas"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: view:document.webdav.dir.property:0
 msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
+msgstr "Propiedades"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "documento.webdav.dir.propiedad"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Directorio"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Dir"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Servidor WebDAV para gestión de documentos"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "El directorio debe tener un padre o un almacenamiento."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Search Document storage"
+msgstr "Buscar almacenamiento documentos"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+msgid "Substitute"
+msgstr "Substituir"
 
 #~ msgid ""
 #~ "This is a complete document management system:\n"
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index a0acb481fd7..6cceaa63c9e 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:23+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 23:02+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -44,6 +44,9 @@ msgid ""
 "Either ask admin to enforce an account for this template or get yourself a "
 "personal email account."
 msgstr ""
+"No se le han configurado cuentas de correo electrónico personales. \n"
+"Puede pedir al administrador que fuerce una cuenta para esta plantilla o que "
+"le cree una cuenta de correo electrónico personal."
 
 #. module: email_template
 #: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
@@ -53,6 +56,10 @@ msgid ""
 "profile fields so that their names or other partner related information can "
 "be automatically inserted in it."
 msgstr ""
+"Una plantilla de correo electrónico es un documento de correo electrónico "
+"que se enviará como parte de una campaña de marketing. Puede personalizarlo "
+"en base a campos específicos del perfil del cliente para que su nombre u "
+"otra información de la empresa se puedan insertar automáticamente."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -60,9 +67,9 @@ msgid "Personal Emails"
 msgstr "Emails personales"
 
 #. module: email_template
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de la acción"
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Fichero del informe"
 
 #. module: email_template
 #: view:email.template:0
@@ -123,7 +130,7 @@ msgstr "Enviar ahora"
 #. module: email_template
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr "No aplica"
+msgstr "No aplicable"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -151,12 +158,6 @@ msgstr ""
 msgid "Server Reference of mail"
 msgstr "Servidor de referencia del mail"
 
-#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Reason: %s"
-msgstr "Razones: %s"
-
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
@@ -169,6 +170,8 @@ msgid ""
 "Carbon Copy address(es), comma-separated. Placeholders can be used here. "
 "e.g. ${object.email_cc}"
 msgstr ""
+"Dirección(es) de correo CC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_cc}"
 
 #. module: email_template
 #: view:email.template:0
@@ -187,12 +190,9 @@ msgid ""
 "Email, unless it is already specified in the From Email, e.g: John Doe "
 "<john@doe.com>"
 msgstr ""
-
-#. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr "A"
+"La descripción se utiliza como el nombre del remitente, junto con el email "
+"Desde proporcionado, a menos que ya se haya especificado en el email Desde, "
+"por ejemplo: Ramon Vives <rvives@empresa.com>"
 
 #. module: email_template
 #: field:email.template,from_account:0
@@ -243,7 +243,7 @@ msgstr "Asistente completado"
 #: field:email_template.preview,reply_to:0
 #: field:email_template.send.wizard,reply_to:0
 msgid "Reply-To"
-msgstr "Responder-A"
+msgstr "Responder a"
 
 #. module: email_template
 #: view:email.template:0
@@ -286,12 +286,6 @@ msgstr "Auto eliminar"
 msgid "Both HTML & Text (Alternative)"
 msgstr "Ambos HTML & texto (alternativos)"
 
-#. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Mako templates not installed"
-msgstr "Plantillas mako no instaladas"
-
 #. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
@@ -346,6 +340,9 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Sugerencia: Los mensajes de correo múltiples se envían en el mismo idioma "
+"(se propone el idioma del primero). Le sugerimos que envíe los mensajes de "
+"correo en grupos según el idioma."
 
 #. module: email_template
 #: help:email_template.preview,reply_to:0
@@ -354,6 +351,8 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here."
 msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores."
 
 #. module: email_template
 #: field:email.template,def_subject:0
@@ -364,9 +363,10 @@ msgid "Subject"
 msgstr "Asunto"
 
 #. module: email_template
-#: view:email_template.mailbox:0
-msgid "My Emails"
-msgstr "Mis emails"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr "Razones: %s"
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
@@ -374,14 +374,21 @@ msgid "From"
 msgstr "De"
 
 #. module: email_template
-#: field:email.template,file_name:0
-msgid "Report Filename"
-msgstr "Fichero del informe"
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Plantilla"
 
 #. module: email_template
-#: selection:email_template.mailbox,state:0
-msgid "Sending"
-msgstr "Enviando"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+"El correo desde la cuenta %s ha fallado. Causa probable: Error envío "
+"servidor\n"
+" Descripción: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -399,6 +406,8 @@ msgid ""
 "Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
 "here. e.g. ${object.email_bcc}"
 msgstr ""
+"Dirección(es) de correo BCC, separadas por comas. Se pueden usar marcadores, "
+"por ejemplo ${object.email_bcc}"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -444,11 +453,6 @@ msgstr "Fallo de test de connexión saliente"
 msgid "Mail from Account %s successfully Sent."
 msgstr "Correo desde la cuenta %s enviado correctamente."
 
-#. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
@@ -482,6 +486,9 @@ msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here. e.g. ${object.email_reply_to}"
 msgstr ""
+"La dirección de correo a la que los destinatarios deberían responder, si es "
+"distinta de la dirección Desde. Se pueden usar marcadores, por ejemplo "
+"${object.email_reply_to}"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
@@ -489,6 +496,8 @@ msgid ""
 "Button in the side bar of the form view of this Resource that will invoke "
 "the Window Action"
 msgstr ""
+"Botón en la barra lateral de la vista de formulario de este recurso que "
+"llamará a la acción de ventana."
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
@@ -507,12 +516,6 @@ msgstr "Adjuntar mi firma al mail"
 msgid "Report"
 msgstr "Informe"
 
-#. module: email_template
-#: field:email_template.preview,ref_template:0
-#: field:email_template.send.wizard,ref_template:0
-msgid "Template"
-msgstr "Plantilla"
-
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
@@ -525,9 +528,9 @@ msgid "Advanced"
 msgstr "Avanzado"
 
 #. module: email_template
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Argumentos no válidos"
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mis emails"
 
 #. module: email_template
 #: view:email.template:0
@@ -535,9 +538,13 @@ msgid "Expression Builder"
 msgstr "Constructor de expresiones"
 
 #. module: email_template
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Cuando se utiliza un campo de relación, este campo mostrará el tipo de campo "
+"que ha seleccionado."
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -578,11 +585,15 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
+"Active esta opción si desea incluir un marcador de seguimiento especial en "
+"los correos electrónicos salientes para que pueda identificar las respuestas "
+"y enlazarlas de nuevo al registro del recurso correspondiente. Esto es útil "
+"para iniciativas de CRM, por ejemplo."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
-msgstr ""
+msgstr "Cuerpo (con etiquetas HTML)"
 
 #. module: email_template
 #: field:email.template,use_sign:0
@@ -707,10 +718,9 @@ msgid "Mail Contents"
 msgstr "Contenidos mail"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
+#: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr "El nombre de la plantilla debe de ser único"
+msgstr "¡El nombre de la plantilla debe ser único!"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -730,11 +740,6 @@ msgstr "Texto plano"
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: email_template
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
@@ -778,7 +783,7 @@ msgstr "Saliente"
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
-msgstr ""
+msgstr "Extracción de fecha y hora ha fallado. Fecha:%s \tError:%s"
 
 #. module: email_template
 #: help:email.template,use_sign:0
@@ -813,13 +818,6 @@ msgstr "Plantillas email"
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#. module: email_template
-#: help:email.template,attachment_ids:0
-msgid ""
-"You may attach existing files to this template, so they will be added in all "
-"emails created from this template"
-msgstr ""
-
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
@@ -848,7 +846,7 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
-"El correo de la cuenta %s ha fallado. Probable razón: Error MIME \n"
+"El correo de la cuenta %s ha fallado. Causa probable: Error MIME \n"
 "Descripción: %s"
 
 #. module: email_template
@@ -862,7 +860,6 @@ msgid "Language"
 msgstr "Idioma"
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/email_template_account.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
@@ -883,6 +880,12 @@ msgstr "Enviar / recibir"
 msgid "Send Mail"
 msgstr "Enviar mail"
 
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Suspendida"
+
 #. module: email_template
 #: help:email.template,allowed_groups:0
 msgid ""
@@ -900,7 +903,7 @@ msgstr "Enviar mail (%s)"
 #. module: email_template
 #: help:email.template,def_subject:0
 msgid "The subject of email. Placeholders can be used here."
-msgstr ""
+msgstr "El asunto del correo. Se pueden usar marcadores."
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
@@ -910,7 +913,7 @@ msgstr "Nombre del fichero del informe"
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr "Expressión"
+msgstr "Expresión"
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -918,12 +921,6 @@ msgstr "Expressión"
 msgid "History"
 msgstr "Historial"
 
-#. module: email_template
-#: code:addons/email_template/email_template.py:0
-#, python-format
-msgid "Django templates not installed"
-msgstr "Plantillas Django no instaladas"
-
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
@@ -934,9 +931,10 @@ msgid "Attachments"
 msgstr "Adjuntos"
 
 #. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "A"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
@@ -971,29 +969,26 @@ msgid "Error sending mail: %s"
 msgstr "Error enviando correo electrónico: %s"
 
 #. module: email_template
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr "Error: No se le permite tener más de una cuenta."
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
 msgstr "Cuerpo (HTML- cliente web únicamente)"
 
-#. module: email_template
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr "%s (documento adjunto al email)"
 
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Enviando"
+
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
@@ -1015,10 +1010,14 @@ msgid "Actions"
 msgstr "Acciones"
 
 #. module: email_template
-#: view:email_template.account:0
-#: selection:email_template.account,state:0
-msgid "Suspended"
-msgstr "Suspendida"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+"Error envío servidor\n"
+"Descripción: %s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1052,7 +1051,7 @@ msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
-"El envío del correo %s ha fallado. Probable razón: No se pudo conectar con "
+"El envío del correo %s ha fallado. Causa probable: No se pudo conectar con "
 "el servidor\n"
 "Error: %s"
 
@@ -1089,13 +1088,13 @@ msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
 msgstr "Entre el nombre del servidor saliente, p.ej. smtp.sudominio.com"
 
 #. module: email_template
-#: help:email.template,sub_object:0
+#: help:email.template,attachment_ids:0
 msgid ""
-"When a relation field is used this field will show you the type of field you "
-"have selected"
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
 msgstr ""
-"Cuando se utiliza un campo de relación, este campo mostrará el tipo de campo "
-"que ha seleccionado."
+"Puede adjuntar archivos existentes a esta plantilla, por lo que se añadirán "
+"en todos los correos electrónicos creados a partir de esta plantilla."
 
 #. module: email_template
 #: help:email.template,message_id:0
@@ -1104,6 +1103,9 @@ msgid ""
 "that this overrides the Resource tracking option! Placeholders can be used "
 "here."
 msgstr ""
+"Indique el ID del mensaje del encabezado SMTP para utilizar en los correos "
+"electrónicos salientes. ¡Tenga en cuenta que esto anula la opción de "
+"seguimiento de recursos! Se pueden usar marcadores."
 
 #. module: email_template
 #: field:email.template,def_to:0
@@ -1114,7 +1116,7 @@ msgstr "Receptores (A)"
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Valor nulo"
 
 #. module: email_template
 #: field:email.template,template_language:0
@@ -1134,10 +1136,17 @@ msgstr "CC"
 msgid "Sent"
 msgstr "Enviado"
 
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr "¡Ya existe otra configuración con este ID de correo electrónico!"
+
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
 msgid "Action that will open this email template on Resource records"
 msgstr ""
+"Acción que abrirá esta plantilla de correo electrónico en los registros de "
+"estos recursos."
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
@@ -1151,6 +1160,9 @@ msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
 msgstr ""
+"El valor del ID del mensaje del encabezado, si necesita especificarlo, por "
+"ejemplo, para reconocer automáticamente las respuestas más tarde. Se pueden "
+"usar marcadores."
 
 #. module: email_template
 #: view:email_template.mailbox:0
@@ -1196,6 +1208,8 @@ msgid ""
 "The Recipient of email. Placeholders can be used here. e.g. "
 "${object.email_to}"
 msgstr ""
+"El destinatario del correo electrónico. Se pueden usar marcadores, por "
+"ejemplo ${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
@@ -1236,7 +1250,7 @@ msgstr "Modelo"
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "No existe conexión principal para el ID indicado"
 
 #. module: email_template
 #: field:email_template.account,company:0
@@ -1251,6 +1265,9 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"El correo desde la cuenta %s ha fallado en la autenticación. Causa probable: "
+"No se puede autenticar al servidor\n"
+"Error: %s"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
@@ -1298,7 +1315,7 @@ msgstr "plantilla email"
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
-"El correo de la cuenta %s ha fallado. Probable razón: Cuenta no aprobada"
+"El correo de la cuenta %s ha fallado. Causa probable: Cuenta no aprobada"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
@@ -1316,3 +1333,38 @@ msgstr "Contiene datos adjuntos"
 #, python-format
 msgid "No Description"
 msgstr "Sin descripción"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de la acción"
+
+#, python-format
+#~ msgid "Mako templates not installed"
+#~ msgstr "Plantillas mako no instaladas"
+
+#, python-format
+#~ msgid "Django templates not installed"
+#~ msgstr "Plantillas Django no instaladas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos no válidos"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 04ea01915e2..1dbb0de48d2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -239,7 +239,7 @@
                               domain="[('user_id','=',uid)]"/>
                         </field>
                         <field name="date_begin" select="1"/>
-                        <field name="section_id" default="context.get('section_id', False)" widget="selection" groups="base.group_extended">
+                        <field name="section_id" widget="selection" groups="base.group_extended">
                           <filter icon="terp-personal+"
                                   context="{'invisible_section': False}"
                                   domain="[('section_id.user_id','=',uid)]"
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 44135672af5..8d5c058b120 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -6,43 +6,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 11:27+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:43+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Información de factura"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Indicar número máximo de registros"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Detalles de evento"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Ponente principal"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -50,14 +50,14 @@ msgid "Minimum Registrations"
 msgstr "Registros mínimos"
 
 #. module: event
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr "Confirmación para registro de evento"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -67,23 +67,23 @@ msgstr "Email de registro"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Realizar facturas"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Fecha de registro"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "Ponente que dará una conferencia en el evento."
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Cerrar"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -97,11 +97,14 @@ msgid ""
 "event. Note that you can specify for each registration a specific amount if "
 "you want to"
 msgstr ""
+"Este será el precio por defecto usado como precio de registro cuando se "
+"facture este evento. Tenga en cuenta que puede indicar una cantidad "
+"específica para cada registro si lo desea."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -112,7 +115,7 @@ msgstr "Email de confirmación"
 #: code:addons/event/wizard/event_make_invoice.py:0
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "El registro no tiene ninguna empresa para facturar."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -120,17 +123,12 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
-
-#. module: event
-#: help:event.event,pricelist_id:0
-msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Fecha factura"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:0
@@ -145,12 +143,12 @@ msgstr "Registro evento"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 7 Days"
-msgstr ""
+msgstr "Últimos 7 días"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Evento padre"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -160,7 +158,7 @@ msgstr "Crear factura"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
 
 #. module: event
 #: view:report.event.registration:0
@@ -170,12 +168,12 @@ msgstr "Evento en el registro"
 #. module: event
 #: view:report.event.registration:0
 msgid "Current Events"
-msgstr ""
+msgstr "Eventos actuales"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Añadir nota interna"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -183,12 +181,12 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr ""
+msgstr "Análisis de eventos"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -212,17 +210,22 @@ msgstr "Confirmar evento"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr "Enviar nuevo email"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder a"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 msgid "Event Dashboard"
-msgstr ""
+msgstr "Tablero de eventos"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -232,7 +235,7 @@ msgstr "Ópera de Verdi"
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Tarifa"
 
 #. module: event
 #: field:event.registration,contact_id:0
@@ -242,43 +245,23 @@ msgstr "Contacto empresa"
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "evento.registro.credencial"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr ""
+msgstr "Fecha de cierre del evento."
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
-
-#. module: event
-#: model:ir.module.module,description:event.module_meta_information
-msgid ""
-"Oraganization and management of Event.\n"
-"\n"
-"    This module allow you\n"
-"        * to manage your events and their registrations\n"
-"        * to use emails to automatically confirm and send acknowledgements "
-"for any registration to an event\n"
-"        * ...\n"
-"    A dashboard for associations that includes:\n"
-"    * Registration by Events (graph)\n"
-"    Note that:\n"
-"    - You can define new types of events in\n"
-"                Events / Configuration / Types of Events\n"
-"    - You can access predefined reports about number of registration per "
-"event or per event category in:\n"
-"                Events / Reporting\n"
-msgstr ""
+msgstr "Emails"
 
 #. module: event
 #: view:event.registration:0
@@ -286,12 +269,10 @@ msgid "Extra Info"
 msgstr "Información extra"
 
 #. module: event
-#: view:event.event:0
-#: view:event.registration:0
-#: field:event.registration.badge,registration_id:0
-#: model:ir.actions.act_window,name:event.act_event_list_register_event
-msgid "Registration"
-msgstr "Registro"
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
 
 #. module: event
 #: selection:event.event,state:0
@@ -307,7 +288,7 @@ msgstr "Tipo de evento"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Tipo de evento "
 
 #. module: event
 #: view:event.event:0
@@ -326,7 +307,7 @@ msgstr "Evento"
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr ""
+msgstr "Credenciales"
 
 #. module: event
 #: view:event.event:0
@@ -343,9 +324,9 @@ msgid "Registration Confirmation"
 msgstr "Confirmación del registro"
 
 #. module: event
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr "Versión de tarifa para el evento actual."
 
 #. module: event
 #: help:event.event,product_id:0
@@ -354,48 +335,58 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Las facturas de este registro de evento se crearán con este producto. Por lo "
+"tanto le permite asignar la etiqueta por defecto y la información contable "
+"que desee por defecto en estas facturas."
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Varios"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Otros ponentes"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Hacer factura de evento"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Número de registros o entradas"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: event
-#: view:event.registration:0
-msgid "Send New Email"
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low-level object used by meeting and others documents that have "
+"to be synchronized with mobile or calendar applications through caldav. Most "
+"of the users should work on the Calendar menu, and not on the list of events."
 msgstr ""
+"El evento es el objeto de bajo nivel utilizado por las reuniones y otros "
+"documentos que tienen que ser sincronizados con móviles o aplicaciones de "
+"calendario mediante caldav. La mayor parte de los usuarios trabajarán en el "
+"menú calendario, y no en la lista de eventos."
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Ubicación"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -417,7 +408,7 @@ msgstr "Tipo"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -428,18 +419,12 @@ msgstr "Para ser facturado"
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
-
-#. module: event
-#: code:addons/event/wizard/event_confirm_registration.py:0
-#, python-format
-msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "¡Error!"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: event
 #: view:event.event:0
@@ -452,17 +437,17 @@ msgstr "Cancelar registro"
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "La empresa registrada no tiene una dirección de facturación."
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr ""
+msgstr "Tipo de evento como seminario, exhibición, conferencia, formación."
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -478,27 +463,22 @@ msgstr ""
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrati./event/event.py:41:ons"
-msgstr ""
+msgstr "Total de registros previstos."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr ""
-
-#. module: event
-#: model:ir.model,name:event.model_event_confirm_registration
-msgid "Event Registraion"
-msgstr ""
+msgstr "Organización del evento"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Información histórica"
 
 #. module: event
 #: view:event.registration:0
@@ -512,15 +492,18 @@ msgid "Confirm Anyway"
 msgstr "Confirmar de todos modos"
 
 #. module: event
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+#: code:addons/event/wizard/event_confirm_registration.py:0
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr "Aviso: El evento '%s' ha alcanzado su límite máximo (%s)."
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
-#, python-format
-msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr "Registro"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
@@ -534,6 +517,9 @@ msgid ""
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
 msgstr ""
+"Cuando se crea el evento, el estado es 'Borrador'. Si se confirma para unas "
+"fechas en concreto, el estado es 'Confirmado'. Si ya ha pasado, el estado es "
+"'Realizado'. Si se cancela el evento, el estado es 'Cancelado'."
 
 #. module: event
 #: view:event.event:0
@@ -544,12 +530,12 @@ msgstr "Cancelar evento"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Últimos 30 días"
 
 #. module: event
 #: view:event.event:0
@@ -557,24 +543,19 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
-
-#. module: event
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+msgstr "Empresa"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Estado asistencia a eventos"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Agrupar las facturas"
 
 #. module: event
 #: view:event.event:0
@@ -600,7 +581,7 @@ msgstr "Empresa facturada"
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Registros"
 
 #. module: event
 #: view:event.event:0
@@ -610,33 +591,33 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Nombre factura"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " Nº de registros en borrador"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: event
 #: view:event.event:0
@@ -644,55 +625,77 @@ msgid "Event Done"
 msgstr "Evento realizado"
 
 #. module: event
-#: help:event.event,register_current:0
-msgid "Total of Open and Done Registrations"
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of Event.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"    A dashboard for associations that includes:\n"
+"    * Registration by Events (graph)\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in:\n"
+"                Events / Reporting\n"
 msgstr ""
+"Organización y gestión de eventos.\n"
+"\n"
+"    Este módulo le permite\n"
+"        * Gestionar sus eventos y sus registros\n"
+"        * Utilizar emails para confirmar y enviar acuses automáticamente "
+"para cada registro a un evento\n"
+"        * ...\n"
+"    Un tablero para asociaciones que incluye:\n"
+"        * Registros por evento (gráfico)\n"
+"    Tenga en cuenta que:\n"
+"    - Puede definir nuevos tipos de eventos en\n"
+"                Eventos / Configuración / Tipos de eventos\n"
+"    - Puede acceder a informes predefinidos sobre número de registros por "
+"evento o por categoría de evento en:\n"
+"                Eventos / Informes\n"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "¡Error! No puede crear eventos recursivos."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referencia 2"
 
 #. module: event
 #: code:addons/event/event.py:0
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Mis eventos"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Ponentes"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
-
-#. module: event
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
+msgstr "Crear facturas"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -701,29 +704,29 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Fecha de inicio"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
-
-#. module: event
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+msgstr "Cerrado"
 
 #. module: event
 #: view:event.event:0
@@ -743,23 +746,23 @@ msgstr "Número de registro"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Eventos hijos"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "desconocido"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
@@ -772,12 +775,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de escritura"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Mis registros"
 
 #. module: event
 #: view:event.confirm:0
@@ -785,52 +788,61 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Aviso: Este evento no ha llegado a su límite de registros mínimo. ¿Está "
+"seguro que desea confirmarlo?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"La dirección de correo usada como 'Responder a' de todos los correos "
+"enviados por OpenERP."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr "Total de registros abiertos y realizados."
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Estas personas recibirán un email."
 
 #. module: event
 #: view:event.event:0
@@ -851,17 +863,17 @@ msgstr "Confirmación registro"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Tablero"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Cuerpo mensaje de confirmación"
 
 #. module: event
 #: view:event.registration:0
@@ -872,7 +884,7 @@ msgstr "Histórico"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Dirección ubicación"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -883,13 +895,13 @@ msgstr "Tipos de eventos"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "El evento asociado no tiene ningún producto definido"
 
 #. module: event
 #: view:event.event:0
@@ -899,12 +911,12 @@ msgstr "Correo de confirmación automático"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Últimos 365 días"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "¡Error! La fecha de cierre no puede ser anterior a la de inicio."
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -919,7 +931,7 @@ msgstr "Realizado"
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr "Fecha inicio"
+msgstr "Fecha de inicio"
 
 #. module: event
 #: view:event.registration:0
@@ -927,6 +939,12 @@ msgstr "Fecha inicio"
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "Año"
+
 #. module: event
 #: code:addons/event/event.py:0
 #, python-format
@@ -938,12 +956,12 @@ msgstr "Cancelar"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Eventos por registro"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -954,13 +972,13 @@ msgstr "Abrir"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuario responsable"
 
 #. module: event
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Autoconfirmación: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -969,20 +987,20 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Coste registro"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -994,12 +1012,12 @@ msgstr "Precio unitario"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Ponente"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1012,18 +1030,18 @@ msgstr "Conferencia en negocios ERP"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Equipo de ventas"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Fecha de cierre"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -1038,27 +1056,27 @@ msgstr "Producto"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " Nº de registros confirmados"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Suscribir"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Registro de eventos"
 
 #. module: event
 #: help:event.event,mail_registr:0
@@ -1074,50 +1092,50 @@ msgstr "Entrada para conferencia"
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Próximos eventos"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Suscribir"
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Fecha de inicio del evento."
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "No confirmado"
 
 #. module: event
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Auto registro: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Tablero de asociación"
 
 #. module: event
 #: view:event.event:0
@@ -1137,13 +1155,13 @@ msgstr ""
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: event
-#: view:report.event.registration:0
-#: field:report.event.registration,year:0
-msgid "Year"
-msgstr ""
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr "El registro está marcado como no facturable."
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -1152,18 +1170,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Cerrar registro"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1203,7 @@ msgstr "Registros"
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1196,35 +1214,30 @@ msgstr "Registros máximos"
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Fecha inicio evento"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Cuerpo correo del registro"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Evento a registrarse"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
-
-#. module: event
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Error: Código EAN erróneo"
+msgstr "No se puede crear la factura si el registro está en estado '%s'."
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Confirmación del evento"
 
 #. module: event
 #: view:event.event:0
@@ -1236,17 +1249,17 @@ msgstr "Correo de registro automático"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Providee Minimum Number of Registrations"
-msgstr ""
+msgstr "Introduzca el número mínimo de registros."
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Ponente confirmado"
 
 #~ msgid "Ending date"
 #~ msgstr "Fecha de finalización"
@@ -1308,6 +1321,12 @@ msgstr ""
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Draft Registrations"
 #~ msgstr "Registros borrador"
 
@@ -1323,6 +1342,9 @@ msgstr ""
 #~ msgid "Invoice Rejected"
 #~ msgstr "Factura rechazada"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
 #~ msgid "Registration Invoiced"
 #~ msgstr "Registro facturado"
 
@@ -1335,6 +1357,12 @@ msgstr ""
 #~ msgid "Registration By Event Types"
 #~ msgstr "Registro por tipos de evento"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
 #~ msgid "Events On Registrations"
 #~ msgstr "Eventos en los registros"
 
@@ -1353,6 +1381,12 @@ msgstr ""
 #~ msgid "Events on registrations"
 #~ msgstr "Eventos en los registros"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Events Organisation"
 #~ msgstr "Organización de eventos"
 
@@ -1416,3 +1450,6 @@ msgstr ""
 #~ "    - Puede acceder a informes predefinidos referentes al número de "
 #~ "registros por evento o por categoría de evento en\n"
 #~ "                Eventos / Informe\n"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index 726f18a8217..a1ca5dc294f 100644
--- a/addons/event_project/i18n/es.po
+++ b/addons/event_project/i18n/es.po
@@ -6,26 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 03:57+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 18:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Proyecto de evento"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: event_project
 #: view:event.project:0
@@ -40,6 +40,10 @@ msgid ""
 "    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Organización y gestión de eventos.\n"
+"\n"
+"    Este módulo le permite crear retro planificaciones para gestionar sus "
+"eventos.\n"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -48,23 +52,25 @@ msgid ""
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
 msgstr ""
-
-#. module: event_project
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+"Esta es la plantilla de proyecto. El proyecto de evento es un duplicado de "
+"esta plantilla. Tras hacer clic en 'Crear retro-planificación', el nuevo "
+"proyecto será duplicado a partir de esta plantilla."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "Retro-planificación"
 
 #. module: event_project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Crear retro-planificación"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "¡Error! La fecha final no puede ser anterior a la inicial."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -74,17 +80,13 @@ msgstr "Proyecto"
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "Plantilla de proyecto"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event Project - Create Retro-Planning to manage your Events"
 msgstr ""
-
-#. module: event_project
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+"Proyecto de evento - Crea retro-planificación para gestionar sus eventos"
 
 #. module: event_project
 #: view:event.event:0
@@ -100,17 +102,17 @@ msgstr "Tareas del proyecto"
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr "Crear retro-planificación"
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "¡Error! No puede crear eventos recursivos."
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
@@ -122,6 +124,9 @@ msgstr "Evento"
 msgid "Tasks management"
 msgstr "Gestión de tareas"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Remaining Tasks"
 #~ msgstr "Tareas pendientes"
 
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index f9bcad0cd5c..49bb46ac336 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:34+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 19:51+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -207,7 +208,7 @@ msgstr "Contraseña"
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -228,7 +229,7 @@ msgstr "Información servidor"
 #. module: fetchmail
 #: help:email.server,attach:0
 msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "Si está marcado, obtiene correo con documentos adjuntos."
 
 #. module: fetchmail
 #: selection:email.server,type:0
@@ -271,6 +272,8 @@ msgid ""
 "An Email Server Action. It will be run whenever an e-mail is fetched from "
 "server."
 msgstr ""
+"Una acción de servidor de correo. Se ejecutará siempre que se obtenga un "
+"email desde el servidor."
 
 #. module: fetchmail
 #: help:email.server,priority:0
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
new file mode 100644
index 00000000000..4b871cc176f
--- /dev/null
+++ b/addons/fetchmail/i18n/pt.po
@@ -0,0 +1,282 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 17:30+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Reply Email"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Definir como rascunho"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "Servidores POP/IMAP"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nome de utilizador"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid "OpenObject Model. Generates a record of this model."
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Email Servers"
+msgstr "Servidores de correio"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "Copy text   \t SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "Servidor IMAP"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Senha"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tipo de servidor"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Informação do servidor"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "Servidor POP"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Servidor de correio"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f8c92db4693..076c207f850 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -340,7 +340,7 @@
                             <field name="requirements" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Employee">
-                            <field name="employee_ids" colspan='4' nolabel="1"  mode="tree,form"/>
+                            <field name="employee_ids" colspan='4' nolabel="1" widget="many2many" mode="tree,form"/>
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 2e6ba54e3d3..4e60513d561 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 16:24+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 15:57+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -41,7 +40,7 @@ msgstr "Link zu Mitarbeiter zur Information"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "SIN No"
+msgstr "KV-Nummer"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -64,11 +63,6 @@ msgstr "Gruppierung..."
 msgid "Work E-mail"
 msgstr "E-Mail Arbeit"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -88,7 +82,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr "Kennzeichne als Abgelaufen"
+msgstr "Stelle ist abgelaufen"
 
 #. module: hr
 #: view:hr.job:0
@@ -98,7 +92,7 @@ msgstr "Arbeitsstellen"
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr "In Einstellungsverfahren"
+msgstr "Stelle besetzen"
 
 #. module: hr
 #: view:hr.installer:0
@@ -116,7 +110,7 @@ msgstr "Firma"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr "Erwarte Stellenangebot"
+msgstr "Freie Stellen"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
@@ -198,7 +192,7 @@ msgstr ""
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr "In Einstellungsprozess"
+msgstr "Stelle besetzen"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -208,7 +202,7 @@ msgstr "Identifiaktionsnr."
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr "Mitarbeiternr."
+msgstr "Anzahl Mitarbeiter"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -219,14 +213,12 @@ msgstr "Weiblich"
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
-msgstr ""
-"Verfolgung und Hilfe bei der Erfassung und Genehmigung von Mitarbeiter "
-"Arbeitszeiten."
+msgstr "Erfassung, Genehmigung und Kontrolle von Mitarbeiter Arbeitszeiten."
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr "Regelmässige Mitarbeiterbeurteilungen"
+msgstr "Personalbeurteilung"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
@@ -241,7 +233,7 @@ msgstr "Mitarbeiter Struktur"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "Sozialversicherungsnummer"
+msgstr "Sozialversicherung"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
@@ -265,11 +257,6 @@ msgstr "Unterkategorien"
 msgid "Job Description"
 msgstr "Stellenbeschreibung"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -286,28 +273,18 @@ msgstr "Personalausweis"
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Mitabeiter"
+msgstr "Mitarbeiter"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
 msgstr "Weitere Informationen"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Kontakt Adresse Arbeit"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Konfiguration Personalwesen"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -339,7 +316,7 @@ msgstr "Arbeitsstelle"
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr "Mitglieder"
+msgstr "Mitarbeiter"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -356,15 +333,10 @@ msgstr "Kategorien"
 msgid "Expected Employees"
 msgstr "Stellenbedarf"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr "Sozialversicherungsnr."
+msgstr "Nummer Krankenversicherung"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -410,7 +382,7 @@ msgstr "Mitarbeiterkategorien"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Mitabeiter  Kategorien"
+msgstr "Mitarbeiter  Kategorie"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
@@ -436,11 +408,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -449,7 +416,7 @@ msgstr "Verlinkt mit dem Abteilungsleiter"
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr "Einstellungsverfahren"
+msgstr "Personalbeschaffung"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -474,34 +441,41 @@ msgstr ""
 "Durch die Definition Ihrer Mitarbeiter und der gezielten Zuordnung von "
 "bestimmten Eigenschaften können Sie hier Ihre Personalressourcen definieren. "
 "Verwalten Sie alle Informationen zu Mitarbeitern und verfolgen Sie alle "
-"Informationen. Über den\r\n"
-"Aktenreiter Informationen zur Person können Sie alle Daten zur "
-"Identifizierung von Mitarbeitern verwalten. Über den Aktenreiter Kategorien "
-"sollten Sie dem Mitarbeiter dessen Funktion sowie Arbeitsbereich zuweisen. "
-"Eine Kategorie kann dabei zum Beispiel eine Arbeitsgruppe sein. Der "
-"Aktenreiter Zeiterfassung ermöglicht die Zuweisung eines bestimmten "
+"Informationen. Über den Aktenreiter Persönliche Info können Sie alle Daten "
+"zur Identifizierung von Mitarbeitern verwalten. Über den Aktenreiter "
+"Kategorien sollten Sie dem Mitarbeiter dessen Funktion sowie Arbeitsbereich "
+"zuweisen. Eine Kategorie kann dabei zum Beispiel eine Arbeitsgruppe sein. "
+"Der Aktenreiter Zeiterfassung ermöglicht die Zuweisung eines bestimmten "
 "Formulars sowie eines analytischen Kontos für die Arbeitszeiterfassung. Der "
-"Aktenreiter Bemerkungen ermöglicht die Erfassung eines Freitextes."
+"Aktenreiter Bemerkungen ermöglicht die Erfassung eines Freitextes zur freien "
+"Verfügung."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Mitarbeiterkonto"
+msgstr "Mitarbeiter Bankverbindung"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
 msgstr "Bemerkung"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
+"diesen Benutzer"
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Kontakt Information"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Arbeitgeberanschrift"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -549,7 +523,7 @@ msgstr "Urlaub und Abwesenheit"
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "SSN No"
+msgstr "RV-Nummer"
 
 #. module: hr
 #: view:hr.employee:0
@@ -579,18 +553,23 @@ msgstr ""
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr "Stellenbedarf für diese Arbeit"
+msgstr "Personalbedarf für diese Arbeitsstelle"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr "Alt"
+msgstr "Stelle ist abgelaufen"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
 msgstr "Beschreibung Status"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Sie können nicht zwei gleichzeitige Benutzeranmeldungen haben!"
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -609,7 +588,7 @@ msgstr "Familienstand"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr "Hilfe beim Management und Rückverfolgung von Einstellungen."
+msgstr "Verwaltung und Rückverfolgung des Einstellungsprozederes."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
@@ -636,14 +615,6 @@ msgstr "Personalabrechnung"
 msgid "Personal Information"
 msgstr "Persönliche Info"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -655,8 +626,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
-"Rückverfolgung von Mitarbeiter Aufwendungen sowie automatische "
-"Weiterberechnung an Kunden im Rahmen der Projektabrechnung."
+"Rückverfolgung von Personalspesen sowie automatische Weiterberechnung an "
+"Kunden im Rahmen der Projektabrechnung."
 
 #. module: hr
 #: view:hr.job:0
@@ -710,7 +681,7 @@ msgstr "Stellenbezeichnung"
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr "In Arbeitsstelle"
+msgstr "Stelle ist besetzt"
 
 #. module: hr
 #: view:hr.department:0
@@ -737,7 +708,7 @@ msgstr ""
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "Pinnwand Personalleitung"
+msgstr "Pinnwand Personalmanagement"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -779,7 +750,7 @@ msgstr "Abteilung Bezeichnung"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "Sozialversicherungsnr."
+msgstr "Nummer Rentenversicherung"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -806,7 +777,7 @@ msgstr "Mentor"
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr "Mitarbeiterausgaben"
+msgstr "Personalspesen"
 
 #. module: hr
 #: view:hr.department:0
@@ -829,7 +800,7 @@ msgid ""
 "process to evaluate the applicants for this job position."
 msgstr ""
 "Arbeitstellen werden zur Definition von Arbeitsstellen in Ihrem Unternehmen "
-"sowie der Erfassung für den Stellenbedarf eingesetzt. Sie können ein "
+"sowie zur Erfassung für den Stellenbedarf eingesetzt. Sie können ein "
 "Formular zur Personalbefragung einer Arbeitsstelle hinzufügen. Diese "
 "Befragung kann im Rahmen einer Einstellung dann für das  Bewerbungsgespräch "
 "eingesetzt werden."
@@ -837,7 +808,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Gruppen Mitarbeiter"
+msgstr "Unterstellte Mitarbeiter"
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Arbeitszeiten Kategorien"
@@ -872,6 +843,9 @@ msgstr "Gruppen Mitarbeiter"
 #~ msgid "Fill up contact information"
 #~ msgstr "Ergänze Kontaktinformation"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Divorced"
 #~ msgstr "Geschieden"
 
@@ -917,6 +891,12 @@ msgstr "Gruppen Mitarbeiter"
 #~ msgid "Timesheet Line"
 #~ msgstr "Zeiterfassung Positionen"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Working Time"
 #~ msgstr "Arbeitszeit"
 
@@ -952,3 +932,18 @@ msgstr "Gruppen Mitarbeiter"
 
 #~ msgid "Parents"
 #~ msgstr "Übergeordnete Begriffe"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 86683edcacd..c36afc154ca 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 11:45+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:41+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 0b667d7a67c..1296d2ab2ef 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-27 06:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 11:58+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -63,11 +63,6 @@ msgstr "Agrupar Por..."
 msgid "Work E-mail"
 msgstr "E-mail Trabalho"
 
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de módulo inválido na definição da acção"
-
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
@@ -258,11 +253,6 @@ msgstr "Categorias Descendentes"
 msgid "Job Description"
 msgstr "Descrição do Cargo"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
@@ -286,21 +276,11 @@ msgstr "Empregado"
 msgid "Other information"
 msgstr "Outra Informação"
 
-#. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Endereço de Trabalho"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
 msgstr "Configuração da Aplicação de Gestão de Recursos Humanos"
 
-#. module: hr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
@@ -349,11 +329,6 @@ msgstr "Categorias"
 msgid "Expected Employees"
 msgstr "Empregados Esperados"
 
-#. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista !"
-
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
@@ -429,11 +404,6 @@ msgstr ""
 msgid "hr.department"
 msgstr "hr.department"
 
-#. module: hr
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
@@ -489,15 +459,22 @@ msgstr "Conta bancária do mepregado"
 msgid "Note"
 msgstr "Nota"
 
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não faz parte das possíveis de serem selecionadas para "
+"este utilizador"
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
 #. module: hr
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Não pode criar menus recursivos."
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Endereço de Trabalho"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -585,6 +562,11 @@ msgstr "Antigo"
 msgid "Status Description"
 msgstr "Descrição do Estado"
 
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não se pode ter dois utilizadores com os mesmos dados de acesso"
+
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
@@ -630,14 +612,6 @@ msgstr "Contabilidade do Processamento de Salários"
 msgid "Personal Information"
 msgstr "Informação Pessoal"
 
-#. module: hr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-"especial!"
-
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
@@ -880,3 +854,27 @@ msgstr "Subordinados"
 
 #~ msgid "Parents"
 #~ msgstr "Ascendentes"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de módulo inválido na definição da acção"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Não pode criar menus recursivos."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura de vista !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index c0a2ed427a0..d2ce108cdd0 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 17:37+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 20:17+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -27,11 +26,6 @@ msgstr "Zeiterfassung"
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
@@ -63,7 +57,7 @@ msgstr "Begründung"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr "Anwesenheitszeiten"
+msgstr "Ausdruck fehlerhafte Anwesenheit"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
@@ -72,16 +66,14 @@ msgid "The sign-out date must be in the past"
 msgstr "Das Abmeldedatum muss in der Vergangenheit sein"
 
 #. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-#: view:hr.sign.in.out:0
-#: view:hr.sign.in.out.ask:0
-msgid "Sign in"
-msgstr "Anmeldung"
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Zeiteintrag"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr "Abwesenheitsart"
+msgstr "Begründung für An-/Abmeldung"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -97,13 +89,13 @@ msgstr "Anwesend"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
 msgid "Ask for Sign In Out"
-msgstr "Anfrage für Anmeldung oder Abmeldung"
+msgstr "Ask for Sign In Out"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action Reason"
-msgstr "Ausgangsaktion"
+msgstr "Aktionsbegründung"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -113,7 +105,13 @@ msgstr "OK"
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "Definiere Abwesenheitsgründe"
+msgstr "Definiere Begründungen für An-/Abmeldung"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -130,7 +128,7 @@ msgstr "Mitarbeitername"
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
 msgid "Attendance Reasons"
-msgstr "Abwesenheitsgrund"
+msgstr "An-/Abmeldebegründe"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
@@ -176,12 +174,7 @@ msgstr "Anwesenheitszeit"
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr "Max. Verzögerung"
-
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+msgstr "Max. Zeitabw. (Min)"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -189,11 +182,6 @@ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 msgid "Print"
 msgstr "Druck"
 
-#. module: hr_attendance
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Hr Attendance Search"
@@ -215,7 +203,7 @@ msgstr "Juli"
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
 #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
 msgid "Attendance Error Report"
-msgstr "Abwesenheit Report"
+msgstr "Fehlerhafte Anwesenheit"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -223,15 +211,10 @@ msgstr "Abwesenheit Report"
 msgid "Starting Date"
 msgstr "Anfangsdatum"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "Min Verzögerung"
+msgstr "Minus Abw."
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -270,14 +253,14 @@ msgstr "Monat"
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
-"(*) Eine negative Abweichung bedeutet, dass der Mitarbeiter länger "
-"gearbeitet hat , im Vergleich zu seiner erfassten Anwesenheitszeit."
+"(*) Eine negative Abweichung bedeutet, daß der Mitarbeiter mehr gearbeitet "
+"hat, als angegeben."
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
 msgid ""
 "Specifies the reason for Signing In/Signing Out in case of extra hours."
-msgstr "Begründung für An-/Abmeldung bei Mehrarbeit"
+msgstr "Begründung für An-/Abmeldung  bei Zusatzstunden"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -287,7 +270,7 @@ msgstr "Druck Anwesenheitszeit des Monats"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
 msgid "Sign In Sign Out"
-msgstr "Anmeldung / Abmeldung"
+msgstr "Anmeldung Abmeldung"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
@@ -296,7 +279,7 @@ msgstr "Anmeldung / Abmeldung"
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
 #, python-format
 msgid "Sign in / Sign out"
-msgstr "Anmeldung / Abmeldung"
+msgstr "Anmelden / Abmelden"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
@@ -305,21 +288,16 @@ msgid ""
 "basis of the actions (Sign in/Sign out) performed by them. You can also link "
 "this to an attendance machine using OpenERP's webservices features."
 msgstr ""
-"Die Funktion der Anwesenheitszeit ermöglicht auf einfachem Wege durch ein An-"
-" und Abmelden eine automatische Ermittlung der Arbeitszeit von Mitarbeitern. "
-"Diese Funktion ist auch geeignet über die Webservices von OpenERP, externe "
-"Zeiterfassungsgeräte anzubinden."
+"Die Funktion der Zeiterfassung ermöglicht auf einfachem Wege durch An- und "
+"Abmelden eine automatische Ermittlung der Anwesenheit von Mitarbeitern. "
+"Diese Funktion ist auch geeignet, um über die Webservices von OpenERP, "
+"externe Zeiterfassungsgeräte anzubinden."
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "August"
@@ -341,12 +319,12 @@ msgstr "Juni"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_error
 msgid "Print Error Attendance Report"
-msgstr "Drucke Fehlerfassungen"
+msgstr "Druck fehlerhafte Anwesenheit"
 
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr "Anwesenheitszeiten der Mitarbeiter"
+msgstr "Personal Anwesenheitszeiten"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -358,6 +336,11 @@ msgstr "Datum"
 msgid "November"
 msgstr "November"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -366,7 +349,7 @@ msgstr "Oktober"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr "Meine Anwesenheitszeit"
+msgstr "Meine Anwesenheit"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -374,14 +357,16 @@ msgid "January"
 msgstr "Januar"
 
 #. module: hr_attendance
-#: report:report.hr.timesheet.attendance.error:0
-msgid "Date Signed"
-msgstr "Datum Arbeitsbeginn"
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Anmelden"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Analysis Information"
-msgstr "Analyse Anwesenheitszeiten"
+msgstr "Angaben zur Fehlersuche"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out:0
@@ -393,7 +378,7 @@ msgstr ""
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr "Fehler Anwesenheitserfassung"
+msgstr "Fehler Anwesenheitszeit"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
@@ -415,12 +400,6 @@ msgstr ""
 "Benutzers zu einem Mitarbeiter kann die Anwesenheit einfach durch jeweils "
 "einen Anmelde- und Abmeldevorgang umgesetzt werden."
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
-msgstr "Keine Einträge gefunden für Ihre Auswahl !"
-
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
@@ -432,13 +411,6 @@ msgstr "Druck Anwesenheitszeit der Woche"
 msgid "Empoyee ID"
 msgstr "Mitarbeiter ID"
 
-#. module: hr_attendance
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 #: view:hr.attendance.month:0
@@ -447,30 +419,17 @@ msgstr ""
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: hr_attendance
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr "Begründung für eine An- oder Abmeldung"
+msgstr "Begründung für  An-/ Abmeldung"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
-"(*) Eine positive Abweichung bedeutet, daß ihr Mitarbeiter weniger "
+"(*) Eine positive Abweichung bedeutet, daß der Mitarbeiter weniger "
 "gearbeitet hat als angegeben."
 
 #. module: hr_attendance
@@ -494,7 +453,7 @@ msgstr "Zeitabweichung"
 #: view:hr.attendance:0
 #: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
-msgstr "Mitabeiter"
+msgstr "Mitarbeiter"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:0
@@ -516,7 +475,7 @@ msgstr "Ihre letzte Abmeldung"
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr "Datum Aufzeichnung"
+msgstr "Zeitaufzeichnung"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
@@ -572,7 +531,7 @@ msgstr "Februar"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "Art der Aktion"
+msgstr "Aktionstyp"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -592,12 +551,13 @@ msgstr "April"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr "Melde diese Zeitabweichung, der Fehler ist selbst verschuldet."
+msgstr "Diese Differenzen werden als gewollt angesehen"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Keine Einträge gefunden für Ihre Auswahl !"
 
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
@@ -624,6 +584,15 @@ msgstr ""
 #~ msgid "Print Attendance Report"
 #~ msgstr "Bericht Anwesenheitszeiten"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Employee's name"
 #~ msgstr "Name Mitarbeiter"
 
@@ -665,7 +634,30 @@ msgstr ""
 #~ msgid "Select a starting and a end date"
 #~ msgstr "Wähle Begin- und End Datum"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #~ msgid "You are now ready to sign in or out of the attendance follow up"
 #~ msgstr ""
 #~ "Sie können ab sofort Anmeldungen oder Abmeldungen erfassen und die "
 #~ "entsprechenden Anwesenheitszeiten einsehen und rekapitulieren."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 69a730f951f..acfd375cbac 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:51+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 07:59+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index e8c3b48b7a9..6f499f82dc4 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 05:38+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-07 19:12+0000\n"
+"Last-Translator: Roger Zeng <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,24 +26,11 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_attendance
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
-
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Today"
 msgstr ""
 
-#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
-#, python-format
-msgid ""
-"You tried to %s with a date anterior to another event !\n"
-"Try to contact the administrator to correct attendances."
-msgstr ""
-
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "March"
@@ -75,7 +62,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
 #, python-format
 msgid "The sign-out date must be in the past"
-msgstr ""
+msgstr "签出日必须是过去的日期"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -119,6 +106,12 @@ msgstr ""
 msgid "Define attendance reason"
 msgstr "定义出勤原因"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
@@ -140,7 +133,7 @@ msgstr "出勤原因"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "用户错误"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,end_date:0
@@ -163,7 +156,7 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
 #, python-format
 msgid "The Sign-in date must be in the past"
-msgstr ""
+msgstr "签入日必须是过去的日期"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
@@ -177,11 +170,6 @@ msgstr ""
 msgid "Attendance"
 msgstr "出勤"
 
-#. module: hr_attendance
-#: view:hr.sign.in.out:0
-msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "你现在准备签入或签出"
-
 #. module: hr_attendance
 #: field:hr.attendance.error,max_delay:0
 msgid "Max. Delay (Min)"
@@ -220,11 +208,6 @@ msgstr "出勤错误报表"
 msgid "Starting Date"
 msgstr "开始日期"
 
-#. module: hr_attendance
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
-
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
@@ -294,13 +277,16 @@ msgid "Sign in / Sign out"
 msgstr "签入/ 签出"
 
 #. module: hr_attendance
-#: view:hr.sign.in.out.ask:0
-msgid "hr.sign.out.ask"
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"Time Tracking functionality aims to manage employee's attendances on the "
+"basis of the actions (Sign in/Sign out) performed by them. You can also link "
+"this to an attendance machine using OpenERP's webservices features."
 msgstr ""
 
 #. module: hr_attendance
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
 msgstr ""
 
 #. module: hr_attendance
@@ -312,7 +298,7 @@ msgstr "8月"
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr ""
+msgstr "签出记录必须紧跟在签入记录之后！"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -339,6 +325,11 @@ msgstr "日期"
 msgid "November"
 msgstr "11月"
 
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
 msgid "October"
@@ -383,9 +374,12 @@ msgid "Action"
 msgstr "动作"
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
-#, python-format
-msgid "No records found for your selection!"
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
 msgstr ""
 
 #. module: hr_attendance
@@ -407,12 +401,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#. module: hr_attendance
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
@@ -447,6 +435,14 @@ msgstr "推延"
 msgid "Employee"
 msgstr "员工"
 
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:0
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 #: field:hr.sign.in.out.ask,last_time:0
@@ -481,6 +477,15 @@ msgstr "你最近的签入"
 msgid "Sign Out"
 msgstr "签出"
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
 msgid "Employee's Name"
@@ -522,8 +527,9 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr "Bellow这种推延, 这错误被认为是自愿的"
 
 #. module: hr_attendance
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#, python-format
+msgid "No records found for your selection!"
 msgstr ""
 
 #. module: hr_attendance
@@ -552,6 +558,10 @@ msgstr ""
 #~ msgid "Select a month"
 #~ msgstr "选择月份"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Print Timesheet by week"
 #~ msgstr "打印这周时间表"
 
@@ -564,12 +574,21 @@ msgstr ""
 #~ msgid "This module aims to manage employee's attendances."
 #~ msgstr "这模块的目的是管理员工的出勤"
 
+#~ msgid "You are now ready to sign in or out of the attendance follow up"
+#~ msgstr "你现在准备签入或签出"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid "Select a time span"
 #~ msgstr "选择时间长度"
 
 #~ msgid "Action reason"
 #~ msgstr "动作理由"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Print Attendance Error Report"
 #~ msgstr "打印出勤错误报表"
 
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 3be655f88ae..a8120c6e82f 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 22:32+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 17:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -39,7 +40,7 @@ msgstr "Fecha inicial de prueba"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Function Arguments"
-msgstr "Alegaciones al cargo"
+msgstr "Argumentos de la función"
 
 #. module: hr_contract
 #: view:hr.employee:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 9aaf21a1732..fcab645c36d 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 08:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:33+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr "Warte  a. Ende Vorphase"
+msgstr "Vorphase beenden?"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -29,11 +30,6 @@ msgstr "Warte  a. Ende Vorphase"
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: hr_evaluation
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
@@ -55,7 +51,7 @@ msgstr "Bewertungstyp"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
 msgid "My Evaluation Remaining"
-msgstr "Meine Mitarbeiterbeurteilung"
+msgstr "Meine Personalbeurteilung"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -78,7 +74,7 @@ msgstr "März"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr "Zeit b. Start"
+msgstr "Verzögerung bis Start"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -123,7 +119,7 @@ msgstr "Tag"
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr "Sende anonym.  Zusammenf. an Mitarbeiter"
+msgstr "Sende anonymisierte Zusammenfassung an Mitarbeiter"
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -135,6 +131,12 @@ msgstr "Anmerkungen"
 msgid "Interview Request"
 msgstr "Beurteilungsanfrage"
 
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
@@ -145,7 +147,7 @@ msgstr "Mailtext"
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Evaluations Analysis"
-msgstr "Beurteilungsanalyse"
+msgstr "Statistik Personalbeurteilung"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -175,11 +177,12 @@ msgid "July"
 msgstr "Juli"
 
 #. module: hr_evaluation
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr "Nach Startdatum"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
@@ -244,14 +247,12 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
-"Sie können keine Beurteilung beginnen, wenn Sie nicht vorher unter "
-"Konfiguration eine Abfolge geplant haben."
+msgstr "Sende an Mitarbeiter"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "After the Date of Start"
-msgstr "Nach"
+msgstr "Nach Startzeitpunkt"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -276,7 +277,7 @@ msgstr ""
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Evaluations"
-msgstr "Mitarbeiter Beurteilungen"
+msgstr "Personalbeurteilung"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
@@ -299,11 +300,6 @@ msgstr "%(date)s: aktuelles Datum"
 msgid "Regarding "
 msgstr "Bezüglich "
 
-#. module: hr_evaluation
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
@@ -330,7 +326,7 @@ msgstr "Mitarbeiter"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr "Abgelaufene Frist"
+msgstr "Fristüberschreitung"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
@@ -360,7 +356,7 @@ msgstr "Sende alle Antworten an Abteilungsleiter"
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr "Bewertung ist in Arbeit"
+msgstr "Beurteilung ist in Arbeit"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -401,16 +397,6 @@ msgstr "# Beurteilungen"
 msgid "Evaluations"
 msgstr "Beurteilungen"
 
-#. module: hr_evaluation
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Fehlerhafte Argumente"
-
-#. module: hr_evaluation
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
@@ -456,7 +442,7 @@ msgstr "Alle Antworten"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "Next Evaluation After"
-msgstr "Nächste Beurteilung nach"
+msgstr "Nächst. Bewert. in"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -502,7 +488,7 @@ msgstr "Fragestellung"
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Evaluation?"
-msgstr "Mitarbeiterbewertung?"
+msgstr "Personalbeurteilung?"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -544,11 +530,6 @@ msgstr ""
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: hr_evaluation
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -620,6 +601,11 @@ msgstr "November"
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
@@ -649,7 +635,7 @@ msgstr "Fragebogen Beurteilung"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Evaluation Plans"
-msgstr "Bewertungsablauf"
+msgstr "Beurteilungsablauf"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -666,7 +652,7 @@ msgstr "Umfrage"
 msgid "This is the appreciation on that summarize the evaluation"
 msgstr ""
 "Dieses ist die zusammenfassende Beurteilung als Ergebnis dieser "
-"Mitarbeiterbewertung"
+"Personalbeurteilung"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
@@ -708,7 +694,7 @@ msgstr "Befrager"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr "Statistik Bewertungen"
+msgstr "Statistik Personalbeurteilung"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -741,7 +727,7 @@ msgstr "Erledigt"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Evaluation Plan Phases"
-msgstr "Bewertungsabfolge Phasen"
+msgstr "Beurteilungsabfolge Phasen"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.reminder:0
@@ -749,24 +735,11 @@ msgstr "Bewertungsabfolge Phasen"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: hr_evaluation
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#. module: hr_evaluation
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
@@ -776,7 +749,7 @@ msgstr "To Do"
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Evaluation Phases"
-msgstr "Mitarbeiterbewertung Phasen"
+msgstr "Personalbeurteilung Phasen"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -797,7 +770,7 @@ msgstr "Fragebogen"
 #: view:hr.evaluation.reminder:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
 msgid "Evaluation Reminders"
-msgstr "Mitarbeiterbewertung Erinnerung"
+msgstr "Personalbeurteilung Erinnerung"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -827,7 +800,7 @@ msgstr "Interne Hinweise"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Evaluation"
-msgstr "Freigabe Bewertung"
+msgstr "Freigabe Beurteilung"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
@@ -857,12 +830,7 @@ msgstr "Suche Beurteilung"
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Evaluation Plan"
-msgstr "Bewertungsabfolge"
-
-#. module: hr_evaluation
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+msgstr "Beurteilungsabfolge"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -892,18 +860,13 @@ msgstr "Personalbeurteilung"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "Search Evaluation Plan"
-msgstr "Suche Bewertungablaufsplan"
+msgstr "Suche Beurteilungsablaufsplan"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 msgid "(months)"
 msgstr "(Monate)"
 
-#. module: hr_evaluation
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
@@ -914,14 +877,6 @@ msgstr "Reihenfolge"
 msgid "(user_signature)s: User name"
 msgstr "%(user_signature)s: Name Benutzer"
 
-#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
-#, python-format
-msgid ""
-"You cannot change state, because some appraisal in waiting answer or draft "
-"state"
-msgstr "Nach Startdatum"
-
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
@@ -948,6 +903,12 @@ msgstr "Jahr"
 #~ msgid "Schedule next evaluation"
 #~ msgstr "Nächste Evaluierung festlegen"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Bad Points"
 #~ msgstr "Schlechte Punkte"
 
@@ -996,6 +957,9 @@ msgstr "Jahr"
 #~ msgid "My Preceeding Evaluations"
 #~ msgstr "Meine vorangegangenen Bewertungen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Evaluation Criterions"
 #~ msgstr "Bewertungskriterien"
 
@@ -1041,10 +1005,19 @@ msgstr "Jahr"
 #~ msgid "Quotes"
 #~ msgstr "Anführung"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #, python-format
 #~ msgid "''Regarding ''"
 #~ msgstr "'Bezüglich'"
 
+#~ msgid "Invalid arguments"
+#~ msgstr "Fehlerhafte Argumente"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
 #, python-format
 #~ msgid ""
 #~ "''\n"
@@ -1078,3 +1051,20 @@ msgstr "Jahr"
 #~ "%(user_signature)s\n"
 #~ "\n"
 #~ "        ''"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index 06552896f78..177e8008b68 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.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: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 07:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 19:48+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -27,12 +27,7 @@ msgstr ""
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr "Gruppera"
-
-#. module: hr_evaluation
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
+msgstr "Gruppera efter"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
@@ -133,6 +128,12 @@ msgstr ""
 msgid "Interview Request"
 msgstr ""
 
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
@@ -173,8 +174,11 @@ msgid "July"
 msgstr ""
 
 #. module: hr_evaluation
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
 msgstr ""
 
 #. module: hr_evaluation
@@ -269,11 +273,6 @@ msgstr ""
 msgid "Regarding "
 msgstr ""
 
-#. module: hr_evaluation
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
@@ -369,16 +368,6 @@ msgstr ""
 msgid "Evaluations"
 msgstr ""
 
-#. module: hr_evaluation
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr ""
-
-#. module: hr_evaluation
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
@@ -505,11 +494,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: hr_evaluation
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -581,6 +565,11 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
@@ -708,22 +697,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: hr_evaluation
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
 msgstr ""
 
-#. module: hr_evaluation
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
@@ -816,11 +794,6 @@ msgstr ""
 msgid "Evaluation Plan"
 msgstr ""
 
-#. module: hr_evaluation
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
@@ -856,11 +829,6 @@ msgstr ""
 msgid "(months)"
 msgstr ""
 
-#. module: hr_evaluation
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
@@ -871,14 +839,6 @@ msgstr ""
 msgid "(user_signature)s: User name"
 msgstr ""
 
-#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
-#, python-format
-msgid ""
-"You cannot change state, because some appraisal in waiting answer or draft "
-"state"
-msgstr ""
-
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
@@ -895,3 +855,6 @@ msgstr ""
 #: field:hr.evaluation.report,year:0
 msgid "Year"
 msgstr ""
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index fdfb4d4c956..21592067d20 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:34+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: 2010-12-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -48,11 +49,6 @@ msgstr "Gruppierung..."
 msgid "Air Ticket"
 msgstr "Flugticket"
 
-#. module: hr_expense
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: field:hr.expense.expense,department_id:0
@@ -91,7 +87,7 @@ msgstr "Zu Bezahlen"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
-msgstr "Statistik Mitarbeiterausgaben"
+msgstr "Statistik Personalspesen"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -111,7 +107,7 @@ msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
 msgstr ""
-"Empfangsdatum der Mitarbeiterausgabenerfassung. Das Feld wird ausgefüllt bei "
+"Empfangsdatum der Personalspesenerfassung. Das Feld wird ausgefüllt bei "
 "einem Klick auf Empfangen."
 
 #. module: hr_expense
@@ -122,7 +118,7 @@ msgstr "Bemerkungen"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr "Mitarbeiterabrechnung"
+msgstr "Spesenabrechnung Mitarbeiter"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -167,8 +163,8 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
-"Bestätigungsdatum der Mitarbeiteraufwandserfassung. Wird automatisch "
-"ausgefüllt, wenn auf Bestätigen geklickt wird."
+"Bestätigungsdatum der Spesenerfassung. Wird automatisch ausgefüllt, wenn auf "
+"Bestätigen geklickt wird."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -215,7 +211,7 @@ msgstr "Zeit f. Genehmig."
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr "Reihenfolge für die Ansichtsliste der Mitarbeiterausgaben."
+msgstr "Reihenfolge für die Ansichtsliste der Personalspesen."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:0
@@ -267,11 +263,6 @@ msgstr "Anz."
 msgid "Total Price"
 msgstr "Gesamtpreis"
 
-#. module: hr_expense
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
@@ -297,7 +288,7 @@ msgstr "Erstellung am"
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr "Personalkosten"
+msgstr "Personalspesen"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -336,18 +327,6 @@ msgstr "Nach der Rechnungserstellung erfolgt die Erstattung."
 msgid "Reimbursement"
 msgstr "Erstattung"
 
-#. module: hr_expense
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: hr_expense
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
-"Mengeneinheit (ME)"
-
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
@@ -364,7 +343,7 @@ msgstr "Genehmigungsdatum"
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr "Analyse Mitarbeiterausgaben"
+msgstr "Statistik Personalspesen"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -442,14 +421,6 @@ msgstr "Ausgabe ist begründet"
 msgid "  Year  "
 msgstr "  Jahr  "
 
-#. module: hr_expense
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Fehler: Die Standard Mengeneinheit sowie die Beschaffungs ME muss in "
-"derselben Kategorie sein."
-
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: selection:hr.expense.report,state:0
@@ -473,11 +444,6 @@ msgstr "Erzeuge Ausgangsrechnung"
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: hr_expense
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting data"
@@ -524,11 +490,6 @@ msgstr "Kundenprojekt"
 msgid "User"
 msgstr "Benutzer"
 
-#. module: hr_expense
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_expense
 #: report:hr.expense:0
 #: field:hr.expense.expense,date:0
@@ -617,36 +578,16 @@ msgstr "Referenzen"
 msgid "Invoice"
 msgstr "Rechnung"
 
-#. module: hr_expense
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
 msgid "Reinvoice"
 msgstr "Weiterberechnung"
 
-#. module: hr_expense
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_expense
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr "Alle Mitarbeiterausgaben"
-
-#. module: hr_expense
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+msgstr "Alle Personalspesen"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -656,7 +597,7 @@ msgstr "Weitere Info"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr "Journal bei Abrechnungsbuchung v. Mitarbeiterausgaben"
+msgstr "Journal bei Abrechnungsbuchung v. Personalspesen"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -707,7 +648,7 @@ msgstr "Produkt"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses of My Department"
-msgstr "Ausgaben meiner Abteilung"
+msgstr "Spesen meiner Abteilung"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -829,13 +770,13 @@ msgid ""
 " If an invoice is made for the expense request, the state is 'Invoiced'.\n"
 " If the expense is paid to user, the state is 'Reimbursed'."
 msgstr ""
-"Bei initialer Erstellung eines Formulars zur Erfassung von "
-"Mitarbeiterausgaben ist der aktuelle Status zunächst 'Entwurf'.\n"
+"Bei initialer Erstellung eines Formulars zur Erfassung von Personalspesen "
+"ist der aktuelle Status zunächst 'Entwurf'.\n"
 " Das Formular wird durch den Benutzer bestätigt und zwecks Prüfung  an den "
-"Vorgesetzten gesendet , der Status wechselt hierdurch auf 'Erwarte Prüfung'. "
-"           \n"
+"Vorgesetzten gesendet , der Status wechselt hierdurch auf 'Erwarte "
+"Genehmigung'.            \n"
 "Wenn der Vorgesetzte die erfassten Ausgaben prüft und akzeptiert, wechselt "
-"der Status auf 'Akzeptiert'.\n"
+"der Status auf 'Genehmigt'.\n"
 " Wenn dann noch eine richtige Abrechnung erstellt wird, wechselt der Status "
 "auf 'Abgerechnet'.\n"
 " Nach Bezahlung bzw. Erstattung wechselt der Status auf , 'Ausgaben "
@@ -844,7 +785,7 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Approve"
-msgstr "Bestätige"
+msgstr "Genehmigen"
 
 #. module: hr_expense
 #: view:hr.expense.line:0
@@ -852,11 +793,6 @@ msgstr "Bestätige"
 msgid "Total"
 msgstr "Betrag gesamt"
 
-#. module: hr_expense
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
@@ -889,7 +825,7 @@ msgstr "Jahr"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Approve"
-msgstr "Erwarte Prüfung"
+msgstr "Erwarte Genehmigung"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
@@ -897,7 +833,7 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
-"Legt fest, ob dieses Produkt im Bereich Personalausgaben auswählbar ist"
+"Legt fest, ob dieses Produkt im Bereich Personalspesen auswählbar ist"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -922,6 +858,15 @@ msgstr "Weiterberechnung"
 #~ msgid "New Expenses Sheet"
 #~ msgstr "Neue Eingabe Ausgaben"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Account Move"
 #~ msgstr "Belegnummer"
 
@@ -961,5 +906,39 @@ msgstr "Weiterberechnung"
 #~ msgid "Date Validated"
 #~ msgstr "Datum Validierung"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
 #~ msgid "Extended filters..."
 #~ msgstr "Erweiterter Filter..."
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
+#~ "Mengeneinheit (ME)"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fehler: Die Standard Mengeneinheit sowie die Beschaffungs ME muss in "
+#~ "derselben Kategorie sein."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 2f778d8d8cb..0962446356c 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-17 08:18+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 22:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-19 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -49,11 +49,6 @@ msgstr "Agrupar por..."
 msgid "Air Ticket"
 msgstr ""
 
-#. module: hr_expense
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: field:hr.expense.expense,department_id:0
@@ -264,11 +259,6 @@ msgstr "Ctd."
 msgid "Total Price"
 msgstr "Precio total"
 
-#. module: hr_expense
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
@@ -333,16 +323,6 @@ msgstr "Después de crear factura, reembolsar gastos"
 msgid "Reimbursement"
 msgstr "Reemborso"
 
-#. module: hr_expense
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: hr_expense
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
@@ -437,12 +417,6 @@ msgstr ""
 msgid "  Year  "
 msgstr ""
 
-#. module: hr_expense
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: selection:hr.expense.report,state:0
@@ -466,11 +440,6 @@ msgstr "Crear factura de cliente"
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: hr_expense
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting data"
@@ -517,11 +486,6 @@ msgstr ""
 msgid "User"
 msgstr "Usuario"
 
-#. module: hr_expense
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: hr_expense
 #: report:hr.expense:0
 #: field:hr.expense.expense,date:0
@@ -609,39 +573,21 @@ msgstr ""
 msgid "Invoice"
 msgstr "Factura"
 
-#. module: hr_expense
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
 msgid "Reinvoice"
 msgstr "Refacturar"
 
-#. module: hr_expense
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_expense
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
 msgstr ""
 
-#. module: hr_expense
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Other Info"
-msgstr "Otra info."
+msgstr "Otra información"
 
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
@@ -821,11 +767,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#. module: hr_expense
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
@@ -890,6 +831,15 @@ msgstr "Refacturació"
 #~ msgid "New Expenses Sheet"
 #~ msgstr "Nueva hoja de gastos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Account Move"
 #~ msgstr "Asiento"
 
@@ -929,3 +879,6 @@ msgstr "Refacturació"
 #~ msgstr ""
 #~ "Indica si el producto puede ser visible en la lista de productos "
 #~ "seleccionables dentro de una línea de hoja de gastos de recursos humanos."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index f5896f3a722..1d060aac499 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -163,7 +163,9 @@ class hr_holidays(osv.osv):
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
-        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
+        'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
+        # Todo: Add below field in view?
+        'category_holiday_id': fields.many2one('hr.holidays', 'Holiday', help='For allocation By Employee Category (Link between Employee Category holiday and related holidays for employees of that category)')
     }
 
     _defaults = {
@@ -175,6 +177,14 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
 
+    def _get_category_leave_ids(self, cr, uid, ids):
+        """Returns the leaves taken by the employees of the category if holiday type is 'category'."""
+        leave_ids = []
+        for record in self.browse(cr, uid, ids):
+            if record.holiday_type == 'category' and record.type == 'remove':
+                leave_ids += self.search(cr, uid, [('category_holiday_id', '=', record.id)])
+        return leave_ids
+
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         if context is None:
@@ -263,6 +273,7 @@ class hr_holidays(osv.osv):
         if context is None:
             context = {}
         self._update_user_holidays(cr, uid, ids)
+        ids += self._get_category_leave_ids(cr, uid, ids)
         self._remove_resouce_leave(cr, uid, ids, context=context)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
@@ -307,17 +318,23 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_validate2(self, cr, uid, ids, *args):
+        obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         vals = {'state':'validate1'}
         self.check_holidays(cr, uid, ids)
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
         else:
             raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+        # Second Time Validate all the leave requests of the category
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
         return self.write(cr, uid, ids, vals)
 
     def holidays_validate(self, cr, uid, ids, *args):
         obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
         vals = {'state':'validate'}
@@ -354,14 +371,20 @@ class hr_holidays(osv.osv):
                        'resource_id': emp.resource_id.id,
                        'holiday_id':record.id
                          }
-                    self._create_resource_leave(cr, uid, vals)
+#                    self._create_resource_leave(cr, uid, vals)
+                # Validate all the leave requests of the category
+                for leave_id in self.search(cr, uid, [('category_holiday_id', '=', record.id)]):
+                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
         obj_hr_holiday_status = self.pool.get('hr.holidays.status')
+        obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         for record in self.browse(cr, uid, ids):
             user_id = False
             leave_asked = record.number_of_days_temp
+            leave_ids = []
             if record.holiday_type == 'employee' and record.type == 'remove':
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = obj_hr_holiday_status.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
@@ -374,30 +397,58 @@ class hr_holidays(osv.osv):
                     if leaves_rest < leave_asked:
                         raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for category %s while there are too few remaining leave days.') % (record.category_id.name))
                 nb = -(record.number_of_days_temp)
+                # Create leave request for employees in the category
+                emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
+                for emp in obj_emp.browse(cr, uid, emp_ids):
+                    vals = {
+                    'name': record.name,
+                    'holiday_status_id': record.holiday_status_id.id,
+                    'date_from': record.date_from,
+                    'date_to': record.date_to,
+                    'notes': record.notes,
+                    'number_of_days_temp': record.number_of_days_temp,
+                    'category_holiday_id': record.id,
+                    'employee_id': emp.id
+                }
+                    leave_ids.append(self.create(cr, uid, vals, context=None))
+                # Confirm all the leave requests of the category
+                for leave_id in leave_ids:
+                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
             else:
                 nb = record.number_of_days_temp
 
             if record.holiday_type == 'employee' and record.employee_id:
                 user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
 
-            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })
+            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id})
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
+        obj_emp = self.pool.get('hr.employee')
+        wf_service = netsvc.LocalService("workflow")
         vals = {'state': 'refuse'}
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
+        # Refuse all the leave requests of the category
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'refuse', cr)
         self.write(cr, uid, ids, vals)
         return True
 
     def holidays_cancel(self, cr, uid, ids, *args):
         self._update_user_holidays(cr, uid, ids)
-        self.write(cr, uid, ids, {'state': 'cancel'})
         self._remove_resouce_leave(cr, uid, ids)
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        leave_ids = self._get_category_leave_ids(cr, uid, ids)
+        if leave_ids:
+            self.unlink(cr, uid, leave_ids) # unlink all the leave requests of the category
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
+        wf_service = netsvc.LocalService("workflow")
+        for leave_id in self._get_category_leave_ids(cr, uid, ids):
+            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'draft', cr)
         return self.write(cr, uid, ids, {'state': 'draft'})
 
     def check_holidays(self, cr, uid, ids):
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c76e8359b9e..d44b02a316f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
-                            default="context.get('report', False)"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
@@ -24,7 +23,7 @@
                                 domain="[('employee_id.user_id','=', uid)]"
                                 help="My Leaves" />
                         </field>
-                        <field name="department_id" widget="selection" default="context.get('department_id', False)" >
+                        <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
                         </field>
@@ -41,8 +40,7 @@
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
                         <separator orientation="vertical"/>
-                        <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
-                            default="context.get('report', False)"/>
+                        <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 419c52b3c11..28686550376 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 11:48+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 10:18+0000\n"
+"Last-Translator: Carlos-smile <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index e8e8292af37..816519b2214 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 14:54+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 12:20+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "Azul"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -31,7 +31,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "Aguardando confirmação da aprovação"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -52,18 +52,14 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
+#: view:hr.holidays.status:0
 msgid "Group By..."
-msgstr ""
-
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
+msgstr "Agrupar por..."
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leave"
-msgstr ""
+msgstr "Baixa por doença"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -71,7 +67,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,state:0
@@ -80,10 +76,9 @@ msgid "Refused"
 msgstr "Recusado"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
-msgstr ""
+#: help:hr.holidays,category_id:0
+msgid "Category Of employee"
+msgstr "Categoria do empregado"
 
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
@@ -96,20 +91,19 @@ msgid "Brown"
 msgstr "Castanho"
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "Dias restantes"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+msgstr "Por empregado"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -118,11 +112,6 @@ msgid ""
 "for every employee"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Leave Days"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
@@ -138,7 +127,7 @@ msgstr "Férias"
 #. module: hr_holidays
 #: field:available.holidays.report,category_id:0
 msgid "Category's Name"
-msgstr ""
+msgstr "Nome da categoria"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -170,12 +159,12 @@ msgstr "Recusar"
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Leaves"
-msgstr ""
+msgstr "Baixas"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 msgid "Leave"
-msgstr ""
+msgstr "Baixa"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -201,10 +190,23 @@ msgid ""
 "available for someone"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "Validação"
+
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning !"
+msgstr "Alerta!"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for category %s while there are too few remaining "
+"leave days."
 msgstr ""
 
 #. module: hr_holidays
@@ -219,6 +221,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
+#: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
 #: field:hr.holidays.status,name:0
@@ -232,19 +235,19 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Validation User"
-msgstr ""
+msgstr "Utilizador de validação"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -345,7 +348,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -374,7 +377,7 @@ msgstr "Geral"
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -396,6 +399,11 @@ msgstr "Salmão claro"
 msgid "Wheat"
 msgstr "Trigo"
 
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,number_of_days:0
@@ -404,8 +412,9 @@ msgid "Number of Days"
 msgstr "Numero de dias"
 
 #. module: hr_holidays
-#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
+#: view:available.holidays.report:0
+#: field:available.holidays.report,max_leave:0
+msgid "Allocated Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,14 +423,14 @@ msgid "Remaining Leave by Type and User"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+#: selection:available.holidays.report,month:0
+msgid "July"
+msgstr "Julho"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -433,7 +442,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Aguardando aprovação"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -443,6 +452,19 @@ msgstr "Empregado(s)"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Month "
+msgstr " Mês "
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "Leaves By Month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:0
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s while there are too few remaining "
+"leave days."
 msgstr ""
 
 #. module: hr_holidays
@@ -468,12 +490,12 @@ msgstr ""
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
@@ -489,7 +511,7 @@ msgstr "Lavanda"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
@@ -506,13 +528,13 @@ msgstr ""
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Férias do empregado"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categori­a"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -524,7 +546,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Available Holidays"
-msgstr ""
+msgstr "Dias de férias disponíveis"
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -554,48 +576,20 @@ msgstr ""
 msgid "Black"
 msgstr "Preto"
 
-#. module: hr_holidays
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Feriado"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Leaves Allowed"
 msgstr "Máximo de saídas permitidas"
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.category_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            else:\n"
-"                nb = record.number_of_days_temp\n"
-"\n"
-"            if record.holiday_type == 'employee' and record.employee_id:\n"
-"                user_id = record.employee_id.user_id and "
-"record.employee_id.user_id.id or uid\n"
-"\n"
-"            self.write(cr, uid, [record.id], {'state':'confirm', "
-"'number_of_days': nb, 'user_id': user_id })\n"
-"        return True\n"
-"\n"
-"    def holidays_refuse(self, cr, uid, ids, *args):\n"
-"        vals = {'state': 'refuse'}\n"
-"        ids2 = self.pool.get('hr.employee"
-msgstr ""
-
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
-msgstr ""
+msgstr " Ano "
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -605,12 +599,12 @@ msgstr "Marfim"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -638,27 +632,28 @@ msgstr "Activo"
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de início"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
+#: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
@@ -678,32 +673,19 @@ msgstr ""
 #. module: hr_holidays
 #: field:available.holidays.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-msgid "Extended options..."
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
 #, python-format
 msgid "Error"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid ""
-"You cannot validate leaves for %s while available leaves are less than asked "
-"leaves.' %(record.employee_id.name)))\n"
-"                nb = -(record.number_of_days_temp)\n"
-"            elif record.holiday_type == 'category' and record.type == "
-"'remove':\n"
-"                if record.category_id and not "
-"record.holiday_status_id.limit:\n"
-"                    leaves_rest = self.pool.get('hr.holidays.status"
-msgstr ""
+msgstr "Erro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -716,11 +698,13 @@ msgid ""
 "Start date should not be larger than end date!\n"
 "Number of Days should be greater than 1!"
 msgstr ""
+"A date de início não pode ser superior à de fim!\n"
+"O número de dias tem de ser superior a 1!"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Tipo de pedido"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -733,7 +717,7 @@ msgstr ""
 #: view:available.holidays.report:0
 #: field:available.holidays.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -741,6 +725,15 @@ msgstr ""
 msgid "Reasons"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leaves requests can be recorded by employees and validated by their "
+"managers. Once a leave request is validated it appears automatically in the "
+"agenda of the employee. You can define several allowance types (paid "
+"holidays, sickness, etc) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
@@ -776,13 +769,6 @@ msgstr "Validado"
 msgid "Allocation Request"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
@@ -793,11 +779,6 @@ msgstr ""
 msgid "Apply Double Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status_id:0
-msgid " Leave Type"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
@@ -805,14 +786,14 @@ msgid "Print"
 msgstr "Imprimir"
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
-msgid "My Leaves"
-msgstr ""
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "Detalhes"
 
 #. module: hr_holidays
 #: view:board.board:0
-msgid "My Leaves by Type"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
@@ -834,9 +815,10 @@ msgstr "Descrição"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: hr_holidays
+#: view:hr.holidays.status:0
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
 msgstr ""
@@ -861,7 +843,7 @@ msgstr "Selecione o tipo de férias"
 #. module: hr_holidays
 #: field:available.holidays.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome do empregado"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
@@ -871,17 +853,17 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "Por categoria de empregado"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "This Month"
-msgstr ""
+msgstr "Este mês"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Confirmação de aprovação"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
@@ -891,12 +873,12 @@ msgstr "Processo"
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de fim"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -920,12 +902,12 @@ msgstr "Violeta"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Recursos Humanos: Gestão de férias"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -940,18 +922,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
@@ -968,12 +945,6 @@ msgstr "Amarelo claro"
 msgid "Light Pink"
 msgstr "Rosa claro"
 
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
-msgid "Leaves Summary"
-msgstr ""
-
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
@@ -983,23 +954,23 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "Gestor"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Para confirmar"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:available.holidays.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para aprovar"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -1220,3 +1191,14 @@ msgstr ""
 
 #~ msgid "Encode number of available holidays"
 #~ msgstr "Codificar o numero de ferias disponíveis"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura de vista"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1c792c5ba6f..cb8897f141e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -94,11 +94,11 @@
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field name="partner_id" invisible="context.get('display_partner', False)"/>
+                    <field name="partner_id"/>
                 </field>
             </field>
         </record>
-        
+
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
@@ -251,9 +251,9 @@
                 </field>
             </field>
         </record>
-        
+
         <!-- End Employee View -->
-        
+
         <!-- Contract View -->
         <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
@@ -407,12 +407,12 @@
 							<separator string="Validation" colspan="2"/>
 								<newline/>
 							<field name="active" />
-								<newline/>							
+								<newline/>
 							<field name="double_validation"/>
 								<newline/>
 							<field name="limit"/>
 			  	</group>
-				<group colspan="2">						
+				<group colspan="2">
 					<separator colspan="2" string="Payroll Configurtion"/><newline/>
 					<field name="type"/><newline/>
 					<field name="head_id"/><newline/>
@@ -1088,7 +1088,7 @@
                 </form>
             </field>
         </record>
-        
+
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index deb73b1e706..b26b5e762e0 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 17:24+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:35+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -51,11 +51,6 @@ msgstr "Details Mitarbeitervergütung"
 msgid "Allowances with Basic:"
 msgstr "Zulagen basieren auf:"
 
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
@@ -147,7 +142,7 @@ msgstr ","
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Set to Draft"
-msgstr "Setze auf Entwurf"
+msgstr "Zurücksetzen"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
@@ -163,7 +158,7 @@ msgstr "Gültig bis"
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr "Teilvergüteter (50%) Feiertag"
+msgstr "Teilvergüt. (50%) Abwesenh."
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -292,14 +287,6 @@ msgstr "Land"
 msgid "Employee Deduction"
 msgstr "Arbeitnehmeranteil"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -561,11 +548,6 @@ msgstr "Typ"
 msgid "Email"
 msgstr "EMail"
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -583,14 +565,6 @@ msgstr "Genehmige Abrechnung"
 msgid "No of Working days / week for an employee"
 msgstr "Arbeitstage/Woche"
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
-"haben !"
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -677,11 +651,6 @@ msgstr "Fester Betrag"
 msgid "To"
 msgstr "An"
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -704,15 +673,6 @@ msgstr "Auszahlung"
 msgid "Bank Account A/C"
 msgstr "Bank Konto A/C"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
@@ -884,11 +844,6 @@ msgstr "Entwurf"
 msgid "Earnings"
 msgstr "Einkünfte"
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -961,7 +916,7 @@ msgstr "Freigabe Abrechnung"
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr "Bezahlt "
+msgstr "Bezahlt? "
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
@@ -1250,11 +1205,6 @@ msgstr "Zulagen"
 msgid "Current Month Date"
 msgstr "Aktueller Monat"
 
-#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
@@ -1440,38 +1390,15 @@ msgstr "Personalabrechnung"
 msgid "Wage Type"
 msgstr "Lohnart"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"#                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
 msgstr "Netto Lohn"
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Jahresvergütung"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
@@ -1664,6 +1591,12 @@ msgstr "Mitarbeiter Abrechnung"
 msgid "Letter Content"
 msgstr "Auszahlung Text"
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr "Jahresvergütung"
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
@@ -1693,10 +1626,8 @@ msgstr "Gesamt"
 msgid "Contributions"
 msgstr "Anteile Arbeitgeber / Arbeitnehmer"
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #~ msgid "Analytic Account for Salary Analysis"
 #~ msgstr "Analytishes Konto für Personalkosten Analyse"
@@ -1822,6 +1753,9 @@ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 #~ msgid "Account Lines"
 #~ msgstr "Buchungspositionen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht"
+
 #~ msgid "Gross SAL"
 #~ msgstr "Brutto L+G"
 
@@ -1859,6 +1793,12 @@ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 #~ msgid "Total SAL"
 #~ msgstr "Gesamt L+G"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen "
+#~ "haben !"
+
 #~ msgid "Salary Account"
 #~ msgstr "Finanzkonto L+G"
 
@@ -2219,6 +2159,9 @@ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 #~ "    def process_sheet(self, cr, uid, ids, context=None):\n"
 #~ "        slip_pool = self.pool.get('hr.payslip"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
 #, python-format
 #~ msgid ""
 #~ "Variable Error : %s ' % (e)))\n"
@@ -2254,3 +2197,12 @@ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
 #~ "                    amt = eval(base, obj)\n"
 #~ "                except Exception, e:\n"
 #~ "                    raise osv.except_osv(_('Variable Error !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 9ee4920fbb4..2fd37cd9a81 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:57+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 18:03+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -40,7 +40,7 @@ msgstr "Salario neto"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Recompute Sheet"
-msgstr ""
+msgstr "Recalcular plantilla"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -50,12 +50,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Primas con base:"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -66,7 +61,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Deductions:"
-msgstr ""
+msgstr "Deducciones:"
 
 #. module: hr_payroll
 #: field:company.contribution,gratuity:0
@@ -78,7 +73,7 @@ msgstr ""
 #: field:hr.payslip,working_days:0
 #: report:payslip.pdf:0
 msgid "Working Days"
-msgstr ""
+msgstr "Días de trabajo"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
@@ -89,7 +84,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Registro de pago de nómina"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0
@@ -108,7 +103,7 @@ msgstr "Informe anual de salarios"
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr "Salario pagado"
+msgstr "Nómina pagada"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -154,7 +149,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Variable Error: %s "
-msgstr ""
+msgstr "Error variable: %s "
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -182,7 +177,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Contract Detail:"
-msgstr ""
+msgstr "Detalles del contrato:"
 
 #. module: hr_payroll
 #: field:hr.payslip,igross:0
@@ -194,13 +189,13 @@ msgstr ""
 #: help:hr.payroll.advice,bank_id:0
 #: help:hr.payroll.register,bank_id:0
 msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccione la dirección del banco de donde se pagará el salario."
+msgstr "Seleccione la dirección del banco de donde se pagará la nómina."
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: field:hr.payroll.advice.line,advice_id:0
 msgid "Bank Advice"
-msgstr ""
+msgstr "Aviso bancario"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -282,21 +277,13 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.passport,country_id:0
 msgid "Country of Issue"
-msgstr ""
+msgstr "País de emisión"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,emp_deduction:0
 msgid "Employee Deduction"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"                elif line.amount_type in ('fix', 'func"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -341,7 +328,7 @@ msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Importe (en palabras):"
 
 #. module: hr_payroll
 #: field:hr.holidays.status,type:0
@@ -427,7 +414,7 @@ msgstr "Pagos -"
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Número de Visa"
 
 #. module: hr_payroll
 #: field:company.contribution.line,from_val:0
@@ -441,7 +428,7 @@ msgstr ""
 #: field:hr.payroll.advice.line,bysal:0
 #: report:payroll.advice:0
 msgid "By Salary"
-msgstr ""
+msgstr "Por salario"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_to:0
@@ -505,7 +492,7 @@ msgstr ""
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Function Arguments"
-msgstr ""
+msgstr "Argumentos de la función"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
@@ -547,11 +534,6 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -569,12 +551,6 @@ msgstr ""
 msgid "No of Working days / week for an employee"
 msgstr "Número de días/semanas trabajados para un empleado."
 
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
@@ -661,11 +637,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
@@ -688,15 +659,6 @@ msgstr ""
 msgid "Bank Account A/C"
 msgstr "Cuenta bancaria"
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if sal_type in ('gross', 'net"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Contribution Lines"
@@ -720,13 +682,13 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Observación aviso bancario"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
 msgid "Contibution Register"
-msgstr ""
+msgstr "Registro de contribución"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -738,12 +700,12 @@ msgstr "Nómina"
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
-msgstr ""
+msgstr "Entrega anticipo"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Complete HR Checking"
-msgstr ""
+msgstr "Comprobación RH completa"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -832,7 +794,7 @@ msgstr ""
 #: field:hr.payslip.line.line,amount_type:0
 #: report:salary.structure:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Tipo de importe"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -856,7 +818,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
 msgid "Print Statement"
-msgstr ""
+msgstr "Imprimir declaración"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -868,11 +830,6 @@ msgstr ""
 msgid "Earnings"
 msgstr "Ingresos"
 
-#. module: hr_payroll
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
@@ -986,7 +943,7 @@ msgstr ""
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
 msgid "Applied this head for calculation if condition is true"
-msgstr ""
+msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
 
 #. module: hr_payroll
 #: report:year.salary:0
@@ -1043,17 +1000,17 @@ msgstr "Salario base"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
 msgid "Categoty Code"
-msgstr ""
+msgstr "Código de categoría"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Salary Information"
-msgstr ""
+msgstr "Información de la nómina"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_company_contribution_line
 msgid "Allowance Deduction Categoty"
-msgstr ""
+msgstr "Categoría prima/deducción"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1069,7 +1026,7 @@ msgstr "Firma autorizada"
 #: field:hr.payslip,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
-msgstr ""
+msgstr "Contrato"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -1097,7 +1054,7 @@ msgstr "Fecha expiración visado"
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Search Passport"
-msgstr ""
+msgstr "Buscar pasaporte"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -1220,18 +1177,13 @@ msgstr "Importe / Porcentaje"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Allowances"
-msgstr ""
+msgstr "Primas"
 
 #. module: hr_payroll
 #: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr "Fecha mes actual"
 
-#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
@@ -1352,7 +1304,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
 msgid "Allowance Deduction Heads"
-msgstr ""
+msgstr "Cabeceras prima/deducción"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -1413,37 +1365,14 @@ msgstr ""
 msgid "Wage Type"
 msgstr ""
 
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid ""
-"Variable Error: %s ' % (e)))\n"
-"\n"
-"                if not calculate:\n"
-"                    continue\n"
-"\n"
-"                percent = 0.0\n"
-"                value = 0.0\n"
-"                base = False\n"
-"#                company_contrib = 0.0\n"
-"                base = line.category_id.base\n"
-"\n"
-"                try:\n"
-"                    #Please have a look at the configuration guide.\n"
-"                    amt = eval(base, obj)\n"
-"                except Exception, e:\n"
-"                    raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
+#: sql_constraint:hr.passport:0
+msgid "The Passport No must be unique !"
 msgstr ""
 
 #. module: hr_payroll
@@ -1496,7 +1425,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
+msgstr "Primas y deducciones especiales por empleado:"
 
 #. module: hr_payroll
 #: field:company.contribution,name:0
@@ -1594,7 +1523,7 @@ msgstr ""
 #: field:hr.payslip,allounce:0
 #: selection:hr.payslip.line,type:0
 msgid "Allowance"
-msgstr ""
+msgstr "Prima"
 
 #. module: hr_payroll
 #: field:hr.payslip,holiday_days:0
@@ -1635,10 +1564,16 @@ msgstr ""
 msgid "Letter Content"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Year Salary"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Allowance / Deduction"
-msgstr ""
+msgstr "Prima / Deducción"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
@@ -1663,8 +1598,3 @@ msgstr ""
 #: field:hr.allounce.deduction.categoty,contribute_ids:0
 msgid "Contributions"
 msgstr ""
-
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 2a4d578bb4d..ff048a506e7 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -7,20 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 21:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 21:50+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_line_ids:0
 msgid "Accounting Lines"
-msgstr ""
+msgstr "Movimientos contables"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,bank_journal_id:0
@@ -28,22 +29,6 @@ msgstr ""
 msgid "Bank Journal"
 msgstr ""
 
-#. module: hr_payroll_account
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_payroll_account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_payroll_account
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
 msgid "Contribution Register Line"
@@ -57,7 +42,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: help:hr.employee,analytic_account:0
 msgid "Analytic Account for Salary Analysis"
-msgstr ""
+msgstr "Cuenta analítica para análisis de nóminas"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
@@ -78,17 +63,12 @@ msgstr ""
 #: field:hr.payroll.register,journal_id:0
 #: field:hr.payslip,journal_id:0
 msgid "Expanse Journal"
-msgstr ""
+msgstr "Diario de gastos"
 
 #. module: hr_payroll_account
 #: field:hr.employee,salary_account:0
 msgid "Salary Account"
-msgstr ""
-
-#. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Cuenta de nómina"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
@@ -143,12 +123,13 @@ msgstr ""
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please define fiscal year for perticular contract"
-msgstr ""
+msgstr "Defina el ejercicio fiscal para un contrato en concreto"
 
 #. module: hr_payroll_account
 #: help:hr.employee,property_bank_account:0
 msgid "Select Bank Account from where Salary Expanse will be Paid"
 msgstr ""
+"Seleccione la cuenta bancaria desde donde se pagará el gasto de nómina."
 
 #. module: hr_payroll_account
 #: help:hr.employee,salary_account:0
@@ -156,8 +137,8 @@ msgid "Expanse account when Salary Expanse will be recorded"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.contibution.register,yearly_total_by_emp:0
-msgid "Total By Employee"
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_payroll_account
@@ -199,6 +180,12 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Vouchers"
+msgstr "Recibos contables"
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
 
 #. module: hr_payroll_account
@@ -220,7 +207,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: field:hr.payslip,move_ids:0
 msgid "Accounting vouchers"
-msgstr ""
+msgstr "Recibos contables"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -239,13 +226,13 @@ msgid "General Account"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.payslip.account.move,sequence:0
-msgid "Sequence"
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
 msgstr ""
 
 #. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll_account
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
new file mode 100644
index 00000000000..c33d97601ea
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/pt.po
@@ -0,0 +1,321 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 16:02+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Empregado"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Não pode criar hierarquias de funcionários recursivamente."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Conta"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Conta bancária"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expense Encoding\n"
+"    * Payment Encoding\n"
+"    * Company Contribution Management\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro ! Não pode seleccionar um departamento cujo empregado é o gestor."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Atenção!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Total por empregado"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Conta analítica"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr "Total por empresa"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.employee:0
+msgid "Accounting"
+msgstr "Contabilidade"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "Erro de integridade!"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index cf2097b2454..010a46faaf2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -218,7 +218,6 @@
                <filter icon="terp-check" string="Current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
-                   default="1"
                    name="current"
                />
                <filter icon="terp-document-new" string="New"
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index 695a264c75b..c8634f58bcd 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 15:39+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 15:59+0000\n"
+"Last-Translator: Thorsten Vocks <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: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -35,7 +34,7 @@ msgstr "Anforderungen"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr "Durch. Zeit b. Eröffn."
+msgstr "Durch. Zeit b. Start"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
@@ -47,11 +46,6 @@ msgstr "# Fälle"
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: hr_recruitment
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehlerhafter Modellname in der Aktion"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,department_id:0
@@ -101,7 +95,7 @@ msgstr "Ziele"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr "Partner Kontakt Name"
+msgstr "Partner Kontakt"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -116,11 +110,6 @@ msgstr "Erzeuge Partner"
 msgid "Day"
 msgstr "Tag"
 
-#. module: hr_recruitment
-#: sql_constraint:crm.case.section:0
-msgid "The code of the sales team must be unique !"
-msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract Data"
@@ -160,7 +149,7 @@ msgstr "Junior Entwickler"
 #: field:hr.applicant,job_id:0
 #: field:hr.recruitment.report,job_id:0
 msgid "Applied Job"
-msgstr "Bewerbung"
+msgstr "Arbeitsstelle"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
@@ -225,19 +214,13 @@ msgstr "Durch. Gehaltsangebot"
 #: view:hr.applicant:0
 #: field:hr.recruitment.report,available:0
 msgid "Availability"
-msgstr "Verfügbarkeit"
+msgstr "Frühester Beginn"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Previous"
 msgstr "Vorherige"
 
-#. module: hr_recruitment
-#: field:hr.applicant,date_closed:0
-#: field:hr.recruitment.report,date_closed:0
-msgid "Closed"
-msgstr "Beendet"
-
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
 #: view:hr.applicant:0
@@ -255,11 +238,6 @@ msgstr "Konvertiere zu Partner"
 msgid "Recruitments Statistics"
 msgstr "Personaleinstellungen Statistik"
 
-#. module: hr_recruitment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für Ansicht!"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Next"
@@ -270,11 +248,6 @@ msgstr "Weiter"
 msgid "Job Description"
 msgstr "Stellenbeschreibung"
 
-#. module: hr_recruitment
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Send New Email"
@@ -302,7 +275,7 @@ msgstr "EMail"
 #. module: hr_recruitment
 #: field:hr.applicant,availability:0
 msgid "Availability (Days)"
-msgstr "Verfügbark. (Tage)"
+msgstr "Frühester Beginn in (Tage)"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -415,7 +388,7 @@ msgstr "Bewerber"
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr "Zeigt Reihenfolge bei Listenansicht"
+msgstr "Zeigt Reihenfolge bei Listenansicht der Einstellungsstufen."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -442,7 +415,7 @@ msgstr "Stufe Personaleinstellung"
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
 msgid "Stages"
-msgstr "Stufen"
+msgstr "Einstellungsstufen"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -457,7 +430,7 @@ msgstr "Formular Stellenbeschreibung"
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
 msgid "Probability"
-msgstr "Wahrscheinlichk."
+msgstr "Wahrscheinlichkeit"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -513,7 +486,7 @@ msgstr "Kategorie"
 #. module: hr_recruitment
 #: field:hr.applicant,partner_name:0
 msgid "Applicant's Name"
-msgstr "Name d. Bewerbers"
+msgstr "Bewerber"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -529,7 +502,7 @@ msgstr "# Fälle"
 #. module: hr_recruitment
 #: field:hr.applicant,date_open:0
 msgid "Opened"
-msgstr "Eröffnet"
+msgstr "Start Bearbeitung"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -565,9 +538,10 @@ msgstr ""
 "EMailadressen"
 
 #. module: hr_recruitment
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr "Datum Einstellung"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
@@ -582,7 +556,7 @@ msgstr "Antwort"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr "Du. Zeit f. Beend."
+msgstr "Durch. Zeit b. Einstellung"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
@@ -600,7 +574,7 @@ msgstr "Termin"
 #: view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Pending"
-msgstr "Unbearbeitet"
+msgstr "In Wartestellung"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -645,7 +619,7 @@ msgstr "Stufen Einstellung"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
 msgid "Refused by Company"
-msgstr "Abgesagt d. Untern."
+msgstr "Absage durch Unternehmen"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_close:0
@@ -686,7 +660,7 @@ msgstr "Rückmeldung"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr "Abgeschl. Berufsausbildung"
+msgstr "Berufsausbildung"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -772,24 +746,12 @@ msgstr "Bewerberkategorien"
 msgid "Open"
 msgstr "Offen"
 
-#. module: hr_recruitment
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
 msgstr "Ein Partner mit identischem Namen existiert bereits."
 
-#. module: hr_recruitment
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen haben !"
-
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
 msgid "Gives the sequence order when displaying a list of degrees."
@@ -802,14 +764,14 @@ msgstr ""
 #: field:hr.applicant,user_id:0
 #: view:hr.recruitment.report:0
 msgid "Responsible"
-msgstr "Verantwortlicher"
+msgstr "Verantwortlich"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
 msgid "Recruitment Analysis"
-msgstr "Analyse Personalbeschaffung"
+msgstr "Statistik Personalbeschaffung"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -860,12 +822,7 @@ msgstr "Mai"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
 msgid "Contract Signed"
-msgstr "Vertrag unterschrieben"
-
-#. module: hr_recruitment
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive Sales team."
-msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
+msgstr "Vertragsunterschrift"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -878,7 +835,7 @@ msgstr "Abgesagt"
 #: code:addons/hr_recruitment/hr_recruitment.py:0
 #, python-format
 msgid "Applicant '%s' is being hired."
-msgstr ""
+msgstr "Bewerber '%s' wird eingestellt."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -891,7 +848,7 @@ msgstr "Eingestellt"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
 msgid "Refused by Employee"
-msgstr "Abgesagt d. Bewerber"
+msgstr "Absage durch Bewerber"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -909,11 +866,6 @@ msgstr "Ausbildungsabschluss"
 msgid "Emails"
 msgstr "EMails"
 
-#. module: hr_recruitment
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
 msgid "February"
@@ -976,3 +928,32 @@ msgstr "Anz. Tg. b. Lösung"
 #: field:hr.job,survey_id:0
 msgid "Survey"
 msgstr "Umfrage"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehlerhafter Modellname in der Aktion"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen haben !"
+
+#~ msgid "Error ! You cannot create recursive Sales team."
+#~ msgstr "Fehler ! Sie können kein rekursives Sales Team haben."
+
+#~ msgid "The code of the sales team must be unique !"
+#~ msgstr "Die Kurzbezeichnung für das Vertriebsteam sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_recruitment/i18n/pt.po b/addons/hr_recruitment/i18n/pt.po
new file mode 100644
index 00000000000..9e58fd7a79a
--- /dev/null
+++ b/addons/hr_recruitment/i18n/pt.po
@@ -0,0 +1,921 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 15:34+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Requisitos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "Número de casos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Departamento"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr "Dias até a abertura"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Objetivos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr "Criar Terceiro"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Dia"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr "Dados do contrato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Telemóvel"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contacto do Terceiro"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Recrutamento"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr "Salário proposto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Terceiro"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Média do Salário Proposto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Disponibilidade"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Telefonema"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr "Converter em Terceiro"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr "Estatísticas de recrutamento"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Enviar novo email"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Data de criação"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Data planeada"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "Segunda entrevista"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Salário esperado"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Salário esperado"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Candidatos"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr "Datas"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr "    Month-1    "
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr " > Bac +5"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr "Candidato"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "Em curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Probabilidade"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "RH - Recrutamento"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Primeira entrevista"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Salário proposto"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Categori­a"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Nome do candidato"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Muito bom"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr "Número de casos"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr "Aberto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Agrupar por..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "Em curso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr "Salário esperado pelo candidato"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr "Salário proposto pela organização"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Reunião"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefone"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr "Dias até ao fecho"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Excelente"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr "Salário médio proposto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr "Telefonema agendado"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr "Janeiro"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "Estas pessoas vão receber email"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr "Descrição da chamada telefónica"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr "Proposta de contrato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr "Categorias de candidatos"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr "Já existe um terceiro com o mesmo nome."
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "Responsável"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Atual"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr "Detalhes"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Entrevista"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr "Contratado"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr "Recusado pelo empregado"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr "Em méda"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr "Departamento de Recursos Humanos"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Atribuir a"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index bb10c4f5ae1..e05ff1c2ac5 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 14:29+0000\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 13:36+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: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr "Zeit- und Aufgabenerfassung"
+msgstr "Produktvorlage Arbeitszeit"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -78,12 +78,12 @@ msgstr "Beende Arbeit"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr "Arbeitszeit n. Mitarbeiter u. Projekt"
+msgstr "Personal und Projekt Arbeitszeiten"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr "Arbeitszeit Statistik"
+msgstr "Statistik Arbeitszeit"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -126,22 +126,23 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "Minimum Analyt. Betrag"
+msgstr "Mindestwert für Analysebuchung"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
 msgstr "Monatliche Zeiterfassung"
 
-#. module: hr_timesheet
-#: view:hr.sign.in.project:0
-msgid "Sign in / Sign out"
-msgstr "Anmelden / Abmelden"
-
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr "erledigte Arbeit (vorherige Periode)"
+msgstr "kürzlich erledigte Arbeit"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -205,7 +206,7 @@ msgstr "Personalwesen - Arbeitszeiterfassung"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr "Anmelden / Abmelden Projekte"
+msgstr "Anmelden / Abmelden bei Projekt"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -214,11 +215,6 @@ msgstr "Anmelden / Abmelden Projekte"
 msgid "Sat"
 msgstr "Sa"
 
-#. module: hr_timesheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
 #: code:addons/hr_timesheet/report/users_timesheet.py:0
@@ -226,16 +222,13 @@ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 msgid "Sun"
 msgstr "So"
 
-#. module: hr_timesheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 msgid ""
 "Working Hours allows you to log your working hours by project every day."
 msgstr ""
+"Arbeitsstunden ermöglicht Ihnen die Erfassung von projektbezogenen Zeiten im "
+"Rahmen der Arbeitszeiterfassung."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -243,11 +236,6 @@ msgstr ""
 msgid "Print"
 msgstr "Druck"
 
-#. module: hr_timesheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
@@ -282,18 +270,6 @@ msgstr "Anfangsdatum"
 msgid "Categories"
 msgstr "Kategorien"
 
-#. module: hr_timesheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: hr_timesheet
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Fehler: Verkaufseinheit (VE) sollte in einer anderen Kategorie sein als "
-"Mengeneinheit (ME)"
-
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
@@ -326,11 +302,9 @@ msgid "September"
 msgstr "September"
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
-#, python-format
-msgid "December"
-msgstr "Dezember"
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Zeiterfassung Positionen"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -352,7 +326,7 @@ msgstr "Monat"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
 msgid "Work Description"
-msgstr "Arbeitsplatzbeschreibung"
+msgstr "Aufgabenbeschreibung"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -369,7 +343,7 @@ msgstr "Mitarbeiter Zeiterfassung"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr "Anmelden / Abmelden"
+msgstr "Anmelden / Abmelden bei Projekt"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -379,12 +353,9 @@ msgid "Fri"
 msgstr "Fr"
 
 #. module: hr_timesheet
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Fehler: Die Standard Mengeneinheit (ME) sowie die Beschaffungs Mengeneinheit "
-"(ME) muss in derselben Kategorie sein."
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Anmelden / Abmelden"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:0
@@ -407,11 +378,6 @@ msgstr "(Leer lassen für aktuelle Zeit)"
 msgid "Timesheets"
 msgstr "Zeiterfassung"
 
-#. module: hr_timesheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
@@ -462,6 +428,11 @@ msgstr "Datum"
 msgid "November"
 msgstr "November"
 
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
@@ -524,6 +495,13 @@ msgstr "Meine Zeiterfassung"
 msgid "Analysis summary"
 msgstr "Gesamtanalyse"
 
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "December"
+msgstr "Dezember"
+
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
@@ -538,7 +516,7 @@ msgstr "Abbrechen"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Arbeitszeit n. Mitarbeiter"
+msgstr "Personal Arbeitszeiten"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -546,24 +524,11 @@ msgstr "Arbeitszeit n. Mitarbeiter"
 msgid "février"
 msgstr "Februar"
 
-#. module: hr_timesheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
 msgstr "Information"
 
-#. module: hr_timesheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
@@ -587,11 +552,6 @@ msgstr "Aktuelles Datum"
 msgid "Anlytic account"
 msgstr "Analytisches Konto"
 
-#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zeiterfassung Positionen"
-
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
@@ -706,11 +666,6 @@ msgstr "Benutzer"
 msgid "Start Working"
 msgstr "Beginne Arbeit"
 
-#. module: hr_timesheet
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Fehler: Falscher EAN code"
-
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
@@ -741,7 +696,7 @@ msgstr "Partner"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr "Wechsle Arbeitsplatz"
+msgstr "Ändere Projekt /Aufgabe"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -764,6 +719,9 @@ msgstr "September"
 #~ msgid "Hour"
 #~ msgstr "Stunde"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Choose Users"
 #~ msgstr "Wähle Benutzer"
 
@@ -785,6 +743,12 @@ msgstr "September"
 #~ msgid "Choose your month"
 #~ msgstr "Wähle Monat"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Working Time"
 #~ msgstr "Arbeitszeit"
 
@@ -794,11 +758,40 @@ msgstr "September"
 #~ msgid "Working Hours of The Day"
 #~ msgstr "Alle heutigen Arbeitsstunden"
 
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Fehler: Falscher EAN code"
+
 #~ msgid "Consultancy - Senior Developer"
 #~ msgstr "Beratung - Senier Entwickler"
 
 #~ msgid "Total"
 #~ msgstr "Betrag gesamt"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Fehler: Verkaufseinheit (VE) sollte in einer anderen Kategorie sein als "
+#~ "Mengeneinheit (ME)"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Beschaffungs Mengeneinheit "
+#~ "(ME) muss in derselben Kategorie sein."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
 #~ msgid "This Wizard will make Sign In/Out By Project"
 #~ msgstr "Dieser Assistent ermöglicht Anmelden / Abmelden nach Projekt"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 0d1622eb45b..d21654375cb 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 17:18+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 20:20+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -163,23 +162,10 @@ msgstr "Positionen mit Abrechnungsquote"
 msgid "Random Timesheets Lines"
 msgstr "zufällige Zeitaufzeichnungszeilen"
 
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,user_id:0
-#: field:report.random.timesheet,user_id:0
-#: view:report.timesheet.line:0
-#: field:report.timesheet.line,user_id:0
-#: field:report_timesheet.account,user_id:0
-#: field:report_timesheet.account.date,user_id:0
-#: field:report_timesheet.invoice,user_id:0
-#: field:report_timesheet.user,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
-msgstr "Projektportal"
+msgstr "Projekt"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
@@ -192,6 +178,11 @@ msgstr "Verkaufspreisliste"
 msgid "Amount"
 msgstr "Betrag"
 
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
 msgid "The detail of each work done will be displayed on the invoice"
@@ -205,7 +196,7 @@ msgstr "Zufällige Zeitaufzeichnung"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr "Erzeuge Rechnung aus dem Analysekonto"
+msgstr "Erzeuge Rechnung für abrechenbare Zeiten"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -258,7 +249,7 @@ msgstr "Schlussrechnung für Analytisches Konto"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr "Analyse Konto unvollständig"
+msgstr "Analytisches Konto unvollständig"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -274,7 +265,7 @@ msgstr "Analytisches Konto"
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr "Deadline"
+msgstr "Frist"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
@@ -286,6 +277,11 @@ msgstr "Abzurechnende Analytische Konten"
 msgid "Partner"
 msgstr "Partner"
 
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
 msgid "The time of each work done will be displayed on the invoice"
@@ -311,11 +307,6 @@ msgstr ""
 msgid "Final Invoice"
 msgstr "Schlussrechnung"
 
-#. module: hr_timesheet_invoice
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Do you want details for each line of the invoices ?"
@@ -334,11 +325,6 @@ msgstr "Abzurechnende Kosten"
 msgid "Analytic account"
 msgstr "Analytisches Konto"
 
-#. module: hr_timesheet_invoice
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 #: field:report.analytic.account.close,state:0
@@ -359,7 +345,7 @@ msgstr "Soll"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,employee_ids:0
 msgid "Employee"
-msgstr "Mitabeiter"
+msgstr "Mitarbeiter"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
@@ -373,7 +359,7 @@ msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this"
 msgstr ""
-"Die eigenen Kosten für jede erledigte Aufgabe werden auf der Rechnung mit "
+"Die Selbstkosten für jede erledigte Aufgabe werden auf der Rechnung mit "
 "angezeigt. Sie sollten prüfen, ob dieses wirklich gewollt ist."
 
 #. module: hr_timesheet_invoice
@@ -381,11 +367,6 @@ msgstr ""
 msgid "Name"
 msgstr "Kunde"
 
-#. module: hr_timesheet_invoice
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
@@ -411,8 +392,8 @@ msgid ""
 msgstr ""
 "Tragen Sie einen Wert in dieses Feld ein, um automatisch "
 "Weiterberechnungsvorschläge an Kunden auf Basis der Kosten für dieses "
-"Analyt. Konto vorzunehmen, die durch dieerfassten Zeiten und durch erledigte "
-"Aufgaben zustande gekommen sind. Sie können ebenfalls eine "
+"Analytische Konto vorzunehmen, die durch die erfassten Zeiten und durch "
+"erledigte Aufgaben zustande gekommen sind. Sie können ebenfalls eine "
 "Weiterberechnungsquote festlegen (z.B. 100%, 50% oder kostenlos)."
 
 #. module: hr_timesheet_invoice
@@ -421,7 +402,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
 msgid "Timesheet Profit"
-msgstr "Auswertung Abrechnungsquote"
+msgstr "Abrechnungsquote"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -453,11 +434,6 @@ msgstr "Zufälliger Zeitaufzeichungsbericht"
 msgid "Printing date"
 msgstr "Datum Druck"
 
-#. module: hr_timesheet_invoice
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
@@ -479,7 +455,8 @@ msgstr "Soll"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
 #, python-format
 msgid "You can not modify an invoiced analytic line!"
-msgstr "Sie können keine abgerechnete Analytische Buchung modifizieren!"
+msgstr ""
+"Sie können keine bereits abgerechnete Analytische Buchung modifizieren!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -494,7 +471,7 @@ msgstr "Zeiterfassung nach Benutzer"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
 msgid "Timesheet by Invoice"
-msgstr "Zeiterfassung nach Rechnung"
+msgstr "Zeiterfassung nach Abrechnung"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
@@ -548,9 +525,17 @@ msgid "Currency"
 msgstr "Währung"
 
 #. module: hr_timesheet_invoice
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#: view:random.timesheet.lines:0
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Benutzer"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,product:0
@@ -565,7 +550,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr "Nicht zugewiesene Zeiterfassung"
+msgstr "Keine zugewiesene Zeiterfassung bei Benutzern"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
@@ -588,9 +573,9 @@ msgid "Invoice rate by user"
 msgstr "Abrechnungsquote nach Benutzern"
 
 #. module: hr_timesheet_invoice
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Zeiterfassung nach Konto"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -626,7 +611,7 @@ msgstr "August"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr "Auszug Aufwandsbuchungen"
+msgstr "Aufwandskonto"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
@@ -695,7 +680,7 @@ msgstr "Zu Berechnen"
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Eff."
-msgstr "Eff."
+msgstr "Gewinn in %"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -856,7 +841,7 @@ msgstr "Ausgleich für dieses Produkt"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr "Rechnungsdaten"
+msgstr "Abrechnungsdaten"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -870,19 +855,6 @@ msgstr ""
 "analytischen Konto ein , um die erfassten Zeiten abzurechnen:\n"
 "%s"
 
-#. module: hr_timesheet_invoice
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: hr_timesheet_invoice
-#: view:report_timesheet.account:0
-msgid "Timesheet by account"
-msgstr "Zeiterfassung nach Konto"
-
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
@@ -967,7 +939,6 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: hr_timesheet_invoice
-#: view:board.board:0
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
 msgid "Uninvoice lines with billing rate"
 msgstr "Storno Rechnungszeile mit Abrechnungsquote"
@@ -980,7 +951,7 @@ msgstr "%"
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr "Eingangsrechnung"
+msgstr "Abrechnung"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -1193,6 +1164,9 @@ msgstr "Suche Zeiterfassung Positionen"
 #~ msgid "Filter on Accounts"
 #~ msgstr "Filter auf Analysekonten"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "My Uninvoiced Entries"
 #~ msgstr "Meine Abzurechnenden Dienstleistungen"
 
@@ -1215,6 +1189,12 @@ msgstr "Suche Zeiterfassung Positionen"
 #~ msgid "Entries to invoice"
 #~ msgstr "Abrechenbare Dienstleistungen"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Choose accounts you want to invoice"
 #~ msgstr "Wähle abzurechnendes Konto"
 
@@ -1273,3 +1253,15 @@ msgstr "Suche Zeiterfassung Positionen"
 #~ "Bitte tragen Sie einen Partner ein sowie geben Sie eine Preisliste an '\n"
 #~ "                    'für das analytische Konto:\n"
 #~ "%s"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 1d03581ca22..b763f96c10a 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -458,7 +458,7 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet Lines">
                    <group col='15' colspan='4'>
-                        <filter icon="terp-check" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-check" string="Current" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                       <field name="user_id" widget="selection"/>
                       <field name="product_id" widget="selection"/>
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 39c2d9c6769..8dee90094ad 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -44,14 +44,10 @@
   I check that Invoice is created for this timesheet.
 -
   !python {model: account.analytic.line}: |
-    account_id = self.pool.get('account.analytic.line')
-    accounts = account_id.browse(cr, uid, [ref("account_analytic_line_developyamlforhrmodule0")])[0]
-    exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
+    aline = self.browse(cr, uid, ref('account_analytic_line_developyamlforhrmodule0'))
     analytic_account_obj = self.pool.get('account.analytic.account')
     data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
-    account_ids = accounts['account_id']
-    for account in analytic_account_obj.browse(cr, uid, account_ids, context):
-            partner = account.partner_id.id
+    partner = aline.account_id.partner_id.id
 
     invoice_obj = self.pool.get('account.invoice')
     invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner)])
@@ -63,6 +59,10 @@
     product_exp = data['product']
 
     assert product == product_exp
+    assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
+    assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
+    # The expected amount is hard coded here, please keep updated:
+    assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
 -
   I create final invoice for this analytic account.
 -
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 04cdc7231e5..447b04ecf68 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -289,7 +289,7 @@ class hr_timesheet_sheet(osv.osv):
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Draft'),
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 25c66e39cbf..ea94ec95ab5 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 14:14+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-05 20:22+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -54,11 +53,6 @@ msgstr "Kein Mitarbeiter für diesen Benutzer definiert!"
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
@@ -240,12 +234,12 @@ msgstr "Analytisches Konto"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Project Timesheet"
-msgstr "Projektbezogene Zeiterfassung"
+msgstr "Projektzeit"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Anz."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -283,13 +277,13 @@ msgstr "Bestätigt"
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 msgid "Attendance"
-msgstr "Teilnahme"
+msgstr "Anwesenheit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
 msgid "Confirm"
-msgstr "Gebucht"
+msgstr "Bestätigen"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
@@ -297,9 +291,9 @@ msgid "Timesheet lines"
 msgstr "Zeiterfassung Positionen"
 
 #. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -324,11 +318,6 @@ msgstr "Mitarbeiter"
 msgid "New"
 msgstr "Neu"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
@@ -362,6 +351,13 @@ msgstr "Stunden"
 msgid "#Cost"
 msgstr "#Kosten"
 
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Fehler: Anmeldung (bzw. Abmeldung) muss auf eine Abmeldung (bzw. Anmeldung) "
+"folgen"
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
@@ -399,11 +395,6 @@ msgstr ""
 "Sie können keine Arbeitszeiten für einen Mitarbeiter ohne zugeordneten "
 "Benutzer erfassen !"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
@@ -418,13 +409,13 @@ msgstr "Tagesbericht"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr "#Anzahl"
+msgstr "#Stunden"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
 msgid "Total Timesheet"
-msgstr "Gesamte Zeiterfassung"
+msgstr "Gesamte Projektzeit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -440,7 +431,7 @@ msgstr "Sign In"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr "# Anzahl Zeiterfassung"
+msgstr "# Projektstunden"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
@@ -450,7 +441,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Go to:"
-msgstr "Zuweisung an:"
+msgstr "Wähle Datum:"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -482,7 +473,7 @@ msgstr "Monat"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr "# Gesamtabweichung"
+msgstr "# Abweichung"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -492,7 +483,7 @@ msgstr "In Entwurf"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr "Einschreiben/Ausschreiben"
+msgstr "Anmelden / Abmelden"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -540,11 +531,6 @@ msgstr "Entwurf"
 msgid "Timesheet allowed difference(Hours)"
 msgstr "Erlaubte Abweichung in Stunden"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -556,7 +542,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr "Die Rechnung wird auf Basis der Zeiterfassung generiert,"
+msgstr "Die Rechnung wird auf Basis der Zeiterfassung generiert."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
@@ -678,7 +664,7 @@ msgstr "Unternehmen"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr "Anzahl"
+msgstr "Stunden"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -688,12 +674,6 @@ msgstr "Anzahl"
 msgid "General Account"
 msgstr "Sachkonto"
 
-#. module: hr_timesheet_sheet
-#: view:timesheet.report:0
-#: field:timesheet.report,to_invoice:0
-msgid "Type of Invoicing"
-msgstr "Abrechnungstyp"
-
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
@@ -735,13 +715,6 @@ msgstr "Erledigt"
 msgid "State is 'draft'."
 msgstr "Status ist Entwurf"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
@@ -757,24 +730,11 @@ msgstr "Genehmigt"
 msgid "Open"
 msgstr "Öffnen"
 
-#. module: hr_timesheet_sheet
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
 msgstr "Zeiterfassung nach Konten"
 
-#. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
@@ -808,7 +768,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr "Statistik Zeiterfassung"
+msgstr "Statistik Arbeitszeit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -958,15 +918,16 @@ msgid "Analytic accounts"
 msgstr "Analytische Konten"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Abrechnungstyp"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr "#Gesamtanwesenheit"
+msgstr "#Anwesenheit"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -975,10 +936,11 @@ msgid ""
 "You can also encode time spent on a project that is an analytic account and "
 "the time spent on a project generate costs on the analytic account."
 msgstr ""
-"Diese Ansicht ermöglicht die Zeiterfassung zu einer vorgegebenen zeitlichen "
-"Abfolge. Sie können hier ausserdem eine Eingabe des Zeitaufwands für "
-"Projekte vornehmen, die durch analytische Konten repräsentiert werden und "
-"über diesen Weg Kosten für dieses Konto buchen."
+"Diese Ansicht ermöglicht die Zeiterfassung innerhalb eines durch das "
+"Unternehmen vorgegebenen Zeitraum für die Zeiterfassung (z.B. Woche oder "
+"Monat). Sie können hier ausserdem eine Eingabe des Zeitaufwands für Projekte "
+"vornehmen, die durch analytische Konten repräsentiert werden und über diesen "
+"Weg Kosten für dieses Konto buchen."
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -1097,6 +1059,9 @@ msgstr "Journal"
 #~ msgid "Confirmed Timesheet"
 #~ msgstr "Drucke Zeiterfassung"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Timesheets by period"
 #~ msgstr "Zeiterfassung nach Perioden"
 
@@ -1142,6 +1107,12 @@ msgstr "Journal"
 #~ msgid "Creates your analytic cost accoording to quantity"
 #~ msgstr "Erzeuge analytische Kostenbuchung in Abhängigkeit von der Menge"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Timesheet is validate by project manager."
 #~ msgstr ""
 #~ "Zeiterfassung wird durch Projektmanager akzeptiert (validiert / genehmigt)."
@@ -1187,3 +1158,26 @@ msgstr "Journal"
 
 #~ msgid "My Department's Timesheet to Validate"
 #~ msgstr "Meine Abteilung Zeiterfassung (zu bestätigen)"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 1ee4c41c2ab..e6bb300cc49 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -6,23 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:01+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 18:17+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_review0
-msgid "Review end of day check day is complete"
-msgstr "Revisar final del día que la comprobación del día está completa"
-
-#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #: constraint:hr_timesheet_sheet.sheet:0
+#, python-format
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
@@ -40,27 +38,41 @@ msgid "Sheet"
 msgstr "Hoja"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
 msgstr "Total servicio"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
-msgid "My timesheets to confirm"
-msgstr "Mis hojas de servicios a confirmar"
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_range:0
-msgid "Timeshet range"
-msgstr "Rango hoja de servicios"
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -68,15 +80,37 @@ msgid "Today"
 msgstr "Hoy"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet sheet"
-msgstr "Confirmar hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"¡Por favor, verifique que la diferencia total de la hoja de servicios es "
+"menor que %.2f!"
 
 #. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
 #: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+#: view:timesheet.report:0
 msgid "Timesheet"
 msgstr "Hoja de servicios"
 
@@ -86,20 +120,15 @@ msgid "Set to Draft"
 msgstr "Cambiar a borrador"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
-msgid "Defines employee's timesheet entry"
-msgstr "Define entrada hoja de servicios del empleado"
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "Fecha hasta"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Draft Timesheet sheet"
-msgstr "Hoja de servicios borrador"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Current Timesheet"
-msgstr "Mi hoja de servicios actual"
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -107,7 +136,11 @@ msgid "Validate"
 msgstr "Validar"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
 msgid "Day"
 msgstr "Día"
 
@@ -116,6 +149,17 @@ msgstr "Día"
 msgid "Present"
 msgstr "Presente"
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
@@ -123,59 +167,57 @@ msgid "Refuse"
 msgstr "Rechazar"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated Timesheet"
-msgstr "Hoja de servicios validada"
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
-"¡Debe seleccionar una fecha actual que esté en las fechas de la hoja de "
-"servicios!"
-
-#. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Difference"
-msgstr "Diferencia total"
-
-#. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Phone call encoding"
-msgstr "Codificación llamada telefónica"
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Day"
-msgstr "Hoja de servicios por día"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
-msgid "Defines the task work entry into timesheet line"
-msgstr "Define la tarea de trabajo en línea hoja de servicios"
-
-#. module: hr_timesheet_sheet
-#: help:res.company,timesheet_max_difference:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
 msgid ""
-"Allowed difference between the sign in/out and the timesheet computation for "
-"one sheet. Set this to 0 if you do not want any control."
+"You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Diferencia permitida entre el registro de entrada/salida y el cálculo del "
-"tiempo para una hoja de servicio. Establezca su valor a 0 si no quiere "
-"ningún control."
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Timesheet by Days"
-msgstr "Hoja de servicios por días"
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "timesheet is confirmed at the end of the week / month"
-msgstr "Hoja de servicios es confirmada al final de la semana / mes"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign in from an other date than today"
+msgstr "No puede registrar entrada en otra fecha que no sea hoy"
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
 #: field:hr_timesheet_sheet.sheet.account,name:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
@@ -184,30 +226,46 @@ msgstr "Cuenta analítica"
 msgid "Project Timesheet"
 msgstr "Hoja de servicios del proyecto"
 
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
 msgid "Date from"
 msgstr "Fecha desde"
 
 #. module: hr_timesheet_sheet
-#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
-msgid "Hr Timesheet Process"
-msgstr "Proceso hoja de asistencia RH"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost"
-msgstr "Coste analítico"
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Confirmed"
 msgstr "Confirmada"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
 msgstr "Servicio"
 
@@ -223,29 +281,44 @@ msgid "Timesheet lines"
 msgstr "Líneas hoja de servicios"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Encode your timesheet line"
-msgstr "Codifica su línea de hoja de servicios"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
-msgid "Confirm Timesheet"
-msgstr "Confirmar hoja de servicios"
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Control by the project manager"
-msgstr "Control por el responsable del proyecto"
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
 msgid "New"
 msgstr "Nuevo"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
-msgid "Timesheet sheet confirm at the end of the period"
-msgstr "Hoja de servicios confirmada al final del periodo"
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
@@ -258,9 +331,20 @@ msgid "Timesheet Lines"
 msgstr "Líneas de la hoja de asistencia"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
-msgid "Confirm timesheet at the end of the period"
-msgstr "Confirmar hoja de servicios al final del periodo"
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -268,9 +352,21 @@ msgid "No employee defined"
 msgstr "No hay empleado definido"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "Confirmed Timesheet"
-msgstr "Hoja de servicios confirmada"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -278,14 +374,17 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Week"
-msgstr "Semana"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"You cannot create a timesheet for an employee that does not have any user "
+"defined !"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -293,10 +392,21 @@ msgid "Daily View"
 msgstr "Vista diaria"
 
 #. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
-msgid "Timesheets by period"
-msgstr "Hojas de servicios por período"
+#: view:timesheet.report:0
+#: field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+msgid "Total Timesheet"
+msgstr "Total hoja servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -304,10 +414,15 @@ msgid "Sign In"
 msgstr "Registrar entrada"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
-msgid "My Department's Timesheet"
-msgstr "Hoja de servicios de mi departamento"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -315,73 +430,123 @@ msgid "Go to:"
 msgstr "Ir a:"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
-msgid "Phone call"
-msgstr "Llamada telefónica"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,total_timesheet:0
-#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
-#: view:hr_timesheet_sheet.sheet.day:0
-msgid "Total Timesheet"
-msgstr "Total hoja servicios"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of work"
-msgstr "Revisión de trabajo"
-
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr "Facturar sobre trabajo"
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
 msgid "Month"
 msgstr "Mes"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
-msgid "Encode Your hours and Sign in / out"
-msgstr "Codificar sus horas y registrar entrada/salida"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_review0
-#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
-msgid "Review"
-msgstr "Revisión"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.module.module,shortdesc:hr_timesheet_sheet.module_meta_information
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
-#: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
-#: view:res.company:0
-msgid "Timesheets"
-msgstr "Hojas de trabajo"
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
-msgid "Timesheets To Confirm"
-msgstr "Hojas de servicios a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not sign out from an other date than today"
+msgstr "No puede registrar salida en otra fecha que no sea hoy"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,state:0
-msgid "Status"
-msgstr "Estado"
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,date_to:0
-msgid "Date to"
-msgstr "Fecha hasta"
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid " Year "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -389,14 +554,25 @@ msgid "Current Status"
 msgstr "Estado actual"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Invoice on timesheet"
-msgstr "Facturar sobre hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice based on timesheet"
-msgstr "Factura basada en hoja de servicios"
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "Usuario"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -404,30 +580,80 @@ msgid "Timesheet by Account"
 msgstr "Hoja de servicios por cuenta"
 
 #. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
 msgstr "Fecha"
 
 #. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
-msgid "Creates invoice based on timesheet"
-msgstr "Crea factura basada en hoja de servicios"
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
-msgid "Timesheets To Validate"
-msgstr "Hojas de servicios a validar"
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: field:res.company,timesheet_max_difference:0
-msgid "Timesheet allowed difference"
-msgstr "Diferencia permitida hoja de servicios"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -435,25 +661,47 @@ msgstr "Diferencia permitida hoja de servicios"
 msgid "Period"
 msgstr "Período"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
-msgid "Attendance entry moves into the timesheet"
-msgstr "Convierte entrada de asistencia/servicio en hoja de servicios"
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Creates your analytic cost accoording to quantity"
-msgstr "Crea su coste analítico acorde con cantidad"
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
-msgid "Timesheet Line"
-msgstr "Línea de la hoja de servicios"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -461,33 +709,59 @@ msgid "Timesheet by Accounts"
 msgstr "Hoja de servicios por cuentas"
 
 #. module: hr_timesheet_sheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which are already confirmed !"
+msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Timesheet is validate by project manager."
-msgstr "Hoja de servicios es validada por el responsable del proyecto"
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
-msgid "Whatever time u spent for phone call"
-msgstr "Cualquier tiempo que dedique a la llamada telefónica"
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
-msgid "Validate Timesheet"
-msgstr "Validar hoja de servicios"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
-msgid "My Department's Timesheet to Confirm"
-msgstr "Hoja de servicios de mi departamento a confirmar"
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain equal no. of sign "
+"ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -497,25 +771,55 @@ msgid "Attendances"
 msgstr "Servicios"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
-msgid "Create Analytic cost"
-msgstr "Crear coste analítico"
-
-#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
 #: field:hr_timesheet_sheet.sheet,name:0
+#: field:timesheet.report,name:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
 msgstr "Registrar salida"
 
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
 msgstr "Por día"
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
@@ -523,30 +827,37 @@ msgstr "Por día"
 msgid "Difference"
 msgstr "Diferencia"
 
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
-msgid "hr_timesheet_sheet.sheet"
-msgstr "Hoja de servicios"
-
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
 msgstr "Ausente"
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
-msgid "At the end of the period (week/month)"
-msgstr "Al final del periodo (semana/mes)"
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
-msgid "timesheet entry is into draft state."
-msgstr "entrada hoja de servicios está en estado borrador."
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
-msgid "Analytic cost is created"
-msgstr "Coste analítico es creado"
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -554,14 +865,14 @@ msgid "Invoice rate"
 msgstr "Tasa factura"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
-msgid "Encode how much time u spent on phone call"
-msgstr "Codifica cuanto tiempo dedica en llamadas telefónicas"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "Facturar sobre trabajo"
 
 #. module: hr_timesheet_sheet
-#: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
-msgid "Review of your work at the end of the day"
-msgstr "Revisar su trabajo al final del día"
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -569,39 +880,242 @@ msgid "Analytic accounts"
 msgstr "Cuentas analíticas"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
-msgid "My timesheets"
-msgstr "Mis hojas de servicios"
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr_timesheet_sheet.sheet:0
-msgid "Accept"
-msgstr "Acceptar"
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"This view allows you to check timesheet sheets following a specific period. "
+"You can also encode time spent on a project that is an analytic account and "
+"the time spent on a project generate costs on the analytic account."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
 msgid "Current date"
 msgstr "Fecha actual"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
-msgid "Unvalidated Timesheets"
-msgstr "Hojas de servicios no validadas"
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
 #: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
 msgid "Year"
 msgstr "Año"
 
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
 msgstr "Total"
 
 #. module: hr_timesheet_sheet
-#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
-msgid "My Department's Timesheet to Validate"
-msgstr "Hoja de servicios de mi departamento a validar"
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "Review end of day check day is complete"
+#~ msgstr "Revisar final del día que la comprobación del día está completa"
+
+#~ msgid "My timesheets to confirm"
+#~ msgstr "Mis hojas de servicios a confirmar"
+
+#~ msgid "Timeshet range"
+#~ msgstr "Rango hoja de servicios"
+
+#~ msgid "Confirm timesheet sheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Defines employee's timesheet entry"
+#~ msgstr "Define entrada hoja de servicios del empleado"
+
+#~ msgid "Draft Timesheet sheet"
+#~ msgstr "Hoja de servicios borrador"
+
+#~ msgid "My Current Timesheet"
+#~ msgstr "Mi hoja de servicios actual"
+
+#~ msgid "Validated Timesheet"
+#~ msgstr "Hoja de servicios validada"
+
+#~ msgid "You must select a Current date wich is in the timesheet dates !"
+#~ msgstr ""
+#~ "¡Debe seleccionar una fecha actual que esté en las fechas de la hoja de "
+#~ "servicios!"
+
+#~ msgid "Total Difference"
+#~ msgstr "Diferencia total"
+
+#~ msgid "Phone call encoding"
+#~ msgstr "Codificación llamada telefónica"
+
+#~ msgid "Timesheet by Day"
+#~ msgstr "Hoja de servicios por día"
+
+#~ msgid "Defines the task work entry into timesheet line"
+#~ msgstr "Define la tarea de trabajo en línea hoja de servicios"
+
+#~ msgid ""
+#~ "Allowed difference between the sign in/out and the timesheet computation for "
+#~ "one sheet. Set this to 0 if you do not want any control."
+#~ msgstr ""
+#~ "Diferencia permitida entre el registro de entrada/salida y el cálculo del "
+#~ "tiempo para una hoja de servicio. Establezca su valor a 0 si no quiere "
+#~ "ningún control."
+
+#~ msgid "Timesheet by Days"
+#~ msgstr "Hoja de servicios por días"
+
+#~ msgid "timesheet is confirmed at the end of the week / month"
+#~ msgstr "Hoja de servicios es confirmada al final de la semana / mes"
+
+#~ msgid "Hr Timesheet Process"
+#~ msgstr "Proceso hoja de asistencia RH"
+
+#~ msgid "Analytic cost"
+#~ msgstr "Coste analítico"
+
+#~ msgid "Encode your timesheet line"
+#~ msgstr "Codifica su línea de hoja de servicios"
+
+#~ msgid "Confirm Timesheet"
+#~ msgstr "Confirmar hoja de servicios"
+
+#~ msgid "Control by the project manager"
+#~ msgstr "Control por el responsable del proyecto"
+
+#~ msgid "Timesheet sheet confirm at the end of the period"
+#~ msgstr "Hoja de servicios confirmada al final del periodo"
+
+#~ msgid "Confirm timesheet at the end of the period"
+#~ msgstr "Confirmar hoja de servicios al final del periodo"
+
+#~ msgid "Confirmed Timesheet"
+#~ msgstr "Hoja de servicios confirmada"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Timesheets by period"
+#~ msgstr "Hojas de servicios por período"
+
+#~ msgid "My Department's Timesheet"
+#~ msgstr "Hoja de servicios de mi departamento"
+
+#~ msgid "Phone call"
+#~ msgstr "Llamada telefónica"
+
+#~ msgid "Review of work"
+#~ msgstr "Revisión de trabajo"
+
+#~ msgid "Encode Your hours and Sign in / out"
+#~ msgstr "Codificar sus horas y registrar entrada/salida"
+
+#~ msgid "Review"
+#~ msgstr "Revisión"
+
+#~ msgid "Timesheets To Confirm"
+#~ msgstr "Hojas de servicios a confirmar"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Invoice on timesheet"
+#~ msgstr "Facturar sobre hoja de servicios"
+
+#~ msgid "Invoice based on timesheet"
+#~ msgstr "Factura basada en hoja de servicios"
+
+#~ msgid "Creates invoice based on timesheet"
+#~ msgstr "Crea factura basada en hoja de servicios"
+
+#~ msgid "Timesheets To Validate"
+#~ msgstr "Hojas de servicios a validar"
+
+#~ msgid "Timesheet allowed difference"
+#~ msgstr "Diferencia permitida hoja de servicios"
+
+#~ msgid "Attendance entry moves into the timesheet"
+#~ msgstr "Convierte entrada de asistencia/servicio en hoja de servicios"
+
+#~ msgid "Creates your analytic cost accoording to quantity"
+#~ msgstr "Crea su coste analítico acorde con cantidad"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Timesheet is validate by project manager."
+#~ msgstr "Hoja de servicios es validada por el responsable del proyecto"
+
+#~ msgid "Whatever time u spent for phone call"
+#~ msgstr "Cualquier tiempo que dedique a la llamada telefónica"
+
+#~ msgid "Validate Timesheet"
+#~ msgstr "Validar hoja de servicios"
+
+#~ msgid "My Department's Timesheet to Confirm"
+#~ msgstr "Hoja de servicios de mi departamento a confirmar"
+
+#~ msgid "Create Analytic cost"
+#~ msgstr "Crear coste analítico"
+
+#~ msgid "hr_timesheet_sheet.sheet"
+#~ msgstr "Hoja de servicios"
+
+#~ msgid "At the end of the period (week/month)"
+#~ msgstr "Al final del periodo (semana/mes)"
+
+#~ msgid "timesheet entry is into draft state."
+#~ msgstr "entrada hoja de servicios está en estado borrador."
+
+#~ msgid "Analytic cost is created"
+#~ msgstr "Coste analítico es creado"
+
+#~ msgid "Encode how much time u spent on phone call"
+#~ msgstr "Codifica cuanto tiempo dedica en llamadas telefónicas"
+
+#~ msgid "Review of your work at the end of the day"
+#~ msgstr "Revisar su trabajo al final del día"
+
+#~ msgid "My timesheets"
+#~ msgstr "Mis hojas de servicios"
+
+#~ msgid "Accept"
+#~ msgstr "Acceptar"
+
+#~ msgid "Unvalidated Timesheets"
+#~ msgstr "Hojas de servicios no validadas"
+
+#~ msgid "My Department's Timesheet to Validate"
+#~ msgstr "Hoja de servicios de mi departamento a validar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/idea/i18n/pt.po b/addons/idea/i18n/pt.po
index 8755170e065..b722b45dd28 100644
--- a/addons/idea/i18n/pt.po
+++ b/addons/idea/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 08:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 15:39+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -58,11 +58,6 @@ msgstr "Análise de ideias"
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: idea
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção."
-
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
@@ -116,19 +111,19 @@ msgstr ""
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr "Categorias de Ideias"
+msgstr "Categoria de ideias"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Alerta!"
+msgstr "Atenção!"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr "Seu comentário"
+msgstr "O seu comentário"
 
 #. module: idea
 #: view:report.vote:0
@@ -156,13 +151,13 @@ msgstr "Muito Mau"
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr "Votação em Ideias"
+msgstr "Votação em ideias"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr "Nº de linhas"
+msgstr "Número de linhas"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
@@ -173,17 +168,17 @@ msgstr "Não se pode votar nesta Ideia mais do que %s vezes"
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr "Categorias de Ideias"
+msgstr "Categorias de ideias"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr "Conteudo da ideia"
+msgstr "Conteúdo da ideia"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr "Categoria da Ideia"
+msgstr "Categoria da ideia"
 
 #. module: idea
 #: view:idea.idea:0
@@ -197,7 +192,7 @@ msgstr "Estatísticas"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr "Não  Votado"
+msgstr "Sem votos"
 
 #. module: idea
 #: sql_constraint:idea.category:0
@@ -207,7 +202,7 @@ msgstr "O nome da categoria deve ser único"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr "Selecionar Ideia"
+msgstr "Selecionar ideia"
 
 #. module: idea
 #: view:idea.stat:0
@@ -224,11 +219,6 @@ msgstr "Categorias Descendentes"
 msgid "Next"
 msgstr ""
 
-#. module: idea
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
-
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,state:0
@@ -237,11 +227,6 @@ msgstr "O nome do módulo deve ser único!"
 msgid "State"
 msgstr "Estado"
 
-#. module: idea
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.post.vote,vote:0
@@ -276,7 +261,7 @@ msgstr ""
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr "Abrir a Ideia?"
+msgstr "Abrir a ideia?"
 
 #. module: idea
 #: selection:report.vote,month:0
@@ -297,15 +282,10 @@ msgstr "Aceite"
 msgid "Categories"
 msgstr "Categorias"
 
-#. module: idea
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista!"
-
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr "    Mês-1    "
+msgstr "    Month-1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
@@ -421,11 +401,6 @@ msgstr "Ideias por Categoria"
 msgid "Draft"
 msgstr "Rascunho"
 
-#. module: idea
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Erro! Não pode criar menus recursivos."
-
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
@@ -476,7 +451,7 @@ msgstr "Publicar"
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr "Meu voto"
+msgstr "O meu voto"
 
 #. module: idea
 #: selection:report.vote,month:0
@@ -497,7 +472,7 @@ msgstr "Janeiro"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr "Ideia.ideia"
+msgstr "idea.idea"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -534,13 +509,13 @@ msgstr ""
 #: field:idea.idea,user_id:0
 #: view:report.vote:0
 msgid "Creator"
-msgstr "Criador"
+msgstr "Autor"
 
 #. module: idea
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Dar voto"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
@@ -563,19 +538,6 @@ msgstr "Fechar"
 msgid "Open"
 msgstr "Abrir"
 
-#. module: idea
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#. module: idea
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-"especial !"
-
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
@@ -731,3 +693,27 @@ msgstr "Selecionar Ideia para votar"
 
 #~ msgid "Canceled"
 #~ msgstr "Cancelado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
+#~ "especial !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Não pode criar menus recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index 94487576c5f..e1fc7c7f5e9 100644
--- a/addons/l10n_fr/i18n/pt.po
+++ b/addons/l10n_fr/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-09-16 16:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-06 11:56+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
@@ -21,13 +21,6 @@ msgstr ""
 msgid "Receivable"
 msgstr ""
 
-#. module: l10n_fr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_income
 msgid "Income"
@@ -44,24 +37,19 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_immobilisations
 msgid "Immobilisations"
-msgstr ""
+msgstr "Imobilizado"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
 msgid "France"
-msgstr ""
+msgstr "França"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_asset
 msgid "Asset"
 msgstr "Activo"
 
-#. module: l10n_fr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_equity
 msgid "Equity"
@@ -71,17 +59,17 @@ msgstr "Situação liquida"
 #: view:account.bilan.report:0
 #: view:account.cdr.report:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_report
 msgid "Report for l10n_fr"
-msgstr ""
+msgstr "Relatório para l10n_fr"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
 msgid "Zone Euro"
-msgstr ""
+msgstr "Zona Euro"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_expense
@@ -94,14 +82,14 @@ msgid "Account CDR Report"
 msgstr ""
 
 #. module: l10n_fr
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
+#: model:account.account.type,name:l10n_fr.account_type_provision
+msgid "Provisions"
+msgstr "Provisões"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_payable
 msgid "Payable"
-msgstr ""
+msgstr "Pagável"
 
 #. module: l10n_fr
 #: view:account.cdr.report:0
@@ -111,11 +99,11 @@ msgstr ""
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Relatório"
 
 #. module: l10n_fr
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
+msgid "Hors Euro"
 msgstr ""
 
 #. module: l10n_fr
@@ -126,7 +114,7 @@ msgstr ""
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_line
 msgid "Report Lines for l10n_fr"
-msgstr ""
+msgstr "Relatório de Linhas para l10n_fr"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_7
@@ -136,18 +124,13 @@ msgstr ""
 #. module: l10n_fr
 #: field:l10n.fr.line,definition:0
 msgid "Definition"
-msgstr ""
-
-#. module: l10n_fr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Definição"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,name:0
 #: field:l10n.fr.report,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: l10n_fr
 #: model:ir.actions.act_window,name:l10n_fr.action_account_cdr_report
@@ -157,12 +140,12 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stock
 msgid "Stocks"
-msgstr ""
+msgstr "Stocks"
 
 #. module: l10n_fr
 #: field:l10n.fr.report,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Linhas"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_cash
@@ -174,16 +157,21 @@ msgstr "Dinheiro"
 msgid "Comptes spéciaux"
 msgstr ""
 
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
+msgstr ""
+
 #. module: l10n_fr
 #: field:account.bilan.report,fiscalyear_id:0
 #: field:account.cdr.report,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano fiscal"
 
 #. module: l10n_fr
 #: field:l10n.fr.report,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_dettes
@@ -191,20 +179,20 @@ msgid "Dettes long terme"
 msgstr ""
 
 #. module: l10n_fr
-#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
-msgid "Hors Euro"
-msgstr ""
+#: model:account.account.type,name:l10n_fr.account_type_view
+msgid "View"
+msgstr "Vista"
+
+#. module: l10n_fr
+#: sql_constraint:l10n.fr.line:0
+msgid "The variable name must be unique !"
+msgstr "O nome da variável deve ser único!"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stocks
 msgid "Actif circulant"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_provision
-msgid "Provisions"
-msgstr ""
-
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_6
 msgid "TVA sur le débits"
@@ -219,23 +207,18 @@ msgstr ""
 #. module: l10n_fr
 #: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
 msgid "France - Plan Comptable Général"
-msgstr ""
+msgstr "França - Plano de contas geral"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_tax
 msgid "Tax"
-msgstr ""
+msgstr "Imposto"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
 msgid "DOM-TOM"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_view
-msgid "View"
-msgstr "Ecrã"
-
 #. module: l10n_fr
 #: view:account.bilan.report:0
 #: view:account.cdr.report:0
@@ -250,7 +233,12 @@ msgstr ""
 #. module: l10n_fr
 #: field:l10n.fr.line,code:0
 msgid "Variable Name"
-msgstr ""
+msgstr "Nome da Variável"
 
 #~ msgid "Fiscal year"
 #~ msgstr "Ano fiscal"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
diff --git a/addons/l10n_fr/report/compute_resultant_report.rml b/addons/l10n_fr/report/compute_resultant_report.rml
index de59b0201ee..c77be9534cb 100644
--- a/addons/l10n_fr/report/compute_resultant_report.rml
+++ b/addons/l10n_fr/report/compute_resultant_report.rml
@@ -1,3 +1,652 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Compte de resultat" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" fontName="Times-Roman"/><paraStyle name="P25" fontName="Times-Roman"/><paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P19">[[ _load('cdr',data['form'])]]</para><para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para><para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para><para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para><para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para><para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para><para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para><para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para><para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para><para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para><para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para><blockTable colWidths="165.0,160.0,156.0" style="Tableau"><tr><td><para style="P28">[[ company.name ]]</para><para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P22">Compte de r&#xE9;sultat</para></td><td><para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P20"><font color="white"> </font></para></td><td><para style="P19"><font color="white"> </font></para></td><td><para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P27"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau3"><tr><td><para style="P3">CHARGES ( hors taxes )</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">CHARGES D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Achat de marchandises</para></td><td><para style="P2">[[cdrc1]]</para></td></tr><tr><td><para style="P10">Variation des stocks</para></td><td><para style="P2">[[cdrc2]]</para></td></tr><tr><td><para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P2">[[cdrc3]]</para></td></tr><tr><td><para style="P17">Variation des stocks</para></td><td><para style="P2">[[cdrc4]]</para></td></tr><tr><td><para style="P10">Autres achats et charges externes</para></td><td><para style="P2">[[cdrc5]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para></td><td><para style="P2">[[cdrc6]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para></td><td><para style="P2">[[cdrc7]]</para></td></tr><tr><td><para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para></td><td><para style="P2">[[cdrc8]]</para></td></tr><tr><td><para style="P10">Salaires et traitements</para></td><td><para style="P2">[[cdrc9]]</para></td></tr><tr><td><para style="P17">Charges sociales</para></td><td><para style="P2">[[cdrc10]]</para></td></tr><tr><td><para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux amortissements</para></td><td><para style="P2">[[cdrc11]]</para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc12]]</para></td></tr><tr><td><para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc13]]</para></td></tr><tr><td><para style="P12">Dotations aux provisions</para></td><td><para style="P2">[[cdrc14]]</para></td></tr><tr><td><para style="P12">Autres charges</para></td><td><para style="P2">[[cdrc15]]</para></td></tr><tr><td><para style="P16">TOTAL I</para></td><td><para style="P2">[[ct1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para></td><td><para style="P2">[[cdrc16]]</para></td></tr><tr><td><para style="P15">CHARGES FINANCI&#xC8;RES</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc17]]</para></td></tr><tr><td><para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para></td><td><para style="P2">[[cdrc18]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para></td><td><para style="P2">[[cdrc19]]</para></td></tr><tr><td><para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrc20]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[ct3]]</para></td></tr><tr><td><para style="P18">CHARGES EXCEPTIONNELLES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrc21]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrc22]]</para></td></tr><tr><td><para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc23]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[ct4]]</para></td></tr><tr><td><para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para></td><td><para style="P2">[[cdrc24]]</para></td></tr><tr><td><para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para></td><td><para style="P2">[[cdrc25]]</para></td></tr><tr><td><para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para></td><td><para style="P2">[[charges]]</para></td></tr></blockTable><para style="P24"><font color="white"> </font></para><pageBreak/><para style="P25"><font color="white"> </font></para><para style="P24"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau1"><tr><td><para style="P3">PRODUITS (hors taxes)</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">PRODUITS D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Vente de marchandises</para></td><td><para style="P2">[[cdrp1]]</para></td></tr><tr><td><para style="P10">Production vendue [biens et services]</para></td><td><para style="P2">[[cdrp2]]</para></td></tr><tr><td><para style="P13">Sous-total A - Montant net du chiffre d'affaires</para></td><td><para style="P2">[[pta]]</para></td></tr><tr><td><para style="P17">Production stock&#xE9;e</para></td><td><para style="P2">[[cdrp3]]</para></td></tr><tr><td><para style="P10">Production immobilis&#xE9;e</para></td><td><para style="P2">[[cdrp4]]</para></td></tr><tr><td><para style="P10">Subventions d'exploitation</para></td><td><para style="P2">[[cdrp5]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para></td><td><para style="P2">[[cdrp6]]</para></td></tr><tr><td><para style="P10">Autres produits</para></td><td><para style="P2">[[cdrp7]]</para></td></tr><tr><td><para style="P13">Sous-total B</para></td><td><para style="P2">[[ptb]]</para></td></tr><tr><td><para style="P14">TOTAL I ( A + B )</para></td><td><para style="P2">[[pt1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para></td><td><para style="P2">[[cdrp8]]</para></td></tr><tr><td><para style="P15">PRODUITS FINANCIERS</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P11">De participation</para></td><td><para style="P2">[[cdrp9]]</para></td></tr><tr><td><para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para></td><td><para style="P2">[[cdrp10]]</para></td></tr><tr><td><para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para></td><td><para style="P2">[[cdrp11]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp12]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences positives de change</para></td><td><para style="P2">[[cdrp13]]</para></td></tr><tr><td><para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrp14]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[pt3]]</para></td></tr><tr><td><para style="P18">PRODUITS EXCEPTIONNELS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrp15]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrp16]]</para></td></tr><tr><td><para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp17]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[pt4]]</para></td></tr><tr><td><para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para></td><td><para style="P2">[[produits]]</para></td></tr><tr><td><para style="P16">PRODUITS - CHARGES</para></td><td><para style="P2">[[produits-charges]]</para></td></tr></blockTable><para style="Standard"><font color="white"> </font></para></story></document>
-
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Compte de resultat" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="20.0" width="481" height="802"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P24" fontName="Times-Roman"/>
+    <paraStyle name="P25" fontName="Times-Roman"/>
+    <paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/>
+    <paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P19">[[ _load('cdr',data['form'])]]</para>
+    <para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para>
+    <para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para>
+    <para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para>
+    <para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para>
+    <para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para>
+    <para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para>
+    <para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para>
+    <para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para>
+    <para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para>
+    <para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para>
+    <blockTable colWidths="165.0,160.0,156.0" style="Tableau">
+      <tr>
+        <td>
+          <para style="P28">[[ company.name ]]</para>
+          <para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para>
+        </td>
+        <td>
+          <para style="P22">Compte de r&#xE9;sultat</para>
+        </td>
+        <td>
+          <para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P20">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P19">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P27">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="309.0,173.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="P3">CHARGES ( hors taxes )</para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">CHARGES D'EXPLOITATION</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Achat de marchandises</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc1]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Variation des stocks</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc2]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc3]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Variation des stocks</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc4]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Autres achats et charges externes</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc5]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc6]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc7]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc8]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Salaires et traitements</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc9]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Charges sociales</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc10]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">Sur immobilisations : dotations aux amortissements</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc11]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc12]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc13]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">Dotations aux provisions</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc14]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">Autres charges</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc15]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">TOTAL I</para>
+        </td>
+        <td>
+          <para style="P2">[[ct1]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc16]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P15">CHARGES FINANCI&#xC8;RES</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc17]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc18]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc19]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc20]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">TOTAL III</para>
+        </td>
+        <td>
+          <para style="P2">[[ct3]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P18">CHARGES EXCEPTIONNELLES</para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Sur op&#xE9;rations de gestion</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc21]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Sur op&#xE9;rations en capital</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc22]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc23]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P7">TOTAL IV</para>
+        </td>
+        <td>
+          <para style="P2">[[ct4]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc24]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para>
+        </td>
+        <td>
+          <para style="P2">[[cdrc25]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para>
+        </td>
+        <td>
+          <para style="P2">[[charges]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P24">
+      <font color="white"> </font>
+    </para>
+    <pageBreak/>
+    <para style="P25">
+      <font color="white"> </font>
+    </para>
+    <para style="P24">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="309.0,173.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P3">PRODUITS (hors taxes)</para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P4">PRODUITS D'EXPLOITATION</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Vente de marchandises</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp1]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Production vendue [biens et services]</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp2]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Sous-total A - Montant net du chiffre d'affaires</para>
+        </td>
+        <td>
+          <para style="P2">[[pta]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">Production stock&#xE9;e</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp3]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Production immobilis&#xE9;e</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp4]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Subventions d'exploitation</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp5]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp6]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Autres produits</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp7]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Sous-total B</para>
+        </td>
+        <td>
+          <para style="P2">[[ptb]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P14">TOTAL I ( A + B )</para>
+        </td>
+        <td>
+          <para style="P2">[[pt1]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp8]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P15">PRODUITS FINANCIERS</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P11">De participation</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp9]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp10]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp11]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp12]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Diff&#xE9;rences positives de change</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp13]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp14]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">TOTAL III</para>
+        </td>
+        <td>
+          <para style="P2">[[pt3]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P18">PRODUITS EXCEPTIONNELS</para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Sur op&#xE9;rations de gestion</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp15]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Sur op&#xE9;rations en capital</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp16]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para>
+        </td>
+        <td>
+          <para style="P2">[[cdrp17]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P7">TOTAL IV</para>
+        </td>
+        <td>
+          <para style="P2">[[pt4]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para>
+        </td>
+        <td>
+          <para style="P2">[[produits]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">PRODUITS - CHARGES</para>
+        </td>
+        <td>
+          <para style="P2">[[produits-charges]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_gr/i18n/el.po b/addons/l10n_gr/i18n/el.po
index d4906b427f7..7bfabe28cff 100644
--- a/addons/l10n_gr/i18n/el.po
+++ b/addons/l10n_gr/i18n/el.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: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-19 09:29+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-07 20:28+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-20 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gr
@@ -22,40 +22,26 @@ msgstr ""
 msgid "Receivable"
 msgstr "Εισπρακτέα"
 
-#. module: l10n_gr
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: l10n_gr
 #: model:ir.module.module,description:l10n_gr.module_meta_information
 msgid "This is the base module to manage the accounting chart for Greece."
 msgstr ""
+"Αυτό είναι το βασικό πρόσθετο που διαχειρίζεται το Ελληνικό λογιστικό σχέδιο."
 
 #. module: l10n_gr
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
+#: model:account.account.type,name:l10n_gr.account_type_equity
+msgid "Equity"
 msgstr ""
 
-#. module: l10n_gr
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
-msgstr "Έσοδο"
-
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_tax
 msgid "Tax"
 msgstr "Φόρος"
 
 #. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_cash
-msgid "Cash"
-msgstr "Μετρητά"
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr ""
 
 #. module: l10n_gr
 #: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
@@ -70,9 +56,9 @@ msgid ""
 msgstr ""
 
 #. module: l10n_gr
-#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
-msgid "Greece - minimal"
-msgstr ""
+#: model:account.account.type,name:l10n_gr.account_type_cash
+msgid "Cash"
+msgstr "Μετρητά"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_payable
@@ -85,14 +71,9 @@ msgid "Other"
 msgstr "Λοιπά"
 
 #. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_gr
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+#: model:account.account.type,name:l10n_gr.account_type_income
+msgid "Income"
+msgstr "Έσοδο"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_expense
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
new file mode 100644
index 00000000000..b39cdd7d8f5
--- /dev/null
+++ b/addons/l10n_ma/i18n/fr.po
@@ -0,0 +1,154 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-08 09:19+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: 2010-12-09 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_imm
+msgid "Immobilisations"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_ach
+msgid "Charges Achats"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tpl
+msgid "Titres de placement"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_vue
+msgid "Vue"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dct
+msgid "Dettes à court terme"
+msgstr ""
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_stk
+msgid "Stocks"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dlt
+msgid "Dettes à long terme"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tax
+msgid "Taxes"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr ""
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_per
+msgid "Charges Personnel"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_liq
+msgid "Liquidité"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_pdt
+msgid "Produits"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_reg
+msgid "Régularisation"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cre
+msgid "Créances"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_aut
+msgid "Charges Autres"
+msgstr ""
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index bd349dbb5fa..db98168bb09 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -3,7 +3,7 @@
 	<data>
 		<record model="ir.ui.view" id="res_partner_form_ro">
 			<field name="name">res.partner.form.ro</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
+			<field name="inherit_id" ref="base_vat.view_partner_form"/>
 			<field name="model">res.partner</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index f8df66de02b..e39f620e1f3 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -75,6 +75,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '0064392144797',
+    'certificate': '008956603329629',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/i18n/es.po b/addons/mail_gateway/i18n/es.po
index b55002c3541..8db7728017f 100644
--- a/addons/mail_gateway/i18n/es.po
+++ b/addons/mail_gateway/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:45+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:16+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -51,9 +51,9 @@ msgid "Message Id"
 msgstr "Id del mensaje"
 
 #. module: mail_gateway
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
@@ -71,6 +71,11 @@ msgstr "Nota"
 msgid "Group By..."
 msgstr "Agrupar por..."
 
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
 msgid "Message Id on Email."
@@ -86,24 +91,11 @@ msgstr "Desitnatarios email"
 msgid "Details"
 msgstr "Detalles"
 
-#. module: mail_gateway
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción"
-
 #. module: mail_gateway
 #: view:mailgate.thread:0
 msgid "Mailgate History"
 msgstr "Histórico pasarela de correo"
 
-#. module: mail_gateway
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_email_server_tools
 msgid "Email Server Tools"
@@ -114,11 +106,6 @@ msgstr "Herramientas servidor email"
 msgid "Email Followers"
 msgstr "Seguidores por email"
 
-#. module: mail_gateway
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
-
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_res_partner
 #: view:mailgate.message:0
@@ -154,11 +141,6 @@ msgstr "Destinatarios del email en Copia Carbón (CC)"
 msgid "Email Gateway System"
 msgstr "Sistema de pasarela de correo"
 
-#. module: mail_gateway
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: mail_gateway
 #: field:mailgate.message,date:0
 msgid "Date"
@@ -177,7 +159,7 @@ msgstr "Nombre empresa"
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
 msgid "Mailgateway Threads"
-msgstr ""
+msgstr "Hilos pasarela de correo"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:0
@@ -251,11 +233,6 @@ msgstr "Es histórico?"
 msgid "Blind Carbon Copy Email Recipients"
 msgstr "Destintarios del email en copia carbón oculata (cco)"
 
-#. module: mail_gateway
-#: field:mailgate.message,ref_id:0
-msgid "Reference Id"
-msgstr "ID referencia"
-
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "mailgate message"
@@ -307,7 +284,7 @@ msgstr "Cc"
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid " on "
-msgstr ""
+msgstr " en "
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -369,12 +346,28 @@ msgstr "Mensaje"
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: mail_gateway
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: mail_gateway
 #: help:mailgate.message,ref_id:0
 msgid "Message Id in Email Server."
 msgstr "Id del mensaje en servidor de correo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/mail_gateway/i18n/pt_BR.po b/addons/mail_gateway/i18n/pt_BR.po
index 41d804f69d1..6e56ea5c7c5 100644
--- a/addons/mail_gateway/i18n/pt_BR.po
+++ b/addons/mail_gateway/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-03 07:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-08 13:09+0000\n"
+"Last-Translator: Alexsandro Haag <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -73,7 +73,7 @@ msgstr "Agrupado Por..."
 #. module: mail_gateway
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro ! Você não pode criar membros recursivos associados."
 
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index b2aaab21a36..d05bfbc0d91 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -74,7 +74,7 @@
                 <search string="Email Search">
                     <field name="name" string="Subject"/>
                     <field name="date" />
-                    <field name="user_id" string="Owner" default="uid"/>
+                    <field name="user_id" string="Owner"/>
                     <field name="partner_id" string="Partner Name"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index 67210267947..73c6ebf74b3 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 11:51+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <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: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -48,6 +48,7 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
+"Ajuda-o a gerir campanhas de marketing e a automatizar ações e comunicações"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -64,7 +65,7 @@ msgstr "marketing.installer"
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
 msgid "Marketing Applications Configuration"
-msgstr ""
+msgstr "Configuração de aplicações de marketing"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
@@ -74,7 +75,7 @@ msgstr ""
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
-msgstr "Campanhas de \"marketing\""
+msgstr "Campanhas de Marketing"
 
 #. module: marketing
 #: help:marketing.installer,crm_profiling:0
@@ -83,14 +84,14 @@ msgid ""
 "questionnaires"
 msgstr ""
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura da vista"
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo inválido na definição da acção."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
 #~ "especial !"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a Arquitectura de Vista!"
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index a6d70da7845..831c8eba53d 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 15:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 13:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-01 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -34,21 +34,7 @@ msgid "The current step for this item has no email or report to preview."
 msgstr "Der aktuelle Schritt bietet keine EMail oder Report als Vorschau."
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
-msgid "Operation not supported"
-msgstr "Vorgang nicht unterstützt"
-
-#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
-msgid "Sorry, campaign duplication is not supported at the moment."
-msgstr ""
-"Entschuldigung, eine Kopie durch Duplizierung wird aktuell nicht unterstützt"
-
-#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 "Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
@@ -64,9 +50,9 @@ msgstr ""
 "deklarierte Aktivität (oder vorgelagerte Aktivität als Signal zur Auslösung)"
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Zeit"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
@@ -107,11 +93,6 @@ msgstr ""
 msgid "Trigger"
 msgstr "Auslöser"
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -216,7 +197,7 @@ msgstr "Abgehende Verbindung"
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr "Zurück"
+msgstr "Zurücksetzen"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -228,6 +209,13 @@ msgstr "Letzte Synchronisierung"
 msgid "Year(s)"
 msgstr "Jahr(e)"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+"Entschuldigung, eine Kopie durch Duplizierung wird aktuell nicht unterstützt"
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -369,11 +357,6 @@ msgstr "Verbindungen"
 msgid "Don't delete workitems"
 msgstr "Lösche keine einzelnen Auftragspositionen der Kampagne"
 
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,state:0
@@ -486,16 +469,6 @@ msgstr ""
 "der Reihe ist. Sie können detaillierte Auswertungen zu Ihrer Kampagne in dem "
 "Reportbereich finden."
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Fehlerhafte Argumente"
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -634,11 +607,21 @@ msgstr "Partner Feld"
 msgid "Campaign Analysis"
 msgstr "Kampagnen Analyse"
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr "Test in Echtzeit"
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -649,6 +632,11 @@ msgstr "Teste Sofort"
 msgid "Directory"
 msgstr "Verzeichnis"
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -657,18 +645,6 @@ msgstr "Verzeichnis"
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen"
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen beinhalten."
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -855,6 +831,12 @@ msgstr "Wie wird die Folgeaktion angestossen"
 msgid "Done"
 msgstr "Erledigt"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr "Vorgang nicht unterstützt"
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -867,8 +849,7 @@ msgid "Close"
 msgstr "Beenden"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
 "Das Modul für den Filter sollte der Ressource für diese Kampagne entsprechen "
@@ -878,11 +859,6 @@ msgstr ""
 msgid "Synchronize Manually"
 msgstr "Manuelle Synchronisation"
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -905,11 +881,6 @@ msgstr ""
 "Kampagne kann dabei auch aus mehreren Mailvorlagen bestehen, die bereits "
 "früher im System  erzeugt wurden."
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr "Zeit"
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
@@ -1126,3 +1097,29 @@ msgstr "Kosten"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Jahr"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Fehlerhafte Argumente"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Das Objekt muss mit einem x_ starten und darf keine Sonderzeichen beinhalten."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 70eef51ada8..524fdd72af6 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-25 10:29+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:20+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -37,8 +37,7 @@ msgstr ""
 "previsualizar"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 "La actividad hacia / desde de la transición debe de ser de la misma campaña "
@@ -54,9 +53,9 @@ msgstr ""
 "alguna actividad con una señal y sin actividad previa)"
 
 #. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Tiempo"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
@@ -96,11 +95,6 @@ msgstr ""
 msgid "Trigger"
 msgstr "Disparador"
 
-#. module: marketing_campaign
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de la acción"
-
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -208,6 +202,12 @@ msgstr "Última sincronización"
 msgid "Year(s)"
 msgstr "Año(s)"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr "Disculpe, la duplicación de campañas no está soportada actualmente."
+
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
 msgid ""
@@ -326,12 +326,7 @@ msgstr "Transiciones"
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
 msgid "Don't delete workitems"
-msgstr ""
-
-#. module: marketing_campaign
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "No eliminar elementos de trabajo"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -443,16 +438,6 @@ msgid ""
 "in the Reporting section"
 msgstr ""
 
-#. module: marketing_campaign
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#. module: marketing_campaign
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
@@ -476,6 +461,9 @@ msgid ""
 "By activating this option, workitems that aren't executed because the "
 "condition is not met are marked as cancelled instead of being deleted."
 msgstr ""
+"Al activar esta opción, los elementos de trabajo que no se han ejecutado "
+"debido a que la condición no se cumple, se marcan como cancelados en lugar "
+"de ser eliminados."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -485,7 +473,7 @@ msgstr "Excepciones"
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "Elementos de trabajo"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
@@ -590,11 +578,21 @@ msgstr "Campo empresa"
 msgid "Campaign Analysis"
 msgstr "Análisis campaña"
 
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr "El intervalo debe ser positivo o cero"
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
 msgstr "Test en tiempo real"
 
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr "¡El nombre de la plantilla debe ser único!"
+
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
@@ -605,6 +603,11 @@ msgstr "Test directamente"
 msgid "Directory"
 msgstr "Directorio"
 
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: selection:marketing.campaign,state:0
@@ -613,19 +616,6 @@ msgstr "Directorio"
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: marketing_campaign
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear un menú recursivo"
-
-#. module: marketing_campaign
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
-"especial!"
-
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
@@ -736,7 +726,7 @@ msgstr "Fecha de ejecución"
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
 msgid "Campaign Workitem"
-msgstr ""
+msgstr "Elemento de trabajo de campaña"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -798,7 +788,7 @@ msgstr "Cosmético"
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
 msgid "How is the destination workitem triggered"
-msgstr ""
+msgstr "Como se dispara el elemento de trabajo destino."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -809,6 +799,12 @@ msgstr ""
 msgid "Done"
 msgstr "Realizada"
 
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Operation not supported"
+msgstr "La operación no está soportada"
+
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
@@ -821,21 +817,17 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
-#, python-format
+#: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
 msgstr ""
+"El modelo del filtro debe ser el mismo que el modelo del recurso de la "
+"campaña "
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronize Manually"
 msgstr "Sincronizar manualmente"
 
-#. module: marketing_campaign
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
@@ -854,11 +846,6 @@ msgid ""
 "created in the system."
 msgstr ""
 
-#. module: marketing_campaign
-#: selection:marketing.campaign.transition,trigger:0
-msgid "Time"
-msgstr "Tiempo"
-
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
@@ -984,6 +971,8 @@ msgstr "La campaña no puede ser iniciada: no contiene actividades"
 #: help:marketing.campaign.workitem,date:0
 msgid "If date is not set, this workitem has to be run manually"
 msgstr ""
+"Si no se indica la fecha, este elemento de trabajo debe ser ejecutado "
+"manualmente."
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -1062,3 +1051,21 @@ msgstr "Coste"
 #: field:campaign.analysis,year:0
 msgid "Year"
 msgstr "Año"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo inválido en la definición de la acción"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos inválidos"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear un menú recursivo"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar por x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index ecce82a65c7..b0fe223ec18 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-09 08:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:17+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: 2010-11-10 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -33,21 +34,11 @@ msgstr "Prozess der Mitgliedsverwaltung"
 msgid "Paid Member"
 msgstr "Zahlende Mitglieder"
 
-#. module: membership
-#: help:product.product,membership_date_from:0
-msgid "Active Membership since this date"
-msgstr "Aktives Mitglied seit"
-
 #. module: membership
 #: view:report.membership:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: membership
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
@@ -151,6 +142,11 @@ msgstr "dazugehöriger Partner"
 msgid "# Invoiced"
 msgstr "# Berechnet"
 
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr "Analyse Mitglieder"
+
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
@@ -188,16 +184,42 @@ msgstr "Partner"
 msgid "From"
 msgstr "Von"
 
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr "Fehler, das Mitgliedschaft Produkt ist abgelaufen"
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A member who has not applied for any "
+"membership.\n"
+"                    -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                    -Old Member: A member whose membership date has "
+"expired.\n"
+"                    -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                    -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Gibt Auskunft über den Mitgliedsstatus\n"
+" -Kein Mitglied: Ein Mitglied das für keine Mitgliedschaft eingetragen ist.\n"
+" -Ausgetretenes Mitglied: Mitglied das seine Mitgliedschaft gekündigt hat.\n"
+" -Altes Mitglied: Mitglied dessen Mitgliedschaft abgelaufen ist.\n"
+" -Wartendes Mitglied: Mitglied das sich angemeldet hat und nun auf die "
+"Erstellung der Rechnung wartet.\n"
+" -Abgerechnetes Mitglied: Mitglied dessen Rechnung erstellt wurde.\n"
+" -Bezahltes Mitglied: Mitglied das seinen Beitrag bezahlt hat."
+
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
 msgstr "Erzeuge"
 
-#. module: membership
-#: model:process.transition,note:membership.process_transition_invoicetoassociate0
-msgid "Invoiced member may be Associated member."
-msgstr "in Rechnung gestelltes Mitglied kann aufgenommenes Mitglied werden"
-
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
@@ -260,9 +282,13 @@ msgid "Golden Membership"
 msgstr "Gold Mitglied"
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_report_membership
-msgid "Members Analysis"
-msgstr "Analyse Mitglieder"
+#: help:res.partner,associate_member:0
+msgid ""
+"A member with whom you want to associate your membership.It will consider "
+"the membership state of the associated member."
+msgstr ""
+"Mitglied, dem Sie eine Mitgliedschaft zuordnen wollen. Dies wird im "
+"Mitgliedsstatus berücksichtigt."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
@@ -277,9 +303,9 @@ msgid "Define product for membership."
 msgstr "Definiere Produkt für Mitgliedschaft"
 
 #. module: membership
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr "in Rechnung gestelltes Mitglied kann aufgenommenes Mitglied werden"
 
 #. module: membership
 #: view:membership.invoice:0
@@ -287,10 +313,10 @@ msgid "Join"
 msgstr "Beitritt"
 
 #. module: membership
-#: model:ir.model,name:membership.model_account_invoice
-#: field:membership.membership_line,account_invoice_id:0
-msgid "Invoice"
-msgstr "Rechnung"
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr "Datum bis die Mitgliedschaft abläuft."
 
 #. module: membership
 #: constraint:product.template:0
@@ -309,6 +335,11 @@ msgstr "Mitgliedschaft Produkte"
 msgid "Join Date"
 msgstr "Datum Beitritt"
 
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give membership free of cost."
+msgstr "Bitte auswählen, ob die Mitgliedschaft kostenfrei sein soll."
+
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
@@ -324,6 +355,11 @@ msgstr " Mitgliedschaft Status"
 msgid "Memberships"
 msgstr "Mitgliedschaft"
 
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr "Mitgleidschaft bezahlt."
+
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
@@ -344,6 +380,32 @@ msgstr "Dezember"
 msgid "Invoice Line"
 msgstr "Rechnungszeile"
 
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership state.\n"
+"                        -Non Member: A member who has not applied for any "
+"membership.\n"
+"                        -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                        -Old Member: A member whose membership date has "
+"expired.\n"
+"                        -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                        -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+"Gibt Auskunft über den Mitgliedsstatus\n"
+" -Kein Mitglied: Ein Mitglied das für keine Mitgliedschaft eingetragen ist.\n"
+" -Ausgetretenes Mitglied: Mitglied das seine Mitgliedschaft gekündigt hat.\n"
+" -Altes Mitglied: Mitglied dessen Mitgliedschaft abgelaufen ist.\n"
+" -Wartendes Mitglied: Mitglied das sich angemeldet hat und nun auf die "
+"Erstellung der Rechnung wartet.\n"
+" -Abgerechnetes Mitglied: Mitglied dessen Rechnung erstellt wurde\n"
+" -Bezahltes Mitglied: Mitglied das seinen Beitrag bezahlt hat."
+
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
@@ -372,6 +434,12 @@ msgstr "Preisliste Mitgliedschaft"
 msgid "Associate Member"
 msgstr "Verbundenes Mitglied"
 
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr "Datum ab wann die Mitgliedschaft gilt."
+
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
@@ -400,6 +468,12 @@ msgstr "Definiere Mitgliedschaftsprodukt"
 msgid "Category"
 msgstr "Kategorie"
 
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr "Rechnung"
+
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
@@ -412,11 +486,6 @@ msgstr "Freie Mitglieder"
 msgid "Member Sale Pricelist Version"
 msgstr "MItglieder Verkaufspreisliste Version"
 
-#. module: membership
-#: help:product.product,membership_date_to:0
-msgid "Expired date of Membership"
-msgstr "Mitgliedschaft abgelaufen am"
-
 #. module: membership
 #: constraint:product.template:0
 msgid ""
@@ -425,11 +494,6 @@ msgstr ""
 "Fehler: Die Standard Mengeneinheit sowie die Beschaffungs Mengeneinheit muss "
 "in derselben Kategorie sein."
 
-#. module: membership
-#: help:res.partner,membership_amount:0
-msgid "The price negociated by the partner"
-msgstr "Vom Partner ausgehandelter Preis"
-
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
@@ -440,16 +504,16 @@ msgstr "Prognose"
 msgid "Member"
 msgstr "Mitglied"
 
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
 msgstr "Von Datum"
 
-#. module: membership
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
@@ -487,18 +551,6 @@ msgstr "Mitgliedschaft Produkte"
 msgid "June"
 msgstr "Juni"
 
-#. module: membership
-#: model:process.node,note:membership.process_node_paidmember0
-msgid "Membership invoice paid."
-msgstr "Mitgleidschaft bezahlt."
-
-#. module: membership
-#: selection:membership.membership_line,state:0
-#: selection:report.membership,membership_state:0
-#: selection:res.partner,membership_state:0
-msgid "Invoiced Member"
-msgstr "Abrechnung Mitglieder"
-
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -512,9 +564,16 @@ msgid "Membership"
 msgstr "Mitgliedschaft"
 
 #. module: membership
-#: help:product.product,membership:0
-msgid "Specify if this product is a membership product"
-msgstr "Spezifiere Mitgliedschaft Produkt"
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr "Abrechnung Mitglieder"
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr "Eintrittsdatum des Mitglied"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -563,24 +622,26 @@ msgstr "Januar"
 msgid "Membership Fee"
 msgstr "Mitgliedsbetrag"
 
-#. module: membership
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
-
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
 msgstr "Mitgliedsbetrag"
 
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr "Der vom Partner verhandelte Preis."
+
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
 msgstr "Basis Mitglied"
 
+#. module: membership
+#: help:product.product,membership:0
+msgid "Select if a product is a membership product."
+msgstr "Auswählen ob ein Produkt für die Mitgliedverwaltung verwendet wird."
+
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
@@ -650,14 +711,6 @@ msgstr "Buchung Rechnungsposition"
 msgid "Categorization"
 msgstr "Kategorisierung"
 
-#. module: membership
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
@@ -696,11 +749,6 @@ msgstr "Freie Mitgliedschaft"
 msgid "May"
 msgstr "Mai"
 
-#. module: membership
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Preislisten Versionen dürfen sich nicht überschneiden"
-
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
@@ -732,6 +780,11 @@ msgstr "In Rechnung gestelltes Mitglied"
 msgid "April"
 msgstr "April"
 
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr "Datum an dem die Mitgliedschaft gekündigt wurde."
+
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
@@ -753,6 +806,11 @@ msgstr "Von Datum"
 msgid "Membership product"
 msgstr "Mitgliedschaft Produkt"
 
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr "Beitrittsbetrag"
+
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
@@ -785,12 +843,12 @@ msgstr "Generierter Umsatz"
 #~ msgid "Free members"
 #~ msgstr "Freie Mitglieder"
 
-#~ msgid "Error, this membership product is out of date"
-#~ msgstr "Fehler, das Mitgliedschaft Produkt ist abgelaufen"
-
 #~ msgid "Confirm"
 #~ msgstr "Bestätige"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "State"
 #~ msgstr "Status"
 
@@ -818,9 +876,15 @@ msgstr "Generierter Umsatz"
 #~ msgid "Invoiced"
 #~ msgstr "Berechnet"
 
+#~ msgid "The price negociated by the partner"
+#~ msgstr "Vom Partner ausgehandelter Preis"
+
 #~ msgid "Paid"
 #~ msgstr "Bezahlt"
 
+#~ msgid "Specify if this product is a membership product"
+#~ msgstr "Spezifiere Mitgliedschaft Produkt"
+
 #~ msgid "Invoiced members"
 #~ msgstr "Abgerechnete Mitglieder"
 
@@ -845,6 +909,12 @@ msgstr "Generierter Umsatz"
 #~ msgid "Paid members"
 #~ msgstr "Zahlende Mitglieder"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Canceled Member"
 #~ msgstr "Beendete Mitgliedschaft"
 
@@ -865,3 +935,24 @@ msgstr "Generierter Umsatz"
 
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Ungültige Prüfsumme"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Preislisten Versionen dürfen sich nicht überschneiden"
+
+#~ msgid "Active Membership since this date"
+#~ msgstr "Aktives Mitglied seit"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Expired date of Membership"
+#~ msgstr "Mitgliedschaft abgelaufen am"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index 1f69ba7cc77..7dc06617fe8 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:56+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:11+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -39,11 +39,6 @@ msgstr "Socio pagado"
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: membership
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
@@ -190,9 +185,11 @@ msgid "From"
 msgstr "Desde"
 
 #. module: membership
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+"Error, este producto para socios está caducado (intervalo de fechas "
+"desfasado)"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -217,32 +214,17 @@ msgstr ""
 msgid "Create"
 msgstr "Crear"
 
-#. module: membership
-#: model:process.transition,note:membership.process_transition_invoicetoassociate0
-msgid "Invoiced member may be Associated member."
-msgstr "Socio facturado puede ser un socio beneficiario."
-
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
 msgstr "Línea de socio"
 
-#. module: membership
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: membership
 #: help:report.membership,date_from:0
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
 msgstr "Fecha inicio afiliación"
 
-#. module: membership
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: membership
 #: code:addons/membership/membership.py:0
 #, python-format
@@ -299,6 +281,8 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Un miembro con el que desea asociar su afiliación. Se tendrá en cuenta el "
+"estado de socio de los miembros asociados."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
@@ -313,9 +297,9 @@ msgid "Define product for membership."
 msgstr "Definir producto para socios."
 
 #. module: membership
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr "Socio facturado puede ser un socio beneficiario."
 
 #. module: membership
 #: view:membership.invoice:0
@@ -504,16 +488,16 @@ msgstr "Previsión"
 msgid "Member"
 msgstr "Miembro"
 
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
 msgstr "Fecha desde"
 
-#. module: membership
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
@@ -622,15 +606,6 @@ msgstr "Enero"
 msgid "Membership Fee"
 msgstr "Cuota socio"
 
-#. module: membership
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
-"elemento de la tarifa."
-
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
@@ -720,14 +695,6 @@ msgstr "Línea factura"
 msgid "Categorization"
 msgstr "Categorización"
 
-#. module: membership
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
@@ -766,11 +733,6 @@ msgstr "Socio gratis"
 msgid "May"
 msgstr "Mayo"
 
-#. module: membership
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
-
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
@@ -865,14 +827,12 @@ msgstr "Ingreso realizado"
 #~ msgid "Free members"
 #~ msgstr "Socios gratis"
 
-#~ msgid "Error, this membership product is out of date"
-#~ msgstr ""
-#~ "Error, este producto para socios está caducado (intervalo de fechas "
-#~ "desfasado)"
-
 #~ msgid "Confirm"
 #~ msgstr "Confirmar"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -933,6 +893,12 @@ msgstr "Ingreso realizado"
 #~ msgid "Paid members"
 #~ msgstr "Socios pagados"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Canceled Member"
 #~ msgstr "Socio cancelado"
 
@@ -954,8 +920,33 @@ msgstr "Ingreso realizado"
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Error: Número BVR no válido (checksum erróneo)."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
+
 #~ msgid "Active Membership since this date"
 #~ msgstr "Socio activo desde esta fecha."
 
 #~ msgid "Expired date of Membership"
 #~ msgstr "Fecha expiración de socio."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 31ee9ffb9fd..d15057ed295 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -6,20 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-27 12:33+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:23+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: 2010-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr "Durchlauf Arbeitsstationen"
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Buchung erzeugt"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -29,7 +31,7 @@ msgstr "Anzahl Zyklen"
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of operations this workcenter can do."
-msgstr "Maximale Anzahl an Arbeitsvorgängen dieses Arbeitsplatzes."
+msgstr "Maximale Anzahl an Fertigungsvorgängen dieser Fertigungsstelle."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
@@ -39,29 +41,23 @@ msgstr "Maßgeblicher Lagerort für Verfügbarkeit von Waren."
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Arbeitsplätze Auslastung"
+msgstr "Fertigungsstellen Auslastung"
 
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Centers load"
-msgstr "Auslastung Arbeitsplatz"
+msgstr "Auslastung Fertigungsstelle"
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Buchung erzeugt"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "Fertigungsablauf"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Fertigungsplanung und -steuerung"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -76,20 +72,11 @@ msgstr ""
 "Die 'Meldebestandregel' ermöglicht eine automatische Erstellung neuer "
 "Beschaffungsaufträge, wenn der Minimalbestand unterschritten wird."
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-"Wenn diese Option aktiviert wird, kann diese Stückliste ausgeblendet aber "
-"trotzdem beibehalten werden."
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr "Pack Auftrag"
+msgstr "Lieferauftrag"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -101,7 +88,7 @@ msgstr "Stundensatz"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Cost Price per Uom"
-msgstr "Herstellkosten pro ME"
+msgstr "Produktkosten pro ME"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -162,7 +149,7 @@ msgstr "Zu beschaffen"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Raw Material Location"
-msgstr "Vorräte Lager"
+msgstr "Bauteile Lager"
 
 #. module: mrp
 #: help:mrp.installer,mrp_operations:0
@@ -171,7 +158,7 @@ msgid ""
 "and end date of execution of the order."
 msgstr ""
 "Ermöglicht die Bearbeitung von Fertigungsprodukten durch eine Überwachung "
-"des Bearbeitungsstands bei Auftragsdurchführung."
+"des Bearbeitungsstatus bei Auftragsdurchführung."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -187,6 +174,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Fertigungsvorgänge ermöglichen die Verwaltung und das Management von "
+"Arbeitsaufträgen und deren Reihenfolge der Bearbeitung an bestimmten "
+"Fertigungsstellen. Sie werden zugewiesen zu Stücklisten, die wiederum die "
+"erforderlichen Bauteile für einen Fertigungsauftrag definieren."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -198,15 +189,10 @@ msgstr "Herzustellende Produkte"
 msgid "Set / Pack"
 msgstr "Set / Packung"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
-msgstr "Fertigung von Teilfertigprodukten"
+msgstr "Fertigung von Subprodukten"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -235,11 +221,6 @@ msgstr ""
 msgid "UOM"
 msgstr "ME"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -271,7 +252,7 @@ msgstr "Analysekonto Fertigungszyklus"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost"
-msgstr "Arbeitskosten"
+msgstr "Fertigungskosten"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -281,7 +262,7 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Beschaffung Services"
+msgstr "Beschaffung von Dienstleistungsprodukten"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -301,7 +282,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr "Master Daten"
+msgstr "Stücklisten"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -323,12 +304,6 @@ msgstr "Verplante Produkte"
 msgid "Sets / Phantom"
 msgstr "Baukasten / Phantom"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Nicht dringend"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -339,6 +314,11 @@ msgstr "Referenz für externe Planungsposition."
 msgid "August"
 msgstr "August"
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -349,11 +329,6 @@ msgstr "Fertigungsauftrag"
 msgid "June"
 msgstr "Juni"
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -367,17 +342,16 @@ msgstr "Oktober"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Beschaffung Lagerprodukte"
+msgstr "Beschaffung von Lagerprodukten"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Standard ME"
+msgstr "Mengeneinheit"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -421,12 +395,12 @@ msgstr "Reparaturen"
 #. module: mrp
 #: field:mrp.installer,stock_location:0
 msgid "Advanced Routes"
-msgstr "Fortschritt Warenfluss"
+msgstr "Lieferketten"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr "Wöchentl. Bestandsveränderung"
+msgstr "Wöchentliche Bestandsveränderung"
 
 #. module: mrp
 #: help:mrp.installer,mrp_repair:0
@@ -435,7 +409,7 @@ msgid ""
 "invoicing)."
 msgstr ""
 "Ermöglicht das Management von Garantiefällen und Reparaturen, insbesondere "
-"die damit verbundenen Auswrikungen auf Bestände und Abrechnung)."
+"die damit verbundenen Auswirkungen auf Bestände und Abrechnung)."
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -465,7 +439,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr "Lagerbestandswert Änderungen"
+msgstr "Bestandswert Änderungen"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -475,7 +449,7 @@ msgstr "Stückliste Struktur"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr "Eine Aufgabe wurde erzeugt um die Dienstleistung zu erbringen."
+msgstr "Eine Aufgabe wurde erzeugt, um die Dienstleistung zu erbringen."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -485,7 +459,7 @@ msgstr "Fertigungsreste"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr "Für Serviceprodukte."
+msgstr "Für Dienstleistungsprodukte."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -505,7 +479,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr "Anz. Zykl."
+msgstr "Anzahl Zyklen"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -517,7 +491,7 @@ msgstr "Anfrage für Angebot"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component suppliers"
-msgstr "Komponenten Lieferant"
+msgstr "Bauteile Lieferant"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -525,13 +499,18 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
-"Die Stückliste ist verbunden mit einem Arbeitsplan, d.h. der planmäßigen "
-"Abfolge von Arbeitsvorgängen an  bestimmten Arbeitsplätzen."
+"Die Stückliste ist verbunden mit einem Fertigungsvorgang, d.h. der "
+"planmäßigen Abfolge von Fertigungsschritten an  bestimmten Fertigungsstellen."
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
-msgstr "Spezifiziere Stundensatz des Arbeitsplatz."
+msgstr "Spezifiziere Stundensatz der Fertigungsstelle."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -552,12 +531,12 @@ msgstr "Erzwinge Reservierung"
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr "Konstrukteur"
+msgstr "Mitarbeiter"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
-msgstr "Lagerbewertung"
+msgstr "Bestandswert"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
@@ -588,7 +567,7 @@ msgstr "Fertigungsstelle Auslastung"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Workcenter per cycle."
-msgstr "Spezifiziere Kosten des Arbeitsplatzes p. Zyklus"
+msgstr "Spezifiziere Kosten der Fertigungsstelle pro Zyklus"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -602,15 +581,6 @@ msgstr "Stückliste Hierachie"
 msgid "Produce"
 msgstr "Produziere"
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-"Dieser interne Packauftrag erzeugt für das fertige Produkt einen Eintrag im "
-"Fertigungsauftragsplan."
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -625,7 +595,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr "Fehler bei Packauftrag"
+msgstr "Fehler bei Lieferauftrag"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -637,10 +607,17 @@ msgstr "Stückliste Einzelpositionen"
 msgid "Time before prod."
 msgstr "Vorbereitung"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr "Abfolge Materialfluss"
+msgstr "Abfolge Lieferungen"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -659,7 +636,7 @@ msgstr "Fehler! Sie können keine rekursiven Stücklisten definieren."
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Arbeitsplatz Auslastung"
+msgstr "Fertigungsstelle Auslastung"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -671,7 +648,7 @@ msgstr "Keine Stückliste für dieses Produkt definiert."
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Komponenten Stückliste"
+msgstr "Bauteilestückliste"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
@@ -681,7 +658,7 @@ msgstr "# Positionen"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr "Planung"
+msgstr "Fertigungsterminierung"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -697,7 +674,7 @@ msgstr "Zeit in Stunden für einen Auftragszyklus"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr "Stückliste Ref."
+msgstr "Stückliste Referenz"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -709,7 +686,7 @@ msgstr "In Bearbeitung"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr "Master Stückliste"
+msgstr "Basisdaten Stückliste"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -822,9 +799,9 @@ msgid ""
 "service is done (= the delivery of the products)."
 msgstr ""
 "In Abhängigkeit von der Einkaufsmethode (Einkaufen bzw. Produzieren) erzeugt "
-"ein Beschaffungsauftrag eine Anfrage für eine Auswärtsvergabe oder wartet "
-"solange bis der beauftragte Service in Form von Aufgabe(n) abgeschlossen ist "
-"(=Lieferung des Produkts)."
+"ein Beschaffungsauftrag eine Anfrage für einen Fremdfertigungsauftrag oder "
+"wartet solange bis die beauftragte Dienstleistung in Form von Aufgabe(n) "
+"abgeschlossen ist (=Lieferung des Produkts)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -835,12 +812,12 @@ msgstr "Dringend"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Workcenter Usage"
-msgstr "Arbeitsplatz Auslastung"
+msgstr "Fertigungsstelle Auslastung"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "Produktionsauftrag"
+msgstr "Fertigungsauftrag"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
@@ -853,7 +830,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr "Einkauf von Kaufteilen"
+msgstr "Beschaffung von Kaufteilen"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -942,7 +919,7 @@ msgstr "Lagerprodukt"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Center name"
-msgstr "Arbeitsplatz Bezeichnung"
+msgstr "Fertigungsstelle Bezeichnung"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1003,7 +980,7 @@ msgstr "Abbrechen"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr "Splitten in Fertigungslose"
+msgstr "Aufteilen in Fertigungslose"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1011,8 +988,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
-"Wenn ein Serviceprodukt 'Einkaufen' als Einkaufsmethode hat wird eine "
-"Anfrage für eine Auswärtsvergabe an Dritte Lieferanten erstellt."
+"Wenn ein Dienstleistungsprodukt 'Einkaufen' als Einkaufsmethode zugewiesen "
+"hat, wird eine Anfrage für eine Fremdvergabe an Lieferanten erstellt."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -1049,7 +1026,7 @@ msgstr "Pinnwand Fertigung"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component"
-msgstr "Komponente"
+msgstr "Bauteil"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1114,12 +1091,7 @@ msgstr "]"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
-msgstr "Reihenfolge bei Anzeige der Liste für Arbeitsplätze"
-
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+msgstr "Reihenfolge bei Anzeige der Liste für Fertigungsstellen"
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1145,7 +1117,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr "Fertigung erwartet Materialzugang"
+msgstr "Fertigung wartet auf Bauteile"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1190,7 +1162,7 @@ msgstr "Analytisches Journal"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Arbeitsplatz"
+msgstr "Fertigungsstellen"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1225,7 +1197,7 @@ msgstr "Stunden"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr "Arbeitsvorgänge"
+msgstr "Fertigungsvorgänge"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1249,7 +1221,7 @@ msgstr "Wähle Zeiteinheit"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr "Arbeitsauslastung"
+msgstr "Fertigungsstelle Auslastung"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1257,13 +1229,13 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ort, an dem das System die Fertigprodukte lagert."
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
-"Wenn dieses Feld aktiviert wird, kann ein Arbeitsgang deaktiviert werden, "
-"ohne in aus der Liste zu entfernen."
+"Dieser interne Lieferauftrag erzeugt für das fertige Produkt einen Eintrag "
+"im Fertigungsauftragsplan."
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@@ -1273,7 +1245,7 @@ msgstr "Ändere Basispreis"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr "Lagerbewegung"
+msgstr "Lieferung"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1283,7 +1255,9 @@ msgid ""
 "configured by product."
 msgstr ""
 "Die Meldebestandregel ist eine automatische Beschaffung basierend auf "
-"Meldebeständen und Wiederauffüllbeständen."
+"Meldebeständen (Min. Bestand) und Wiederauffüllbeständen (Max. Bestand). Die "
+"Einstellung erfolgt bei der Lagerverwaltung und wird dort für einzelne "
+"Produkt definiert."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1311,15 +1285,10 @@ msgstr ""
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr "Pack Auftrag"
+msgstr "Lieferauftrag"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1341,12 +1310,12 @@ msgstr "Fertigungsauftrag"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "Fertigungsauftrag '%s' ist Startbereit."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr "Produktionstermin- und Auslastungsplanung"
+msgstr "Fertigungstermin- und Auslastungsplanung"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1393,7 +1362,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr "Produktionsarbeitsplätze"
+msgstr "Fertigungsstellen"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1418,7 +1387,7 @@ msgstr "Aktive ID  ist nicht bekannt"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr "Suche Arbeitsplatz der Fertigung"
+msgstr "Suche Fertigungsstelle"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1436,15 +1405,10 @@ msgstr "Start Datum"
 msgid "Hour Account"
 msgstr "Stundenkonto"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr "Ziel Lagerort"
+msgstr "Zielort"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
@@ -1465,7 +1429,7 @@ msgstr "Beschaffung Produkte"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 msgid "Work Center Loads"
-msgstr "Arbeitsauslastung"
+msgstr "Fertigungsauslastung"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1504,7 +1468,7 @@ msgstr "Ändere die Mengen für die Produkte"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Löst Beschaffungsaufträge für Komponenten aus ."
+msgstr "Löst Beschaffungsaufträge für Bauteile aus ."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1538,27 +1502,20 @@ msgstr "Erledigt"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr "Preisliste Ändern"
-
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "Ändere Produktpreis"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr "Quelle"
+msgstr "Belegreferenz"
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Nicht dringend"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1572,7 +1529,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Startbereite Fertigungsaufträge"
+msgstr "Fertigungsaufträge (Startbereit)"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:0
@@ -1587,7 +1544,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr "Arbeitsplatz"
+msgstr "Fertigungsstelle"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1617,12 +1574,12 @@ msgstr "Gesamte Stunden"
 #: field:mrp.production,location_src_id:0
 #: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
-msgstr "Lager Komponenten"
+msgstr "Bauteile Lagerort"
 
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr "Druck Herstellkosten"
+msgstr "Druck Produktkosten"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -1657,13 +1614,13 @@ msgstr "Mengeneinheit"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr "von Auftrag (MtO)"
+msgstr "Disponiere von Auftrag"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr "Analyse Fertigung"
+msgstr "Statistik Fertigungsaufträge"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1712,7 +1669,7 @@ msgstr "Genehmigen"
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr "Kategorien Eigenschaften"
+msgstr "Kategorien Fertigungsmerkmale"
 
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
@@ -1753,7 +1710,8 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
-"'Nur Konsumiere' verbraucht nur die Produkte mit einer angegebenen Menge.\n"
+"Der 'Nur Konsumiere' Modus verbraucht nur die Produkte mit den angegebenen "
+"Menge.\n"
 "'Konsumiere & Produziere' wird Waren sowohl verbrauchen, aber auch mit den "
 "korrekten Mengen produzieren, Aufträge fertigstellen und Bestände bei "
 "endgültiger Fertigstellung buchen."
@@ -1773,7 +1731,7 @@ msgstr "Kosten pro Zyklus"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr "Serviceprodukt"
+msgstr "Dienstleistung"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1799,9 +1757,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
-"Die Stückliste zeigt die Zusammensetzung von Produkten. Diese Komponenten "
-"(die selbst auch Produkte sind) können wiederum selbst auch eine Stückliste "
-"haben (Multi-Level)."
+"Die Stückliste zeigt die Zusammensetzung von Produkten. Diese Bauteile (die "
+"selbst auch Produkte sind) können wiederum selbst auch eine Stückliste haben "
+"(Multi-Level)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1836,10 +1794,10 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "plannification."
 msgstr ""
-"Liste der Arbeitsvorgänge (Liste Arbeitsplätze) für die Produktion des "
-"Fertigprodukts. Die Arbeitsvorgänge werden primär genutzt um die Kosten und "
-"die Auslastung der Arbeitsplätze auf Basis der fertigungsplanung zu "
-"kalkulieren."
+"Liste der Fertigungsvorgänge (Liste Fertigungsstellen) für die Produktion "
+"des Fertigprodukts. Die Fertigungsvorgänge werden primär genutzt um die "
+"Kosten und die Auslastung der Fertigungsstellen auf Basis der "
+"Fertigungsplanung zu kalkulieren."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -1859,7 +1817,7 @@ msgstr "Produkt Verkaufseinheit"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Components"
-msgstr "Komponenten"
+msgstr "Bauteile"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1873,9 +1831,9 @@ msgid ""
 "Number of operations this workcenter can do in parallel. If this workcenter "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
-"Anzahl Arbeitsvorgänge die am Arbeitsplatz parallel bearbeitet werden "
-"können. Wenn der Arbeitsplatz eine Gruppe von 5 Mitarbeitern repräsentiert "
-"ist die Kapazität je Zyklus 5."
+"Anzahl Fertigungsvorgänge die bei einer Fertigungsstelle parallel bearbeitet "
+"werden können. Wenn die Fertigungsstelle eine Gruppe von 5 Mitarbeitern "
+"repräsentiert, ist die Kapazität je Zyklus 5."
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1921,6 +1879,18 @@ msgstr "Bestätigt"
 msgid "Manufacturing Efficiency"
 msgstr "Effizienz Fertigung"
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -1930,7 +1900,7 @@ msgstr "Produkt Rundung"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "Arbeitsauftrag Fertigung"
+msgstr "Arbeitsauftrag"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1958,12 +1928,12 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
-"Wenn eine Komponente in mehreren Produkten als Bestandteil vorhanden ist, "
-"kann es sinnvoll sein eigene Stücklisten zu definieren. Sollten Sie "
-"allerdings keine eigenen separaten Fertigungsaufträge für eine zu "
-"produzierende Komponente haben wollen, wählen Sie Set/Baukasten als "
+"Wenn ein Bauteil in mehreren Produkten als Bestandteil vorhanden ist, kann "
+"es sinnvoll sein, für diese Bauteile eigene Stücklisten zu definieren. "
+"Sollten Sie allerdings keine eigenen separaten Fertigungsaufträge für eine "
+"zu produzierende Komponente haben wollen, wählen Sie Set/Baukasten als "
 "Stücklistentyp. Wenn dieser Typ für ein Produkt als Stückliste definiert "
-"wird kann das Produkt als Set verkauft und versendet werden."
+"wird, kann das Produkt als Set verkauft und versendet werden."
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1981,16 +1951,17 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
-"Wenn ein Fertigungsauftrag erstellt wird befindet sich der Status im Stadium "
-"'Entwurf'.\n"
+"Wenn ein Fertigungsauftrag erstellt wird, befindet sich der Status zuerst im "
+"Stadium 'Entwurf'.\n"
 " Durch Bestätigung wechselt der Status zu 'Erwarte Warenzugang'.\n"
 " Wenn Fehler bei der automatischen Auftragserstellung auftreten, wird der "
-"Status ' Fehler bei  Pack Auftrag' angezeigt.\n"
+"Status ' Fehler bei  Lieferauftrag' angezeigt.\n"
 " Bei vorhandenem Bestand oder Warenzugang wechselt der Status auf "
 "'Startbereit'\n"
 " Wenn dann der Fertigungsauftrag gestartet wird, erfolgt ein Wechsel auf  "
 "'In Produktion'\n"
-"Wenn der Fertigungsauftrag beendet wechselt der Status auf 'Erledigt'."
+"Wenn der Fertigungsauftrag beendet wird, wechselt der Status automatisch auf "
+"'Erledigt'."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2031,17 +2002,17 @@ msgstr "Beschaffungsaufträge"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr "Rundung bei Menge."
+msgstr "Rundung bei Anzahl."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
 msgid "Working Period"
-msgstr "Arbeits-/Bürozeiten"
+msgstr "Arbeitszeit"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr "Zweisung von Produktion- oder Beschaffungsauftrag."
+msgstr "Zuweisung von Produktion- oder Beschaffungsauftrag."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2126,7 +2097,7 @@ msgstr "Normal"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr "Produktionsschritte"
+msgstr "Fertigungsschritte"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -2172,6 +2143,11 @@ msgstr "Produkttyp ist 'Lagerprodukt' oder 'Verbrauchsprodukt'."
 msgid "Error"
 msgstr "Fehler"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2187,10 +2163,12 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (workcenters) "
 "will be automatically pre-completed."
 msgstr ""
-"Arbeitsplan repräsentiert Arbeitsvorgänge an Arbeitsstationen mitsamt Dauer "
-"und Zyklen. Wenn ein Arbeitsablaufplan definiert wird, wird als Konsequenz  "
-"der dritte Aktenreiter eines Fertigungsauftrags mit seinen einzelnen "
-"Arbeitsvorgängen vorausgefüllt."
+"Der Fertigungsablauf wird durch die Fertigungsvorgänge an den "
+"Fertigungsstellen mitsamt definierter Dauer und Zyklenanzahl repräsentiert. "
+"Wenn ein Fertigungsablauf definiert wurde, wird als Konsequenz  der dritte "
+"Aktenreiter eines Fertigungsauftrags mit seinen einzelnen "
+"Fertigungsvorgängen aufgelistet und ermöglicht die Bearbeitung von "
+"Arbeitsaufträgen als Teilaufgaben zu einem Fertigungsauftrag."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
@@ -2224,11 +2202,6 @@ msgid ""
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2244,7 +2217,7 @@ msgstr "Fertigungsvorgang"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr "Fertigungsvorgänge"
+msgstr "Fertigungsabläufe"
 
 #. module: mrp
 #: help:mrp.production,origin:0
@@ -2252,6 +2225,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr "Referenz zu Dokument, welches den Fertigungsauftrag ausgelöst hat."
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2281,12 +2259,12 @@ msgstr "Konfiguration Anwendung"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr "Splitte auf in Fertigunglose"
+msgstr "Teile auf in Fertigunglose"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr "Andere Menge"
+msgstr "Ändere Anzahl"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2315,10 +2293,10 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "planning."
 msgstr ""
-"Vorgänge (Arbeitsvorgangsliste) für die Herstellung des Endprodukts. Die "
-"Arbeitsvorgänge werden primär genutzt, um die Auslastung und die Kosten der "
-"Arbeistplätze aktuell und für die Zukunft auf Basis von Fertigungsplänen der "
-"Zukunft zu kalkulieren."
+"Fertigungsvorgänge (Arbeitsauftragsliste) für die Herstellung des "
+"Endprodukts. Die Arbeitsvorgänge werden primär genutzt, um die Auslastung "
+"und die Kosten der ArFertigungsstellen aktuell und für die Zukunft auf Basis "
+"von Fertigungsplänen der Zukunft zu kalkulieren."
 
 #. module: mrp
 #: view:board.board:0
@@ -2328,7 +2306,7 @@ msgstr "Pinnwand Fertigung"
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr "Terminiertes Enddatum"
+msgstr "Terminiertes Ende Datum"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2343,7 +2321,7 @@ msgstr ""
 msgid "The way to procurement depends on the product type."
 msgstr ""
 "Durch unterschiedliche Produkttypen besteht die Möglichkeit Waren auf "
-"untersch. Wegen zu beschaffen."
+"unterschiedlichen Wegen zu beschaffen."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2364,7 +2342,7 @@ msgstr "Februar"
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr "Eigenschaften Gruppen"
+msgstr "Fertigungsmerkmale Gruppen"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2406,9 +2384,9 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
-"Um Kaufteile oder Rohstoffe zu beschaffen (Einzukaufen oder zu Produzieren) "
+"Um Kaufteile oder Rohstoffe zu beschaffen (Einkaufen oder zu Produzieren) "
 "erzeugt ein Fertigungsauftrag bei Start der automatischen Beschaffung "
-"soviele Beschaffungsaufträge wie es Komponenten in den Stücklisten des "
+"soviele Beschaffungsaufträge, wie es Bauteile in den Stücklisten des "
 "Endproduktes gibt."
 
 #. module: mrp
@@ -2427,7 +2405,7 @@ msgstr "Sequenz"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr "Ressource Abwesenheit"
+msgstr "Abwesenheitszeiten"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
@@ -2496,6 +2474,9 @@ msgstr "Jahr"
 #~ msgid "Automatic orderpoint"
 #~ msgstr "Automatischer Bestellvorschlag"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid ""
 #~ "This is the days added to what you promise to customers for security purpose"
 #~ msgstr ""
@@ -2905,6 +2886,12 @@ msgstr "Jahr"
 #~ msgid "Reordering Mode"
 #~ msgstr "Wiederbeschaffungsmodus"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Central document to procure products"
 #~ msgstr "Zentrales Dokument für die Beschaffung"
 
@@ -3131,6 +3118,13 @@ msgstr "Jahr"
 #~ msgid "Product UoM"
 #~ msgstr "Produkt ME"
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the bills of "
+#~ "material without removing it."
+#~ msgstr ""
+#~ "Wenn diese Option aktiviert wird, kann diese Stückliste ausgeblendet aber "
+#~ "trotzdem beibehalten werden."
+
 #, python-format
 #~ msgid "of "
 #~ msgstr "von "
@@ -3138,10 +3132,23 @@ msgstr "Jahr"
 #~ msgid "Work Center Future load"
 #~ msgstr "Arbeitsplatz Auslastung"
 
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the routing "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn dieses Feld aktiviert wird, kann ein Arbeitsgang deaktiviert werden, "
+#~ "ohne in aus der Liste zu entfernen."
+
 #, python-format
 #~ msgid "Cost "
 #~ msgstr "Kosten "
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen."
+
 #, python-format
 #~ msgid "Work Cost "
 #~ msgstr "Arbeitskosten "
@@ -3150,5 +3157,8 @@ msgstr "Jahr"
 #~ msgid "Total Cost "
 #~ msgstr "Gesamte Kosten "
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "Fertigungs- und Beschaffungsplanung"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index b5e2de67aff..35dae9a5811 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 23:14+0000\n"
+"PO-Revision-Date: 2010-12-08 21:07+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -320,7 +320,7 @@ msgstr "Agosto"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -506,7 +506,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Código EAN no válido"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -614,6 +614,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
@@ -631,7 +632,7 @@ msgstr "Productos consumidos"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr "¡Error! No puede crear Listas de Material recursivas"
+msgstr "¡Error! No puede crear Listas de Material recursivas."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -1482,8 +1483,8 @@ msgid ""
 "products on BoMs !"
 msgstr ""
 "Todas las cantidades de producto deben de ser superiores a cero.\n"
-"Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
-"en las LdM"
+"¡Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
+"en las LdM!"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1920,7 +1921,7 @@ msgstr "Eficiencia de la producción"
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1928,6 +1929,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar las listas de material sin "
+"eliminarlas."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -2182,7 +2185,7 @@ msgstr "Error"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Seleccionar cantidad"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2267,7 +2270,7 @@ msgstr ""
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: mrp
 #: view:mrp.production.order:0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index a37a7ccef9b..32308270ecb 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:49+0000\n"
+"PO-Revision-Date: 2010-12-06 16:06+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: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -332,7 +332,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Rapport des ordres de fabrication"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -439,10 +439,9 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Laissez vide si vous produisez à l'emplacement où les produits finis sont "
-"nécessaires. Précisez un emplacement si vous produisez à un emplacement "
-"fixe. Cela peut être à un emplacement partenaire si vous faites sous-traiter "
-"vos opérations de production."
+"Laissez vide si vous produisez là où les produits finis sont nécessaires. "
+"Précisez l'emplacement si vous produisez sur un endroit fixe. Cela peut être "
+"chez un partenaire si vous sous-traitez votre production."
 
 #. module: mrp
 #: view:board.board:0
@@ -529,7 +528,7 @@ msgstr "Emplacement de production"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Changer la quantité"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2442,9 +2441,6 @@ msgstr ""
 #~ msgid "Latest error"
 #~ msgstr "Dernière Erreur"
 
-#~ msgid "Routing workcenter usage"
-#~ msgstr "Usage des Centre de Travail d'Acheminement"
-
 #~ msgid "Workcenter Operations"
 #~ msgstr "Opérations du Centre de Travail"
 
@@ -2541,9 +2537,6 @@ msgstr ""
 #~ msgid "Minimum Stock Rules"
 #~ msgstr "Règles de Stock Minimum"
 
-#~ msgid "Workcenter"
-#~ msgstr "Centre de Travail"
-
 #~ msgid "Purchase Order"
 #~ msgstr "Commande d'achat"
 
@@ -2568,9 +2561,6 @@ msgstr ""
 #~ msgid "Parameters"
 #~ msgstr "Paramètres"
 
-#~ msgid "Workcenters Utilisation"
-#~ msgstr "Utilisation du Centre de Travail"
-
 #~ msgid "New Bill of Materials"
 #~ msgstr "Nouvelle Nomenclature"
 
@@ -2589,9 +2579,6 @@ msgstr ""
 #~ msgid "Retry"
 #~ msgstr "Réessayez"
 
-#~ msgid "Production Orders To Start"
-#~ msgstr "Ordres de Production à Commencer"
-
 #~ msgid "from stock"
 #~ msgstr "du stock"
 
@@ -2610,12 +2597,6 @@ msgstr ""
 #~ msgid "Workcenter load"
 #~ msgstr "Charge du Centre de Travail"
 
-#~ msgid "Procurement Details"
-#~ msgstr "Détail de l'Approvisionnement"
-
-#~ msgid "Bill of Materials Components"
-#~ msgstr "Composants de la Nomenclature"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Modèle de nom invalide dans la définition de l'action."
 
@@ -2669,18 +2650,9 @@ msgstr ""
 #~ msgid "If Product type is service"
 #~ msgstr "Si le type de produit est \"Service\""
 
-#~ msgid "Compute All Schedulers"
-#~ msgstr "Lancer tous les Planificateurs"
-
 #~ msgid "-"
 #~ msgstr "-"
 
-#~ msgid "Workcenter Name"
-#~ msgstr "Nom du Centre de Travail"
-
-#~ msgid "A cycle is defined in the workcenter definition."
-#~ msgstr "Un cycle est défini dans la définition du Centre de Travail."
-
 #~ msgid "Unit of Measure"
 #~ msgstr "Unité de Mesure"
 
@@ -2708,9 +2680,6 @@ msgstr ""
 #~ "Emplacement où le système recherchera les produits utilisés dans les "
 #~ "matériaux bruts."
 
-#~ msgid "Define the product structure, with sub-products and/or components."
-#~ msgstr "Défini la structure du produit, avec sous-produits et/ou composants."
-
 #~ msgid ""
 #~ "Procurement is created if the product quantity is lower than the minimum "
 #~ "limit."
@@ -2718,9 +2687,6 @@ msgstr ""
 #~ "Un Approvisionnement est créé si la quantité de produit est inférieure à la "
 #~ "limite minimum."
 
-#~ msgid "Define a routing to describe the manufacturing steps."
-#~ msgstr "Défini un routage pour décrire les étapes de la production"
-
 #~ msgid "Note"
 #~ msgstr "Note"
 
@@ -2731,9 +2697,6 @@ msgstr ""
 #~ "Référence vers le document qui a créé cet approvisionnement\n"
 #~ "Cela est automatiquement créé par Open ERP."
 
-#~ msgid "Production Workcenters"
-#~ msgstr "Centres de Travail de Production"
-
 #~ msgid "Your procurement request has been sent !"
 #~ msgstr "Votre demande d'approvisionnement  a été envoyée !"
 
@@ -2770,17 +2733,6 @@ msgstr ""
 #~ msgid "Exceptions Procurements to Fix"
 #~ msgstr "Approvisionnements en Exception à corriger"
 
-#~ msgid "Factor that multiplies all times expressed in the workcenter."
-#~ msgstr ""
-#~ "Facteur multipliant tous les temps exprimés dans le centre de travail."
-
-#~ msgid ""
-#~ "This is the internal picking list take bring the raw materials to the "
-#~ "production plan."
-#~ msgstr ""
-#~ "C'est la liste des colisages internes qui amènent les matériaux bruts vers "
-#~ "le plan de production."
-
 #~ msgid "For stockable and consumable"
 #~ msgstr "Pour les stockables et les consommables"
 
@@ -2794,15 +2746,9 @@ msgstr ""
 #~ "aujourd'hui et aujourd'hui+intervalle sont laissés de côté dans les calculs "
 #~ "futurs."
 
-#~ msgid "Wait for available products for reservation"
-#~ msgstr "Attendre les produits disponibles pour réservation."
-
 #~ msgid "Scheduler Range"
 #~ msgstr "Intervalle du Planificateur"
 
-#~ msgid "Procurement for raw materials."
-#~ msgstr "Approvisionnement pour les matériaux bruts."
-
 #~ msgid "Change Product Qty."
 #~ msgstr "Changer la Qté de Produit"
 
@@ -2833,19 +2779,9 @@ msgstr ""
 #~ msgid "Service Product"
 #~ msgstr "Produit de type Service"
 
-#~ msgid "You can see its bill of material which are used to make product"
-#~ msgstr ""
-#~ "Vous pouvez voir sa nomenclature des matériaux qui est utilisée pour "
-#~ "fabriquer le produit"
-
 #~ msgid "Orderpoint minimum rule"
 #~ msgstr "Règle de stock minimum"
 
-#~ msgid "When any procuere products, it comes into the prpcurement orders"
-#~ msgstr ""
-#~ "Lorsqu'il y'a plusieurs produits à fabriquer, cela devient des commandes "
-#~ "d'appros"
-
 #~ msgid "Close Move at end"
 #~ msgstr "Terminer le mouvement"
 
@@ -2864,9 +2800,6 @@ msgstr ""
 #~ msgid "Procurement convert into the draft purchase order."
 #~ msgstr "Approvisionnement converti en commande d'achat au brouillon."
 
-#~ msgid "Procure Stockable Product"
-#~ msgstr "Approvisionnement de produit stockable"
-
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Si la méthode d'approvisionnement est \"Sur commande\" et la méthode de "
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 3c0dd156cea..815acc8b2e0 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 10:20+0000\n"
+"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movimentazioni generate"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -34,7 +35,7 @@ msgstr "Numero di operazioni che questo centro di lavoro può fare."
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Punto di stoccaggio dove il sistema cercherà i componenti"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -47,21 +48,15 @@ msgid "Work Centers load"
 msgstr "Carico dei centri di lavoro"
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Movimentazioni generate"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
 msgstr "Manufacturing Resource Planning"
 
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione."
-
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -77,13 +72,6 @@ msgstr ""
 "automaticamente ordini di approvvigionamento, non appena si raggiunge la "
 "scorta minima."
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -100,7 +88,7 @@ msgstr "Costo orario"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Cost Price per Uom"
-msgstr ""
+msgstr "Prezzo di Costo per UM"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -127,12 +115,12 @@ msgstr "Cerca distinta base"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Per prodotti stoccabili e consumabili"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "Da Produrre"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -169,11 +157,15 @@ msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
 msgstr ""
+"Arricchisce gli ordini di produzione con stato di avanzamento e date di "
+"inizio/fine."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
+"Il sistema crea automaticamente una richiesta ordine verso il fornitore "
+"preferenziale."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_routing_action
@@ -194,11 +186,6 @@ msgstr ""
 msgid "Set / Pack"
 msgstr "Kit / Pacco"
 
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista"
-
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
@@ -229,11 +216,6 @@ msgstr ""
 msgid "UOM"
 msgstr "Unità di Misura"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID del certificato del modulo deve essere unico !"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
 msgid ""
@@ -317,12 +299,6 @@ msgstr "Merci Programmate"
 msgid "Sets / Phantom"
 msgstr "Kit / Codice Fittizio"
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Non Urgente"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -333,6 +309,11 @@ msgstr ""
 msgid "August"
 msgstr "Agosto"
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
@@ -343,11 +324,6 @@ msgstr ""
 msgid "June"
 msgstr "Giugno"
 
-#. module: mrp
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Il nome del gruppo deve essere univoco !"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
@@ -371,7 +347,6 @@ msgstr "U.M. predefinita"
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -512,6 +487,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -586,13 +566,6 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.product_price,number:0
 msgid ""
@@ -617,6 +590,13 @@ msgstr "Righe Distinta Base"
 msgid "Time before prod."
 msgstr "Tempistiche Pre-Produzione"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -1076,11 +1056,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1214,10 +1189,10 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ubicazione dove il sistema stoccherà i prodotti finiti"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1264,11 +1239,6 @@ msgstr ""
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere univoco!"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
@@ -1387,11 +1357,6 @@ msgstr "Data di inizio"
 msgid "Hour Account"
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore! Non è possibile creare menu ricorsivi."
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1491,11 +1456,6 @@ msgstr "Completato"
 msgid "Change Standard Price"
 msgstr ""
 
-#. module: mrp
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
@@ -1504,12 +1464,10 @@ msgid "Source Document"
 msgstr "Documento Sorgente"
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Non Urgente"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1858,6 +1816,18 @@ msgstr "Conferma"
 msgid "Manufacturing Efficiency"
 msgstr ""
 
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
@@ -2093,6 +2063,11 @@ msgstr ""
 msgid "Error"
 msgstr "Errore"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2147,11 +2122,6 @@ msgstr ""
 "creare una distinta base per definire specifiche fasi di produzione, o una "
 "distinta base multi-livello."
 
-#. module: mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La dimensione del campo non può mai essere minore di 1 !"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2175,6 +2145,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2471,6 +2446,12 @@ msgstr "Anno"
 #~ msgid "Reordering Mode"
 #~ msgstr "Modalità Riordino"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Production Orders in Progress"
 #~ msgstr "Ordini di Produzione in esecuzione"
 
@@ -2817,6 +2798,9 @@ msgstr "Anno"
 #~ msgid "Stockable Stock"
 #~ msgstr "Materiale gestito a scorta"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della vista"
+
 #~ msgid "Stockable Request"
 #~ msgstr "Richiesta di scorte"
 
@@ -2969,3 +2953,24 @@ msgstr "Anno"
 
 #~ msgid "MRP & Logistics Scheduler"
 #~ msgstr "MRP e Schedulatore Logistico"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico !"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Il nome del gruppo deve essere univoco !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere univoco!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore! Non è possibile creare menu ricorsivi."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La dimensione del campo non può mai essere minore di 1 !"
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index fe921bf8822..93d28c4a899 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 10:23+0000\n"
-"Last-Translator: Paulino Ascenção <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 17:03+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -2069,7 +2069,7 @@ msgstr "Erro"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Selecionar quantidade"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 8356d324660..aed841f5a19 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -6,20 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 10:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:40+0000\n"
+"Last-Translator: Daniel Pereira de Carvalho <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Work Centers"
-msgstr ""
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Movimentações Criadas"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -47,20 +48,14 @@ msgid "Work Centers load"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-#: field:mrp.production,move_created_ids2:0
-msgid "Moves Created"
-msgstr "Movimentações Criadas"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
-
-#. module: mrp
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Planejamento dos recursos de produção"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
@@ -74,13 +69,6 @@ msgid ""
 "automatically as soon as the minimum stock is reached."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.bom,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the bills of "
-"material without removing it."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
@@ -108,7 +96,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -129,7 +117,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "Para Produzir"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -147,13 +135,13 @@ msgstr "Produtos Acabados"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Para Comprar"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -172,6 +160,15 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allows you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -180,12 +177,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr ""
-
-#. module: mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+msgstr "Conjunto / Pacote"
 
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
@@ -198,12 +190,12 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr ""
+msgstr "Custo por hora"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -215,16 +207,13 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bills of materials."
 msgstr ""
 
 #. module: mrp
@@ -276,7 +265,7 @@ msgstr "Localização do Destino"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
@@ -298,31 +287,11 @@ msgstr "Total em horas"
 msgid "Scheduled goods"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid ""
-"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def copy(self, cr, uid, id, default=None, context=None):\n"
-"        if default is None:\n"
-"            default = {}\n"
-"        default.update({\n"
-"            'name': self.pool.get('ir.sequence"
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production,priority:0
-#: selection:mrp.production.order,priority:0
-msgid "Not urgent"
-msgstr "Não urgente"
-
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
@@ -331,17 +300,22 @@ msgstr "Refere a uma posição em um plano externo."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "August"
+msgstr "Agosto"
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
 msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Relatório de Ordem de Produção"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -351,7 +325,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -366,7 +340,6 @@ msgstr ""
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: report:bom.structure:0
-#: field:mrp.product.produce,product_qty:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
 #, python-format
@@ -376,7 +349,7 @@ msgstr "Quantidade"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Nro. de horas"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -400,7 +373,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
 msgid "Repairs"
-msgstr ""
+msgstr "Reparos"
 
 #. module: mrp
 #: field:mrp.installer,stock_location:0
@@ -410,7 +383,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr ""
+msgstr "Variação Semanal do Valor do Estoque"
 
 #. module: mrp
 #: help:mrp.installer,mrp_repair:0
@@ -424,12 +397,12 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Data programada"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr ""
+msgstr "Lista de Materiais"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -438,27 +411,24 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Mantenha vazio se você produzir no local onde os produtos acabados são "
+"necessários. Defina um local se você produz em um local fixo. Isto pode ser "
+"um local de parceiro se você tem operações de subcontratação."
 
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Variação do Valor do Estoque"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr ""
+msgstr "Estrutura da Lista de Materiais"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "of "
-msgstr ""
+msgstr "Tipo do produto é um serviço"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -473,7 +443,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom.revision,date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Data de Modificação"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -486,19 +456,19 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Nro. de ciclos"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "Pedido de Cotação"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component suppliers"
-msgstr ""
+msgstr "Fornecedores de componentes"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -507,6 +477,11 @@ msgid ""
 "centers."
 msgstr ""
 
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN inválido"
+
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
@@ -516,17 +491,17 @@ msgstr ""
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Local de Produção"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Mudar Qtd."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
+msgstr "Forçar reserva"
 
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
@@ -536,7 +511,7 @@ msgstr "Autor"
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
-msgstr ""
+msgstr "Valor do Estoque"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
@@ -557,7 +532,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
@@ -579,14 +554,7 @@ msgstr ""
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
-
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list that brings the finished product to the "
-"production plan"
-msgstr ""
+msgstr "Produzir"
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -612,6 +580,13 @@ msgstr ""
 msgid "Time before prod."
 msgstr "Tempo antes de produzir"
 
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
@@ -651,12 +626,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nro. de Linhas"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Planejamento"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -705,6 +680,12 @@ msgstr "Imprimir"
 msgid "Type"
 msgstr "Tipo"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
@@ -722,6 +703,17 @@ msgstr "Por mês"
 msgid "Couldn't find bill of material for product"
 msgstr "Não foi possível encontrar a lista de materiais para o produto"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of material in "
+"order to manufacture a product, when you have different ways of building the "
+"same product. You can assign several properties to each Bill of Materials. "
+"When a sales person creates a sales order, he can relate it to several "
+"properties and OpenERP will select automatically the BoM to use according "
+"the the needs."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
@@ -762,7 +754,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -791,6 +783,14 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
+msgstr "Ordem de Produção"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials Components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM is used a "
+"specific component."
 msgstr ""
 
 #. module: mrp
@@ -821,7 +821,7 @@ msgstr "Modificação de Nome"
 #: view:mrp.production:0
 #: field:mrp.production.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -831,7 +831,7 @@ msgstr "Lista de Materiais Tipo"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -844,7 +844,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr ""
+msgstr "Pesquisar"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -854,19 +854,24 @@ msgstr "Nro de ciclo"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Estoque mínimo"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
 msgstr ""
 
+#. module: mrp
+#: view:board.board:0
+msgid "Work Center Future Load"
+msgstr ""
+
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
@@ -960,11 +965,6 @@ msgstr ""
 msgid "Make to stock"
 msgstr "Produzir para Estoque"
 
-#. module: mrp
-#: view:board.board:0
-msgid "Work Center Future load"
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -979,7 +979,7 @@ msgstr "Iniciar Produção"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "Painel de Produção"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -1031,7 +1031,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1044,11 +1044,6 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 
-#. module: mrp
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
@@ -1059,6 +1054,17 @@ msgstr ""
 msgid "Manufacturing Orders in Progress"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each stage of production. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP becomes capable of automatically "
+"deciding on the manufacturing route depending on the needs of the company."
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1072,7 +1078,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -1094,9 +1100,8 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
-#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1105,7 +1110,7 @@ msgstr "Diário Analítico"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
 msgstr ""
@@ -1122,6 +1127,16 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr "Quantidade de produtos"
+
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
@@ -1154,18 +1169,18 @@ msgstr "Selecione unidade de tempo"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Carga do Centro de Trabalho"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Local onde o sistema estocará os produtos acabados"
 
 #. module: mrp
-#: help:mrp.routing,active:0
+#: help:mrp.production,picking_id:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the routing "
-"without removing it."
+"This is the internal picking list that brings the finished product to the "
+"production plan"
 msgstr ""
 
 #. module: mrp
@@ -1176,7 +1191,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimentação do Estoque"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1196,6 +1211,16 @@ msgstr "Dia a dia"
 msgid "Revisions"
 msgstr "Revisões"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumation of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1249,7 +1274,7 @@ msgstr "Fazer Stock"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
@@ -1283,6 +1308,14 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
+msgstr "Mês"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allows you to create and manage manufacturing units consisting "
+"of one or several people and/or machines that can be considered as a unit "
+"for capacity and planning forecasting."
 msgstr ""
 
 #. module: mrp
@@ -1307,22 +1340,11 @@ msgstr "Estrutura BoM"
 msgid "Start Date"
 msgstr "Data Inicial"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Conta de Hora"
 
-#. module: mrp
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
@@ -1333,12 +1355,6 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Work Cost "
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1372,8 +1388,11 @@ msgid "Scheduled date"
 msgstr "Data prevista"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "'Minimum stock rule' material"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 msgstr ""
 
 #. module: mrp
@@ -1384,7 +1403,7 @@ msgstr "Informação Extra"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Altera a Quantidade dos Produtos"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
@@ -1395,7 +1414,7 @@ msgstr ""
 #: view:mrp.production:0
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Atual"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1407,6 +1426,12 @@ msgstr "Conta Geral"
 msgid "SO Number"
 msgstr "Número OS"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component Cost of "
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1417,22 +1442,20 @@ msgstr "Feito"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Altera o Preço Padrão"
 
 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento de Origem"
 
 #. module: mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Não urgente"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1444,6 +1467,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
+msgstr "Ordens de Produção para Iniciar"
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
 
 #. module: mrp
@@ -1453,7 +1482,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Centro de Trabalho"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1488,7 +1517,7 @@ msgstr "Local de matérias-primas"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Imprime a Estrutura de Custo do Produto"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -1503,7 +1532,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Ordens de Produção"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1516,7 +1545,7 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "UdM Produto"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
@@ -1526,6 +1555,7 @@ msgid "Make to Order"
 msgstr ""
 
 #. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
 msgstr ""
@@ -1544,7 +1574,7 @@ msgstr "Data final"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1573,7 +1603,7 @@ msgstr "Muito Urgente"
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1601,12 +1631,6 @@ msgstr "Produtos Agendados"
 msgid "Production Products Consommation"
 msgstr "Produção de Bens de Consumo"
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Total Cost "
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
@@ -1641,7 +1665,7 @@ msgstr "Custo por ciclo"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1677,7 +1701,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1685,7 +1709,6 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Tempo para 1 ciclo (horas)"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1721,7 +1744,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Components"
-msgstr ""
+msgstr "Componentes"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1749,7 +1772,7 @@ msgstr "BoM Normal"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Tempo para produção"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1762,6 +1785,14 @@ msgstr ""
 msgid "Valid Until"
 msgstr "Válido até"
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
@@ -1770,6 +1801,18 @@ msgstr "Confirmar"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
+msgstr "Eficiência de Produção"
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
 msgstr ""
 
 #. module: mrp
@@ -1783,6 +1826,13 @@ msgstr "Arredondamento do Produto"
 msgid "Work Order"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
+msgid ""
+"This reporting allows you to analyse your manufacturing activities and "
+"performance."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
@@ -1864,7 +1914,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
 msgid "Working Period"
-msgstr ""
+msgstr "Horário de trabalho"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
@@ -1884,12 +1934,12 @@ msgstr "Tempo em horas para a configuração."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagem"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -1901,7 +1951,7 @@ msgstr "Lista de Material (BoM)"
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Variação do valor do estoque"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
@@ -1938,12 +1988,12 @@ msgstr "Provisório"
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Semana"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progresso da Configuração"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1958,6 +2008,7 @@ msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
 msgstr ""
@@ -1970,7 +2021,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -1985,7 +2036,7 @@ msgstr "Unidade de medição de quantidade"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -1999,6 +2050,11 @@ msgstr ""
 msgid "Error"
 msgstr "Erro"
 
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
@@ -2018,7 +2074,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revisão da Lista de Materiais"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -2031,6 +2087,22 @@ msgstr "Informação Básica"
 msgid "Productions"
 msgstr "Produção"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost of "
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bill of Materials allows you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoM in order to propose automatically manufacturing orders according "
+"to products' needs. You can either create a bill of materials to define "
+"specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
 #: view:mrp.bom:0
@@ -2054,6 +2126,11 @@ msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
 
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2065,10 +2142,15 @@ msgstr "Produção"
 msgid "Procurements in Exception"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Preço do Produto"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2116,13 +2198,21 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Quadro de produção"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
+msgid ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
+msgstr ""
+
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
@@ -2141,7 +2231,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@@ -2152,7 +2242,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2197,7 +2287,7 @@ msgstr "Em Estoque"
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
@@ -2221,7 +2311,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #~ msgid "Origin"
 #~ msgstr "Origem"
@@ -2272,6 +2362,9 @@ msgstr ""
 #~ msgid "Machine"
 #~ msgstr "Máquina"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
 #~ msgid "Best price (not yet active!)"
 #~ msgstr "Melhor preço (não disponível ainda!)"
 
@@ -2320,6 +2413,12 @@ msgstr ""
 #~ msgid "Reordering Mode"
 #~ msgstr "Modo de Reordenação"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
 #~ msgid "Purchase Order"
 #~ msgstr "Ordem de Compra"
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 14d0d11e7ea..25eb56673b0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -726,7 +726,6 @@
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
                        <filter icon="terp-check" string="Current" name="current"
-                           default="1"
                            domain="[('state','in',('confirmed','ready','exception','in_production'))]"
                            help="Manufacturing Orders which are waiting for raw materials, confirmed, ready to start or currently in production."/>
                        <separator orientation="vertical"/>
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 1eb81d7fa68..59e96c7fb33 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:35+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:27+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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -29,7 +29,7 @@ msgstr "Arbeitsaufträge"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr "Abbrechen Arbeitsvorgang"
+msgstr "Abbrechen des Vorgangs."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -48,15 +48,10 @@ msgstr "Fertigungsauftrag kann nicht starten im [%s] Status"
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: mrp_operations
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr "Information von der Definition der Arbeitsgänge."
+msgstr "Information über die Fertigungsabfolge."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -99,7 +94,7 @@ msgstr "Keine zwingende Abfolge"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr "Modul mrp_operations"
+msgstr "Fertigungsvorgänge"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -115,12 +110,12 @@ msgstr "Fertigungsauftrag"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr "Packauftrag Fehler"
+msgstr "Lieferauftrag Fehler"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr "Erstelle Fertigungsvorgänge"
+msgstr "Erstellung von Arbeitsaufträgen"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -141,8 +136,7 @@ msgstr "Fertigungsstelle"
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
 msgstr ""
-"Die Fertigungsvorgänge werden durch und basiert auf dem Fertigungsauftrag "
-"generiert."
+"Die Arbeitsaufträge werden auf Basis des Fertigungsauftrags generiert."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -171,7 +165,7 @@ msgstr "Fertigungsvorgänge"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr "Lagerbewegung"
+msgstr "Lieferung"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
@@ -191,11 +185,6 @@ msgstr "Entwurf"
 msgid "In Production"
 msgstr "In Bearbeitung"
 
-#. module: mrp_operations
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.production.workcenter.line,state:0
@@ -208,7 +197,7 @@ msgstr "Status"
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr "Arbeitsvorgänge"
+msgstr "Fertigungsvorgänge"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -216,7 +205,7 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
-"Hier finden Sie je einen Auftrag je Arbeitsplatz. Diese Information wird "
+"Hier finden Sie je einen Auftrag je Fertigungsstelle. Diese Information wird "
 "generiert von der Anzahl der Zyklen oder der Zyklendauer."
 
 #. module: mrp_operations
@@ -235,22 +224,17 @@ msgid ""
 "* When the user cancels the work order it will be set in 'Canceled' state.\n"
 "* When order is completely processed that time it is set in 'Finished' state."
 msgstr ""
-"* Wenn ein Arbeitsvorgang erstellt wird , ist der Status zu Beginn immer "
+"* Wenn ein Arbeitsauftrag erstellt wird , ist der Status zu Beginn immer "
 "'Entwurf'.\n"
-"* Wenn ein Benutzer einen Arbeitsvorgang startet, wird der Status des "
+"* Wenn ein Benutzer einen Arbeitsauftrag startet, wird der Status des "
 "Fertigungsauftrags automatisch auf 'In Bearbeitung' geändert.\n"
-"* Wenn ein Arbeitsvorgang noch in Arbeit ist, kann der Benutzer den Vorgang "
+"* Wenn ein Arbeitsauftrag noch in Arbeit ist, kann der Benutzer den Vorgang "
 "anhalten (Stop), um z.B. den Fertigungsauftrag anzupassen, wodurch der "
 "Status des Auftrags dann auf 'Pause' wechselt.\n"
-"* Wenn ein Benutzer einen Arbeitsvorgang abbricht, ändert sich der Status "
+"* Wenn ein Benutzer einen Arbeitsauftrag abbricht, ändert sich der Status "
 "auf 'Abgebrochen'\n"
-"* Wenn alle Vorgänge beendet werden, wechselt der Status für den Auftrag "
-"automatisch zu 'Erledigt'."
-
-#. module: mrp_operations
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+"* Wenn alle Arbeitsaufträge  beendet werden, wechselt der Status für den "
+"Fertigungsauftrag automatisch zu 'Erledigt'."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -275,7 +259,7 @@ msgstr "Es gibt keinen Fertigungsvorgang der zu Beenden wäre !"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr "Produkt Menge"
+msgstr "Produkt Anz."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -292,11 +276,6 @@ msgstr "Fertigungsvorgang"
 msgid "Status"
 msgstr "Status"
 
-#. module: mrp_operations
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
@@ -320,7 +299,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr "Vorgang wurde beendet"
+msgstr "Vorgang wurde abgebrochen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -351,7 +330,7 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr "Bericht Arbeitsaufträge"
+msgstr "Bericht Arbeitsauftrag"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -384,7 +363,7 @@ msgstr "In Bearbeitung"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "Produktionsauftrag"
+msgstr "Fertigungsauftrag"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -398,11 +377,6 @@ msgstr "Start"
 msgid "Calendar View"
 msgstr "Kalenderansicht"
 
-#. module: mrp_operations
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
@@ -410,7 +384,7 @@ msgid ""
 "form."
 msgstr ""
 "Wenn der Vorgang abgebrochen werden muss, können Sie dieses im Formular für "
-"die Arbeitsvorgänge durchführen."
+"die Arbeitsaufträge durchführen."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -449,7 +423,7 @@ msgstr "August"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr "Startdatum"
+msgstr "Start Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -492,8 +466,8 @@ msgstr "November"
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
-"Die übliche Zeitverzögerung zwischen Start und Ende des Arbeitsvorgangs an "
-"diesem Arbeitsplatz"
+"Die Zeitverzögerung zwischen Start und Ende des Fertigungsvorgangs an dieser "
+"Fertigungsstelle"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -513,7 +487,7 @@ msgstr "Januar"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr "Vorgang erledigen"
+msgstr "Vorgang erledigen."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -524,7 +498,7 @@ msgstr "Vorgang wurde noch nicht gestartet !"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr "Erzeuge Info durch Definition Fertigungsauftrag"
+msgstr "Information zum Fertigungsauftrag."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -569,8 +543,8 @@ msgstr ""
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
 msgstr ""
-"Starte und Beende einzelne Arbeitsvorgänge und deren Dauer zu einem "
-"Fertigungsauftrag."
+"Starte und Beende einzelne Arbeitsaufträge und erfasse dadurch deren "
+"tatsächliche Dauer zu einem Fertigungsauftrag."
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
@@ -621,11 +595,6 @@ msgstr ""
 "Fertigungsauftrag beenden, wird auch der Fertigungsauftrag beendet sowie das "
 "zu produzierende Produkt als fertig erstellt gemeldet."
 
-#. module: mrp_operations
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -636,18 +605,15 @@ msgstr "Starte Vorgang"
 msgid "Information"
 msgstr "Information"
 
-#. module: mrp_operations
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr "Barcode Arbeitsvorgänge"
+msgstr "Barcode Fertigungsstelle"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -718,7 +684,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr "Analyse Arbeitsaufträge"
+msgstr "Statistik Arbeitsaufträge"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -736,7 +702,7 @@ msgstr "ME"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr "Stunden nach Work Centern"
+msgstr "Stunden nach Fertigungsstellen"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -797,12 +763,12 @@ msgstr "Mai"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr "Details zu Auftrag"
+msgstr "Details zu Arbeitsauftrag"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr "Produktion Status"
+msgstr "Fertigungsstatus"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -815,6 +781,22 @@ msgstr "Jahr"
 msgid "Duration"
 msgstr "Dauer"
 
+#. module: mrp_operations
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Operation is started"
 #~ msgstr "Vorgang wurde gestartet"
 
@@ -851,6 +833,9 @@ msgstr "Dauer"
 #~ msgid "Production order for any products"
 #~ msgstr "Fertigungsauftrag für Produkte"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "This is delay between operation start and stop in this workcenter"
 #~ msgstr ""
 #~ "Verzögerung zwischen Vorgangsstart und Vorgangsbeendigung dieses "
@@ -899,3 +884,18 @@ msgstr "Dauer"
 
 #~ msgid "Resources"
 #~ msgstr "Ressourcen"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 93e50c48918..5a6cab95051 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 09:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 18:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -28,7 +28,7 @@ msgstr "Zamówienia robocze"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Anuluj operację"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -45,29 +45,23 @@ msgstr "Zamówienie produkcji nie może się rozpoczynać od stanu [%s]"
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
-
-#. module: mrp_operations
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+msgstr "Grupuj wg..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
-
-#. module: mrp_operations
-#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
-#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
-#: view:mrp.production.workcenter.line:0
-msgid "Resources"
-msgstr ""
+msgstr "Informacje z definicji marszruty"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
+msgid "Work Centers"
+msgstr "Centra robocze"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -84,7 +78,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Produkt do wyprodukowania"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
@@ -99,13 +93,13 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Operacje MRP"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dzień"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -115,7 +109,7 @@ msgstr "Zamówienie produkcji"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Wyjątek pobrania"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
@@ -152,7 +146,7 @@ msgstr "Błąd!"
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
@@ -168,12 +162,12 @@ msgstr "Operacje"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Przesunięcie zapasu"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# wierszy"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -194,7 +188,7 @@ msgstr "W trakcie produkcji"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
@@ -212,7 +206,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Miesiąc -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -247,12 +241,12 @@ msgstr "Nie ma żadnych operacji do anulowania !"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Ilość produktu"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -264,11 +258,6 @@ msgstr "Nazwa operacji"
 msgid "Status"
 msgstr "Stan"
 
-#. module: mrp_operations
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
@@ -279,26 +268,34 @@ msgstr "Data zamówienia"
 msgid "Future Work Orders"
 msgstr "Przyszłe zamówienia operacji"
 
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:0
+#, python-format
+msgid ""
+"Operation has already started !You  can either Pause /Finish/Cancel the "
+"operation"
+msgstr ""
+
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operację anulowano"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -315,15 +312,6 @@ msgstr ""
 msgid "Work Order Report"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
-#, python-format
-msgid ""
-"Operation has already started !' 'You  can either Pause /Finish/Cancel the "
-"operation"
-msgstr ""
-"Operacja została rozpoczęta !' 'Możesz operację Wstrzymać/Zakończyć/Anulować"
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
@@ -350,12 +338,12 @@ msgstr "Wstrzymaj"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr "W trakcie przetwarzania"
+msgstr "W toku"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Zamówienie produkcji"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -369,11 +357,6 @@ msgstr "Uruchom"
 msgid "Calendar View"
 msgstr "Widok kalendarza"
 
-#. module: mrp_operations
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
@@ -391,12 +374,12 @@ msgstr "Ustaw na projekt"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Suma cykli"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Oczekiwanie"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -412,17 +395,17 @@ msgstr " Nie możesz wznowić operacji ze stanu innego niż Wstrzymana !"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Rozpoczęto"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -449,12 +432,12 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -464,22 +447,22 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Wyszukaj"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Skończ operację."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -490,7 +473,7 @@ msgstr "Operacja nie została jeszcze uruchomiona !"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Infromacja z zamówienia produkcji."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -501,7 +484,7 @@ msgstr "Przepraszamy!"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Bieżące"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -515,6 +498,16 @@ msgstr "Kod"
 msgid "Operation is Already Cancelled  !"
 msgstr "Operacja została już anulowana !"
 
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid ""
+"To manufacture or assemble products, as well as using raw materials and "
+"finished product you must also handle manufacturing operations. "
+"Manufacturing operations are often called work orders. The different "
+"operations will have different impacts on the costs of manufacture and "
+"planning depending on the available workload."
+msgstr ""
+
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
@@ -533,7 +526,7 @@ msgstr "Il."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operacja wykonana"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -553,6 +546,16 @@ msgstr "Kod kreskowy Start/Stop"
 msgid "Cancel"
 msgstr "Anuluj"
 
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
+msgid ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
+msgstr ""
+
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
@@ -563,23 +566,20 @@ msgstr "Uruchom operację"
 msgid "Information"
 msgstr "Informacja"
 
-#. module: mrp_operations
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
 msgstr ""
 
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Musisz podać nr partii dla tego produktu"
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Późno"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
@@ -626,7 +626,7 @@ msgstr "Produkt"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Suma godzin"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -661,7 +661,7 @@ msgstr "JM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Godziny wg Centrów roboczych"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -678,27 +678,27 @@ msgstr "Data końcowa"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operacja anulowana"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Start operacji"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operacja wykonana"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -711,11 +711,13 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Kiedy operacja jest skończona, to operator aktualizuje system kończąc "
+"operację."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
@@ -725,19 +727,38 @@ msgstr ""
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Stan produkcji"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
 msgstr "Czas trwania"
 
+#. module: mrp_operations
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Zamawiana ilośc nie może być  ujemna lub zerowa !"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Próbujesz powiązac z numerem partii z innego produktu"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
 #~ msgid "Mrp Operation Process"
 #~ msgstr "Proces operacji MRP"
 
@@ -787,12 +808,22 @@ msgstr "Czas trwania"
 #~ msgid "Done Operation"
 #~ msgstr "Operacja wykonana"
 
+#, python-format
+#~ msgid ""
+#~ "Operation has already started !' 'You  can either Pause /Finish/Cancel the "
+#~ "operation"
+#~ msgstr ""
+#~ "Operacja została rozpoczęta !' 'Możesz operację Wstrzymać/Zakończyć/Anulować"
+
 #~ msgid "From production order, create the workorder"
 #~ msgstr "Z zamówienia produkcji utwórz zamówienie operacji"
 
 #~ msgid "Work Orders to Do"
 #~ msgstr "Zamówienia robocze do wykonania"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Hours by Workcenter"
 #~ msgstr "Godzin na centrum robocze"
 
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 05a9e352a24..f1cf227dadf 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-09-08 14:49+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 15:54+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -23,50 +23,44 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Ordens de Trabalho"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancelar a operação"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Production Order Cannot start in [%s] state"
-msgstr ""
+msgstr "Ordem de Produção não pode iniciar no estado  [%s]"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
-
-#. module: mrp_operations
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
 msgstr ""
 
-#. module: mrp_operations
-#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
-#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
-#: view:mrp.production.workcenter.line:0
-msgid "Resources"
-msgstr ""
-
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
+msgstr "Março"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
+msgid "Work Centers"
 msgstr ""
 
 #. module: mrp_operations
@@ -74,7 +68,7 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Resume"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
@@ -89,7 +83,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr "Operação de produção"
+msgstr "Operação de Produção"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -105,12 +99,12 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr "Ordem de produção"
+msgstr "Ordem de Produção"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -126,14 +120,14 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
-msgstr ""
+msgstr "Não pode Pausar outra Operação então Iniciar/Resumir estado !"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,workcenter_id:0
 msgid "Workcenter"
-msgstr "Centro de trabalho"
+msgstr "Centro de Trabalho"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -144,7 +138,7 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro !"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
@@ -156,7 +150,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "Ordens de Trabalho Confirmada"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -172,7 +166,7 @@ msgstr ""
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Número de linhas"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -185,7 +179,7 @@ msgstr "Rascunho"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr ""
+msgstr "Em produção"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -193,7 +187,7 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
@@ -229,53 +223,56 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
-msgstr ""
+msgstr "Não pode acabar a operação sem Iniciar/Resume-o !"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data agendada"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "There is no Operation to be cancelled !"
-msgstr ""
+msgstr "Não existe nenhuma Operação para ser cancelada !"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Quantidade do produto"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr "Nome da operação"
+msgstr "Nome da Operação"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: mrp_operations
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Data da Ordem"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
+msgstr "Fututas Ordens de Trabalho"
+
+#. module: mrp_operations
+#: code:addons/mrp_operations/mrp_operations.py:0
+#, python-format
+msgid ""
+"Operation has already started !You  can either Pause /Finish/Cancel the "
+"operation"
 msgstr ""
 
 #. module: mrp_operations
@@ -286,18 +283,18 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -307,27 +304,19 @@ msgstr "Cancelado"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
 msgstr ""
 
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
-#, python-format
-msgid ""
-"Operation has already started !' 'You  can either Pause /Finish/Cancel the "
-"operation"
-msgstr ""
-
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Iniciar Data"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -341,19 +330,19 @@ msgstr ""
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordem de produção"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -365,12 +354,7 @@ msgstr "Iniciar"
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
-
-#. module: mrp_operations
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Vista do Calendário"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
@@ -383,7 +367,7 @@ msgstr ""
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr "Definir como rascunho"
+msgstr "Definir Rascunho"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -410,7 +394,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -420,13 +404,13 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Operation is already finished !"
-msgstr ""
+msgstr "A Operação já se encontra terminada !"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -447,12 +431,12 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -462,28 +446,28 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Procurar"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Terminar a operação"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Operation is not started yet !"
-msgstr ""
+msgstr "A Operação ainda não foi iniciada !"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
@@ -494,12 +478,12 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Sorry!"
-msgstr ""
+msgstr "Desculpe Q"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Atual"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -511,6 +495,16 @@ msgstr "Código"
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Operation is Already Cancelled  !"
+msgstr "A Operação já está Cancelada !"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid ""
+"To manufacture or assemble products, as well as using raw materials and "
+"finished product you must also handle manufacturing operations. "
+"Manufacturing operations are often called work orders. The different "
+"operations will have different impacts on the costs of manufacture and "
+"planning depending on the available workload."
 msgstr ""
 
 #. module: mrp_operations
@@ -526,12 +520,12 @@ msgstr ""
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operação concluída"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -543,7 +537,7 @@ msgstr "Concluído"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr "Iniciar/parar código de barra"
+msgstr "Iniciar/Parar código de barra"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -551,28 +545,36 @@ msgstr "Iniciar/parar código de barra"
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
+msgid ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
+msgstr ""
+
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr ""
+msgstr "Iniciar Operação"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
-
-#. module: mrp_operations
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+msgstr "Informação"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
 msgstr ""
 
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
@@ -581,7 +583,7 @@ msgstr ""
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Atraso"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -600,7 +602,7 @@ msgstr ""
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "Centro de Trabalho"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -610,20 +612,20 @@ msgstr ""
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Data programada"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total de horas"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -648,12 +650,12 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Terminada"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "UOM"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -670,12 +672,12 @@ msgstr ""
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
@@ -685,17 +687,17 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Iniciar a operação"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operação concluída"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -712,7 +714,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
@@ -728,15 +730,19 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
+msgstr "Duração"
+
+#. module: mrp_operations
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "A quantidade numa encomenda não pode ser igual ou inferior a zero!"
+
+#. module: mrp_operations
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
 msgstr ""
-
-#~ msgid "Start - Stop Codes"
-#~ msgstr "Iniciar - Parar códigos"
-
-#~ msgid "Workcenters Barcode"
-#~ msgstr "Código de barra do centros dos trabalhos"
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 5996fe1f258..0b2a944e000 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -135,7 +135,6 @@
 	                       <filter icon="terp-document-new" string="Draft"
 	                           domain="[('state','=','draft')]"/>
 	                       <filter icon="terp-check" string="In Progress" name="Current"
-	                           default="1"
 	                           domain="[('state','=','startworking')]"/>
 	                       <filter icon="terp-gtk-media-pause" string="Pending"
 	                           domain="[('state','=','pause')]"/>
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index ca87c76e9cf..806e75387e2 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:28+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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -40,8 +40,8 @@ msgstr ""
 "Reparaturanfrage erstellt, die noch nicht bestätigt ist.\n"
 "* Der 'Bestätigt' Status erfolgt eben durch einen Klick auf den Button "
 "'Bestätigen'.\n"
-"* Der 'Startbereit zur Reparatur' Status beginnt mit einem Klick auf "
-"'Beginne Reparatur'.\n"
+"* Der 'Bereit zur Reparatur' Status beginnt mit einem Klick auf 'Beginne "
+"Reparatur'.\n"
 " * Der Status 'Abrechenbar' erscheint, wenn die Reparatur erfolgreich "
 "beendet wurde und somit der Auftrag abrechenbar ist. \n"
 "* Der 'Erledigt' Status erscheint, wenn die Reparatur erfolgreich beendet "
@@ -59,9 +59,9 @@ msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: mrp_repair
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Wiedererstellung Rechnung"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -103,7 +103,7 @@ msgstr "Gruppiere nach Adressen"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No product defined on Fees!"
-msgstr "Kein Produkt für die Reparaturgebühren definiert !"
+msgstr "Kein Produkt für den Reparaturaufwand definiert !"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -113,7 +113,7 @@ msgstr "Setze auf Entwurf"
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Invoice Exception"
-msgstr "Rechnungsstellung Fehler"
+msgstr "Abrechnungsfehler"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
@@ -228,11 +228,6 @@ msgstr "Kein Finanzkonto definiert für den Partner \"%s.\""
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Recreate Invoice"
-msgstr "Wiedererstellung Rechnung"
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
@@ -260,22 +255,12 @@ msgstr ""
 msgid "Repair Order N° :"
 msgstr "ReparaturNr."
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Fertigungslos"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Under Repair"
-msgstr "In Reparatur"
-
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
@@ -289,18 +274,13 @@ msgstr "Typ"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr "Gebührenposition(en)"
+msgstr "Aufwandspositionen"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
 msgstr "Abrechenbar"
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
@@ -341,11 +321,6 @@ msgstr ""
 msgid "Total :"
 msgstr "Bruttobetrag :"
 
-#. module: mrp_repair
-#: field:mrp.repair,name:0
-msgid "Repair Reference"
-msgstr "Referenz Reparatur"
-
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid ""
@@ -372,11 +347,6 @@ msgstr "Hinweise Angebot"
 msgid "Warning!"
 msgstr "Warnung !"
 
-#. module: mrp_repair
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
@@ -385,7 +355,7 @@ msgstr "Suche Reparaturaufträge"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr "(Hinzu)"
+msgstr "(Ersatz)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -460,7 +430,7 @@ msgstr "Erzeuge Rechnungen"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr "(Entferne)"
+msgstr "(Ausbau)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -473,9 +443,9 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr "Wollen Sie wirklich die Rechnung(en) erstellen ?"
 
 #. module: mrp_repair
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
+msgstr "Referenz Reparatur"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
@@ -483,17 +453,14 @@ msgid "Repair Order"
 msgstr "Reparaturauftrag"
 
 #. module: mrp_repair
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "In Reparatur"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr "Fertig zur Reparatur"
+msgstr "Bereit zur Reparatur"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -534,7 +501,7 @@ msgstr "Datum"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr "Reparaturgebühren"
+msgstr "Reparaturaufwendungen"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -618,9 +585,9 @@ msgid ""
 msgstr ""
 "Die Garantiefrist wird folgendermassen berechnet: Letzte Lagerbuchung + "
 "Garantiezeit des Produkts. Wenn das aktuelle Datum vor der Garantiefrist "
-"liegt, wird automatisch für jeden Vorgang der Reparatur und für die Gebühren "
-"der Reparatur 'nicht abzurechen' standardmässig zugewiesen. Beachten Sie "
-"auch, dass Sie dieses per Hand im Auftrag ändern können."
+"liegt, wird automatisch für jeden Vorgang der Reparatur und für die "
+"Aufwendungen der Reparatur 'nicht abzurechen' standardmässig zugewiesen. "
+"Beachten Sie auch, dass Sie dieses per Hand im Auftrag ändern können."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -643,11 +610,6 @@ msgstr "Abgebrochen"
 msgid "Dest. Location"
 msgstr "Ziel"
 
-#. module: mrp_repair
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
@@ -694,7 +656,7 @@ msgstr "Vorgangspositionen"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr "abgerechenet"
+msgstr "Abgerechnet"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -732,7 +694,7 @@ msgstr "Umsatzsteuer :"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr "Warenauswahl"
+msgstr "Lieferauftrag"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -856,6 +818,9 @@ msgstr "Kein Partner"
 #~ msgid "Repairs in progress"
 #~ msgstr "Reparaturen in Arbeit"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid ""
 #~ "The garantee limit is computed as: last move date + warranty defined on "
 #~ "selected product. If the current date is below the garantee limit, each "
@@ -870,6 +835,12 @@ msgstr "Kein Partner"
 #~ msgid "New Repair"
 #~ msgstr "Neue Reparatur"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Status"
 #~ msgstr "Status"
 
@@ -920,3 +891,18 @@ msgstr "Kein Partner"
 
 #~ msgid "Quality"
 #~ msgstr "Qualität"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index b8d80ac12c6..fad96133af7 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 08:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 22:10+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -48,9 +48,9 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: mrp_repair
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Recrear factura"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -217,11 +217,6 @@ msgstr "No se ha definido una cuenta para la empresa \"%s\"."
 msgid "Confirmed"
 msgstr "Confirmada"
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Recreate Invoice"
-msgstr "Recrear factura"
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
@@ -247,22 +242,12 @@ msgstr ""
 msgid "Repair Order N° :"
 msgstr "Orden de reparación Nº :"
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr "Número de lote"
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Under Repair"
-msgstr "En reparación"
-
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
@@ -283,11 +268,6 @@ msgstr "Línea(s) cargo"
 msgid "To be Invoiced"
 msgstr "Para ser facturado"
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
@@ -321,11 +301,6 @@ msgstr ""
 msgid "Total :"
 msgstr "Total :"
 
-#. module: mrp_repair
-#: field:mrp.repair,name:0
-msgid "Repair Reference"
-msgstr "Referencia reparación"
-
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid ""
@@ -352,11 +327,6 @@ msgstr "Notas del presupuesto"
 msgid "Warning!"
 msgstr "¡Aviso!"
 
-#. module: mrp_repair
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
@@ -454,9 +424,9 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: mrp_repair
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
+msgstr "Referencia reparación"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
@@ -464,12 +434,9 @@ msgid "Repair Order"
 msgstr "Orden reparación"
 
 #. module: mrp_repair
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "En reparación"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -624,11 +591,6 @@ msgstr "Cancelar"
 msgid "Dest. Location"
 msgstr "Ubicación destino"
 
-#. module: mrp_repair
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
@@ -849,6 +811,15 @@ msgstr "¡No existe empresa!"
 #~ msgid "Quality"
 #~ msgstr "Calidad"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Make invoices"
 #~ msgstr "Realizar facturas"
 
@@ -890,6 +861,9 @@ msgstr "¡No existe empresa!"
 #~ "establecerá como \"no facturable\" por defecto. Destacar que puede "
 #~ "cambiarlos manualmente a posteriori."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
 #~ msgid ""
 #~ "This operation  will  cancel the  Repair process, but  will not cancel it's "
 #~ "Invoice. Do you want to continue?"
@@ -902,3 +876,15 @@ msgstr "¡No existe empresa!"
 
 #~ msgid "Repairs Ready to Start"
 #~ msgstr "Reparaciones listas para comenzar"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index 9f66494f213..a067c5a51d6 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -6,20 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-09-08 12:12+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 13:10+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Liha de Comissões"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -39,17 +39,17 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr ""
+msgstr "Inventário de Movimento"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: mrp_repair
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Recriar Factura"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -70,17 +70,17 @@ msgstr ""
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Para Factura"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Data de Impressão"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
 msgid "Group by partner invoice address"
-msgstr ""
+msgstr "Agrupado por endereço da factura do terceiro"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
@@ -91,40 +91,40 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Definir para Rascunho"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Excepção da Factura"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Endereço de Entrega"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Fazer Factura"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub-total"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Endereço da factura:"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limite de Garantia"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -136,33 +136,33 @@ msgstr ""
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total Líquido :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "Operações"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Movimento"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
@@ -174,17 +174,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repair Orders"
-msgstr ""
+msgstr "Ordens de Reparação"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Cotação / Ordem"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informação Extra"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
@@ -208,69 +208,69 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr ""
-
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Recreate Invoice"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
+msgstr "Ordens de reparação"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid ""
+"Repair orders allows you to organize your reparations on the products. On a "
+"repair order, you can detail the components you remove, add or replace and "
+"record the time you spent on the different operations. The repair order uses "
+"the warranty date on the production lot in order to know if you have to "
+"invoice the reparation to the customer or not."
 msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
-msgstr ""
+msgstr "Ordem de Reparação Nº :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr ""
-
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Under Repair"
-msgstr ""
+msgstr "Número do Lote"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Linhas de Comissões"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Linha(s) de Comissões"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Para ser Facturado"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Endereço de recolha :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro!"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Quantidade (oM)"
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -287,12 +287,7 @@ msgstr ""
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Total :"
-msgstr ""
-
-#. module: mrp_repair
-#: field:mrp.repair,name:0
-msgid "Repair Reference"
-msgstr ""
+msgstr "Total :"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -304,24 +299,19 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Lista de Preço"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "Notas da Cotação"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
-
-#. module: mrp_repair
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+msgstr "Atenção!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -337,23 +327,23 @@ msgstr ""
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr ""
+msgstr "Linha de Reparação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Rerceiro"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
 msgid "Invoice Method"
-msgstr ""
+msgstr "Método Factura"
 
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Reparado(a)"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
@@ -364,44 +354,44 @@ msgstr ""
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha de Factura"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Reparar Antes"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr ""
+msgstr "Local Actual"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoiced:0
 #: field:mrp.repair.fee,invoiced:0
 #: field:mrp.repair.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Criar facturas"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -411,7 +401,7 @@ msgstr ""
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
@@ -419,8 +409,8 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr ""
 
 #. module: mrp_repair
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
 msgstr ""
 
 #. module: mrp_repair
@@ -429,11 +419,9 @@ msgid "Repair Order"
 msgstr ""
 
 #. module: mrp_repair
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "Sobre Reparação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -443,38 +431,38 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Montante não Tributado"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Limite de Garantia"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr ""
+msgstr "Produto para Reparar"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "Nº :"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "A lista de preço vem do terceiro seleccionado, por padrão."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
@@ -484,27 +472,27 @@ msgstr ""
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Cotação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Compute"
-msgstr ""
+msgstr "Processar"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr ""
+msgstr "Confirmar Reparação"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Quotation"
-msgstr ""
+msgstr "Cotação da Reparação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr ""
+msgstr "Fim da Reparação"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
@@ -521,37 +509,37 @@ msgstr ""
 #: field:mrp.repair.fee,product_uom_qty:0
 #: report:repair.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Start Repair"
-msgstr ""
+msgstr "Iniciar Reparação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Preço Unitário"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -565,38 +553,38 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "Comissões"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: view:mrp.repair.make_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Local Destino"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "Linha(s) da Operação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr ""
+msgstr "Local de Entrega"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -605,61 +593,64 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Este campo permite-lhe alterar o fluxo de trabalho da ordem de reparação. Se "
+"o valor selecionado é diferete de 'Sem Factura' também permite-lhe "
+"selecionar a lista de preço e o endereço de facturação."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Criar fatura"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: report:repair.order:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "Linhas de Operação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "faturado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Factura Corrigida"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr ""
+msgstr "Entregador"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas Interna"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Impostos:"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
@@ -669,7 +660,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Montante sem Imposto"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
@@ -686,81 +677,90 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr ""
+msgstr "Montante Total"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr ""
+msgstr "UoM"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Produto UoM"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr ""
+msgstr "Endereço de Facturação"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "Depois de Reparar"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturação"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Local de Origem"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "Cancelar Reparação"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "Sem Factura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr ""
+msgstr "Estatísiticas"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
 msgstr ""
+"Este campo permite-lhe escolher o terceiro que vai ser facturado e entregado"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "Pronto para Reparar"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No partner !"
-msgstr ""
+msgstr "Nenhum Terceiro !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura de vista"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #~ msgid "Make invoices"
 #~ msgstr "Criar Facturas"
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 4692be42f14..01f0c22654f 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 13:33+0000\n"
+"Last-Translator: Mladen Nikitovic, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -47,8 +47,8 @@ msgid "Group By..."
 msgstr ""
 
 #. module: mrp_repair
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
 msgstr ""
 
 #. module: mrp_repair
@@ -101,7 +101,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Leveransadress"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
@@ -210,11 +210,6 @@ msgstr ""
 msgid "Confirmed"
 msgstr "Bekräftad"
 
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Recreate Invoice"
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
@@ -235,22 +230,12 @@ msgstr ""
 msgid "Repair Order N° :"
 msgstr ""
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
 msgstr ""
 
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Under Repair"
-msgstr ""
-
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
@@ -271,11 +256,6 @@ msgstr ""
 msgid "To be Invoiced"
 msgstr ""
 
-#. module: mrp_repair
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
@@ -309,11 +289,6 @@ msgstr ""
 msgid "Total :"
 msgstr "Totalt:"
 
-#. module: mrp_repair
-#: field:mrp.repair,name:0
-msgid "Repair Reference"
-msgstr ""
-
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid ""
@@ -338,11 +313,6 @@ msgstr ""
 msgid "Warning!"
 msgstr ""
 
-#. module: mrp_repair
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
@@ -373,7 +343,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Reparerad"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
@@ -394,7 +364,7 @@ msgstr "Avbruten"
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Innan reparation"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
@@ -439,8 +409,8 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr ""
 
 #. module: mrp_repair
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: field:mrp.repair,name:0
+msgid "Repair Reference"
 msgstr ""
 
 #. module: mrp_repair
@@ -449,11 +419,9 @@ msgid "Repair Order"
 msgstr ""
 
 #. module: mrp_repair
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
 msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -565,7 +533,7 @@ msgstr ""
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Pris per enhet"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -603,11 +571,6 @@ msgstr "Avbryt"
 msgid "Dest. Location"
 msgstr ""
 
-#. module: mrp_repair
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
@@ -774,7 +737,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Totalt"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -787,5 +750,13 @@ msgstr ""
 msgid "No partner !"
 msgstr ""
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
 #~ msgid "Products Repairs Module"
 #~ msgstr "Products Repairs Module"
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index c337564bf9a..3a535670ba0 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -6,36 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:35+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:17+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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "Subprodukt"
-
-#. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle Produktmengen müssen grösser als '0' sein !\n"
+"Sie sollten das mrp_subproduct Modul installieren, wenn Sie Subprodukte über "
+"eine Stückliste definieren wollen."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -54,13 +50,8 @@ msgid ""
 msgstr "MRP Sub Product - Modul für die Fertigung von Subprodukten"
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
 msgstr "Subprodukte"
 
 #. module: mrp_subproduct
@@ -89,8 +80,13 @@ msgid "BoM"
 msgstr "BoM"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "Fehler! Sie können keine rekursiven Stücklisten definieren."
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
 msgstr "Subprodukte"
 
 #. module: mrp_subproduct
@@ -99,25 +95,40 @@ msgid "Variable"
 msgstr "Variabel"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Bestellmengen können nicht negativ oder '0' sein !"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Subprodukt"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fest"
 
-#. module: mrp_subproduct
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
 
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Fertigung Subprodukt"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "MRP untergeordnetes Produkt"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index e8c62751396..972b7a9a82a 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -6,36 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:34+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:55+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: mrp_subproduct
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: mrp_subproduct
-#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
-msgid "Sub Product"
-msgstr "Sub producto"
-
-#. module: mrp_subproduct
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas las cantidades de producto deben de ser superiores a cero.\n"
+"¡Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
+"en las LdM!"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -56,14 +52,9 @@ msgstr ""
 "fabricación"
 
 #. module: mrp_subproduct
-#: field:mrp.subproduct,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
-msgstr "sub_productos"
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -91,9 +82,14 @@ msgid "BoM"
 msgstr "Lista de materiales (LdM)"
 
 #. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
-msgstr "Sub productos"
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -101,25 +97,40 @@ msgid "Variable"
 msgstr "Variable"
 
 #. module: mrp_subproduct
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
 msgstr "Fijo"
 
-#. module: mrp_subproduct
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Mrp Sub Product"
 #~ msgstr "Sub producto MRP"
 
 #~ msgid "MRP Sub Product"
 #~ msgstr "Subproducto MRP"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index 25f9afffad3..b123e691ca6 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 11:52+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -28,6 +28,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Todas as quantidades de um produto devem ser maiores do que zero.\n"
+"Deve instalar o módulo mrp_subproduct se quiser gerir produtos extra nos "
+"BoM's !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
diff --git a/addons/outlook/i18n/pt.po b/addons/outlook/i18n/pt.po
new file mode 100644
index 00000000000..18458d13bfa
--- /dev/null
+++ b/addons/outlook/i18n/pt.po
@@ -0,0 +1,118 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 12:09+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Plug-in do Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Manual de Instalação"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+msgid "Outlook Plug-In"
+msgstr "Plug-in do Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interface do Outlook"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Imagem"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Plug-in do Outlook "
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr ""
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+msgid "Outlook Plug-In Configuration"
+msgstr "Configuração do plug-in do Outlook"
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Ignorar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Instalação e passos da configuração"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nome do ficheiro"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progresso da configuração"
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index d7bd590f784..d9197b7c9ec 100644
--- a/addons/pad/i18n/es.po
+++ b/addons/pad/i18n/es.po
@@ -7,27 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:41+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:01+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: pad
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: pad
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
 #. module: pad
 #: code:addons/pad/web/editors.py:0
 #, python-format
@@ -40,20 +30,20 @@ msgstr "Aceptar"
 msgid "Name"
 msgstr "Nombre"
 
-#. module: pad
-#: help:res.company,pad_index:0
-msgid "The root URL of the company's pad instance"
-msgstr "La URL raíz de la instancia pad de la compañía"
-
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
 msgid "Companies"
 msgstr "Compañías"
 
 #. module: pad
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "La URL raíz de la instancia pad de la compañía"
 
 #. module: pad
 #: field:res.company,pad_index:0
@@ -72,18 +62,14 @@ msgstr "Pad"
 msgid "Enhanced support for (Ether)Pad attachments"
 msgstr "Soporte mejorado para adjuntos (Ether)Pad"
 
-#. module: pad
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
 
-#. module: pad
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
 
 #~ msgid ""
 #~ "\n"
@@ -100,3 +86,12 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ "los nuevos pads\n"
 #~ "(por defecto, pad.openerp.com)\n"
 #~ "    "
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
new file mode 100644
index 00000000000..6789c6d748f
--- /dev/null
+++ b/addons/pad/i18n/pt.po
@@ -0,0 +1,62 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:45+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Name"
+msgstr "Nome"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivamente."
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#: view:res.company:0
+#, python-format
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 90b854ff98f..44d8b9fa687 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-28 20:48+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:45+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -43,11 +43,6 @@ msgstr "Aplicar descuento"
 msgid "Set to draft"
 msgstr "Cambiar a borrador"
 
-#. module: point_of_sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
@@ -79,8 +74,8 @@ msgid "All Cashboxes Of the day :"
 msgstr "Todas las cajas de efectivo del día:"
 
 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_box_out
-msgid "Pos Box Out"
+#: view:pos.box.entries:0
+msgid "Put Money"
 msgstr ""
 
 #. module: point_of_sale
@@ -244,11 +239,6 @@ msgstr "Ref."
 msgid "Total Price"
 msgstr "Precio total"
 
-#. module: point_of_sale
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
@@ -260,6 +250,12 @@ msgstr "Varios"
 msgid "Sales Report"
 msgstr "Informe de ventas"
 
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_discount.py:0
+#, python-format
+msgid "No Order Lines"
+msgstr ""
+
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
@@ -292,12 +288,6 @@ msgstr "Gestión de la caja"
 msgid "No valid pricelist line found !"
 msgstr "¡Se ha encontrado una línea de tarifa no válida!"
 
-#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
-#, python-format
-msgid "No Order Lines"
-msgstr ""
-
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.lines:0
@@ -329,6 +319,14 @@ msgstr "Ctd. total"
 msgid "Sales by user monthly"
 msgstr "Ventas mensuales por usuario"
 
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#, python-format
+msgid ""
+"You can not open a Cashbox for \"%s\".\n"
+"Please close its related cash register."
+msgstr ""
+
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
 msgid "User who is logged into the system."
@@ -366,26 +364,6 @@ msgstr "¿Está seguro de querer cerrar sus ventas?"
 msgid "August"
 msgstr "Agosto"
 
-#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
-#, python-format
-msgid ""
-"You can not open a Cashbox for \"%s\".\n"
-"Please close its related cash register.' %(journal.name)))\n"
-"\n"
-"            number = \n"
-"            if journal.sequence_id:\n"
-"                number = sequence_obj.get_id(cr, uid, "
-"journal.sequence_id.id)\n"
-"            else:\n"
-"                number = sequence_obj.get(cr, uid, 'account.cash.statement"
-msgstr ""
-
-#. module: point_of_sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Intenta asignar un lote que no pertenece al mismo producto"
-
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
@@ -397,16 +375,6 @@ msgstr "Junio"
 msgid "Sales by User Monthly"
 msgstr "Ventas mensuales por usuario"
 
-#. module: point_of_sale
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
-#. module: point_of_sale
-#: view:product.product:0
-msgid "Product Description"
-msgstr "Descripción del producto"
-
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
 #: field:report.pos.order,date_payment:0
@@ -581,9 +549,9 @@ msgid "Cash registers are already closed."
 msgstr "Registros de caja ya están cerrados."
 
 #. module: point_of_sale
-#: field:report.cash.register,date:0
-msgid "Create Date"
-msgstr "Fecha creación"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -789,11 +757,6 @@ msgstr "Total facturado"
 msgid "# of Qty"
 msgstr "Nº de ctdad"
 
-#. module: point_of_sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
@@ -837,7 +800,7 @@ msgstr "Ventas para el usuario actual"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Comentario Situacion Fiscal"
+msgstr "Observación posición fiscal :"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
@@ -1038,6 +1001,11 @@ msgstr "Código de barras"
 msgid "POS"
 msgstr "TPV"
 
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
@@ -1216,11 +1184,6 @@ msgstr "Método de precio"
 msgid "Print the receipt of the sale"
 msgstr "Imprimir ticket de la venta"
 
-#. module: point_of_sale
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
@@ -1352,11 +1315,6 @@ msgstr "Ventas TPV"
 msgid "Statement Name"
 msgstr ""
 
-#. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
-msgid "Subtotal w/o Tax"
-msgstr "Subtotal neto"
-
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_cash_register
@@ -1403,11 +1361,6 @@ msgstr "No se han añadido líneas en esta venta."
 msgid "Opening Balance"
 msgstr ""
 
-#. module: point_of_sale
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
@@ -1509,14 +1462,6 @@ msgstr "Ref. venta"
 msgid "Sales lines Report"
 msgstr ""
 
-#. module: point_of_sale
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
@@ -1632,9 +1577,9 @@ msgid "Mode of Taxes"
 msgstr "Modo de impuestos"
 
 #. module: point_of_sale
-#: model:account.journal,name:point_of_sale.pos_cash_journal
-msgid "Cash Journal"
-msgstr ""
+#: view:product.product:0
+msgid "Product Description"
+msgstr "Descripción del producto"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
@@ -1753,8 +1698,8 @@ msgid "Pos order"
 msgstr "Venta TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
 #: code:addons/point_of_sale/wizard/pos_discount.py:0
+#: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1865,6 +1810,11 @@ msgstr "Confirmar"
 msgid "Sales Lines"
 msgstr ""
 
+#. module: point_of_sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
@@ -1907,8 +1857,8 @@ msgid "Today's Sales by Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.box.entries:0
-msgid "Put Money"
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
 msgstr ""
 
 #. module: point_of_sale
@@ -2177,14 +2127,14 @@ msgid "Order lines"
 msgstr "Líneas de venta"
 
 #. module: point_of_sale
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr "Subtotal neto"
 
 #. module: point_of_sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: view:pos.order:0
+msgid "Add product"
+msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
@@ -2426,6 +2376,9 @@ msgstr ""
 #~ msgid "Get From Order"
 #~ msgstr "Importar pedido venta"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "POS Lines of the day"
 #~ msgstr "Líneas TPV del día"
 
@@ -2486,6 +2439,12 @@ msgstr ""
 #~ msgid "Refund order :"
 #~ msgstr "Devolución :"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Pos Payment"
 #~ msgstr "Pago TPV"
 
@@ -2531,6 +2490,9 @@ msgstr ""
 #~ msgid "Piece Number"
 #~ msgstr "Número ref."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
 #~ msgid "Logged in User"
 #~ msgstr "Usuario conectado"
 
@@ -2545,3 +2507,18 @@ msgstr ""
 
 #~ msgid "This is the salesman actually making the order."
 #~ msgstr "Este es el vendedor actualmente preparando la orden."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Intenta asignar un lote que no pertenece al mismo producto"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Debe asignar un lote de producción para este producto"
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index af3277c778a..798e849dfdd 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 08:48+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 20:40+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -26,37 +26,18 @@ msgstr ""
 msgid "Process Node"
 msgstr "Κόμβος Διεργασίας"
 
-#. module: process
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα του αντικειμένου πρέπει να ξεκινάει από x_ και να μην περιέχει "
-"ειδικούς χαρακτήρες!"
-
-#. module: process
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
-
-#. module: process
-#: model:ir.actions.act_window,name:process.action_process_form
-#: model:ir.ui.menu,name:process.menu_process_form
-msgid "Processes"
-msgstr ""
-
-#. module: process
-#: field:process.node,help_url:0
-msgid "Help URL"
-msgstr "Help URL"
-
 #. module: process
 #: help:process.process,active:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the process "
+"If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
 
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Σχετικό Μενού"
+
 #. module: process
 #: field:process.transition,action_ids:0
 msgid "Buttons"
@@ -66,7 +47,7 @@ msgstr "Κουμπιά"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ομαδοποίηση ανά..."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -79,9 +60,9 @@ msgid "Kind Of Node"
 msgstr ""
 
 #. module: process
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "URL Βοήθειας"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -171,9 +152,10 @@ msgid "Dummy"
 msgstr "Εικονικό"
 
 #. module: process
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr ""
 
 #. module: process
 #: field:process.condition,name:0
@@ -224,11 +206,6 @@ msgstr "Ενεργά"
 msgid "Associated Groups"
 msgstr ""
 
-#. module: process
-#: field:process.node,menu_id:0
-msgid "Related Menu"
-msgstr "Σχετικό Μενού"
-
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
@@ -338,12 +315,21 @@ msgstr "Διεργασίες"
 msgid "Object Method"
 msgstr "Μέθοδος Αντικειμένων"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του αντικειμένου πρέπει να ξεκινάει από x_ και να μην περιέχει "
+#~ "ειδικούς χαρακτήρες!"
+
 #~ msgid "Roles from Workflow"
 #~ msgstr "Ρόλοι από Ροή Εργασίας"
 
 #~ msgid "Details"
 #~ msgstr "Λεπτομέρειες"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
 #~ msgid "Roles"
 #~ msgstr "Ρόλοι"
 
@@ -355,3 +341,6 @@ msgstr "Μέθοδος Αντικειμένων"
 
 #~ msgid "Enterprise Processes"
 #~ msgstr "Επιχειρηματικές Διεργασίες"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 3bcd1657102..5be8e8371e7 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-19 08:59+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:01+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-20 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -23,43 +24,19 @@ msgstr ""
 msgid "Process Node"
 msgstr "Nodo proceso"
 
-#. module: process
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: process
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: process
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: process
-#: model:ir.actions.act_window,name:process.action_process_form
-#: model:ir.ui.menu,name:process.menu_process_form
-msgid "Processes"
-msgstr "Procesos"
-
-#. module: process
-#: field:process.node,help_url:0
-msgid "Help URL"
-msgstr "URL de ayuda"
-
 #. module: process
 #: help:process.process,active:0
 msgid ""
-"If the active field is set to true, it will allow you to hide the process "
+"If the active field is set to False, it will allow you to hide the process "
 "without removing it."
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
 
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Menú relacionado"
+
 #. module: process
 #: field:process.transition,action_ids:0
 msgid "Buttons"
@@ -82,9 +59,9 @@ msgid "Kind Of Node"
 msgstr "Tipo de nodo"
 
 #. module: process
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "URL de ayuda"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -152,11 +129,6 @@ msgstr "Nodo origen"
 msgid "Workflow Transitions"
 msgstr "Transiciones flujo de trabajo"
 
-#. module: process
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
@@ -179,9 +151,10 @@ msgid "Dummy"
 msgstr "De relleno"
 
 #. module: process
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr "Procesos"
 
 #. module: process
 #: field:process.condition,name:0
@@ -232,11 +205,6 @@ msgstr "Activo"
 msgid "Associated Groups"
 msgstr "Grupos asociados"
 
-#. module: process
-#: field:process.node,menu_id:0
-msgid "Related Menu"
-msgstr "Menú relacionado"
-
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
@@ -346,10 +314,11 @@ msgstr "Transiciones"
 msgid "Object Method"
 msgstr "Método objeto"
 
-#. module: process
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Roles from Workflow"
 #~ msgstr "Roles desde flujo"
@@ -357,6 +326,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Details"
 #~ msgstr "Detalles"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Roles"
 #~ msgstr "Roles"
 
@@ -368,3 +340,24 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Enterprise Processes"
 #~ msgstr "Procesos de empresa"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the process "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar el proceso sin eliminarlo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 4d0affd8f80..f8c8e9dae8c 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 08:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 12:39+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -185,7 +185,7 @@ msgstr "Transição"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "Procurar processo"
 
 #. module: process
 #: selection:process.node,kind:0
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 27a23082f27..9c27391dcd3 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:29+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -55,11 +55,6 @@ msgstr "Planung"
 msgid "No supplier defined for this product !"
 msgstr "Kein Lieferant für dieses Produkt definiert!"
 
-#. module: procurement
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehlerhafte Modellbezeichnung bei dieser Aktion."
-
 #. module: procurement
 #: field:make.procurement,uom_id:0
 msgid "Unit of Measure"
@@ -68,7 +63,7 @@ msgstr "Mengeneinheit"
 #. module: procurement
 #: field:procurement.order,procure_method:0
 msgid "Procurement Method"
-msgstr "Beschaffungsmethode"
+msgstr "Dispositionsverfahren"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -134,7 +129,7 @@ msgstr "Nicht genutzt für die Berechnung, nur zu Informationszwecken"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "Letzt. Beschaffungsv."
+msgstr "Letzter Beschaffungsvorschlag"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -181,14 +176,14 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
-"Wenn der virtuelle Bestand unter den Meldebestand sinkt, erzeugt "
-"OpenERPautomatisch einen  Bestellvorschlag der den Bestand auf die Max. "
-"Menge wiederauffüllt."
+"Wenn der fiktive Bestand unter den Meldebestand sinkt, erzeugt OpenERP "
+"automatisch einen  Bestellvorschlag der den Bestand auf die Max. Menge "
+"wiederauffüllt."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr "Parameter Autom. Beschaffung"
+msgstr "Parameter Automatische Beschaffung"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
@@ -241,20 +236,15 @@ msgstr ""
 "Der Vorgang wird durch OpenERP automatisch vorgenommen."
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
-msgid "Minimum Inventory Rule"
-msgstr "Meldebestandregel"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: procurement
 #: field:procurement.order,priority:0
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: procurement
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,state:0
@@ -308,11 +298,6 @@ msgstr "Günstigster Preis (noch nicht aktiviert!)"
 msgid "Product & Location"
 msgstr "Produkt & Lagerort"
 
-#. module: procurement
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
@@ -373,14 +358,9 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: procurement
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Fehlerhafte Argumente"
-
-#. module: procurement
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Multiple Menge"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -388,24 +368,14 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Wenn Sie per Hand Beschaffungsaufträge erfassen, kann es sinnvoll sein "
-"dieBeschaffungsmethode 'Beschaffe von Auftrag' beim Produkt zu konfigurieren."
-
-#. module: procurement
-#: view:res.company:0
-msgid "MRP & Logistics Scheduler"
-msgstr "Beschaffungsdisposition"
+"Wenn Sie per Hand Beschaffungsaufträge erfassen, kann es sinnvoll sein das "
+"Dispositionsverfahren 'Disponiere von Auftrag' beim Produkt zu konfigurieren."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
 msgstr "Automatische Beschaffung"
 
-#. module: procurement
-#: help:stock.warehouse.orderpoint,qty_multiple:0
-msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "Die Beschaffungsmenge wird auf dieses Vielfache gerundet"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Max Quantity"
@@ -489,21 +459,28 @@ msgstr ""
 "Bitte prüfen Sie die Bestellmenge der Beschaffungsaufträge, sie sollte nicht "
 "geringer als 1 sein!"
 
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
 msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
-"Wenn der virtuelle Bestand unter die Max Menge sinkt, erzeugt OpenERP autom. "
-"einen Beschaffungsvorschlag, um den virtuellen Bestand wieder auf die Max "
+"Wenn der fiktive Bestand unter die Max Menge sinkt, erzeugt OpenERP autom. "
+"einen Beschaffungsvorschlag, um den fiktiven Bestand wieder auf die Max "
 "Menge aufzufüllen."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
-"Wenn der Bestand eines Produktes unter O ist interpretiert OpenERP einen "
+"Wenn der Bestand eines Produktes unter 0 ist, interpretiert OpenERP einen "
 "Bestellpunkt"
 
 #. module: procurement
@@ -542,17 +519,9 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: procurement
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#. module: procurement
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ starten und darf keine Sonderzeichen "
-"haben!"
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Dieser Assistent berechnet automatisch Beschaffungsaufträge"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -602,18 +571,9 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: procurement
-#: view:procurement.order.compute:0
-msgid "This wizard will schedule procurements."
-msgstr "Dieser Assistent berechnet automatisch Beschaffungsaufträge"
-
-#. module: procurement
-#: help:stock.warehouse.orderpoint,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the orderpoint "
-"without removing it."
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
 msgstr ""
-"Wenn dieses Feld aktiviert wird kann die Beschaffungsregel verborgen werden "
-"ohne die Regel komplett zu löschen."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -647,9 +607,9 @@ msgid "Automatic Order Point"
 msgstr "Automatischer Bestellpunkt"
 
 #. module: procurement
-#: field:stock.warehouse.orderpoint,qty_multiple:0
-msgid "Qty Multiple"
-msgstr "Multiple Menge"
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Meldebestandregel"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -666,6 +626,11 @@ msgstr "Extra Informationen"
 msgid "Procurement name."
 msgstr "Beschaffung Bezeichnung"
 
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
@@ -727,7 +692,7 @@ msgstr "Lagerorte"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr "vom Lager"
+msgstr "Disposition vom Lager"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -745,9 +710,9 @@ msgid "Done"
 msgstr "Erledigt"
 
 #. module: procurement
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "Die Beschaffungsmenge wird auf dieses Vielfache gerundet"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -759,11 +724,6 @@ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: procurement
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
@@ -825,7 +785,7 @@ msgstr "Abschluss Warenfluss"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr "geplantes Datum"
+msgstr "Geplantes Datum"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -869,7 +829,7 @@ msgstr "Produkt ME"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr "Beschaffe von Auftrag"
+msgstr "Disponiere von Auftrag"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -908,6 +868,11 @@ msgstr ""
 "Beschaffung kann eine Aufgabe, Fertigungsauftrag oder Bestellung an "
 "Lieferanten auslösen."
 
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr "Beschaffungsdisposition"
+
 #. module: procurement
 #: field:mrp.property,name:0
 #: field:stock.warehouse.orderpoint,name:0
@@ -970,16 +935,51 @@ msgstr "Autom. Bestellzeitpunkt"
 msgid "Procurement Details"
 msgstr "Details zur Beschaffung"
 
-#. module: procurement
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: procurement
 #: code:addons/procurement/schedulers.py:0
 #, python-format
 msgid "SCHEDULER"
 msgstr "DISPOSITION"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehlerhafte Modellbezeichnung bei dieser Aktion."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Fehlerhafte Argumente"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+
 #~ msgid "MRP & Logistic Scheduler"
 #~ msgstr "Assitent Beschaffungsvorschlag"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "haben!"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the orderpoint "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn dieses Feld aktiviert wird kann die Beschaffungsregel verborgen werden "
+#~ "ohne die Regel komplett zu löschen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index bfc2bd85d3e..bb5b5a3e76e 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:48+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:00+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -55,11 +55,6 @@ msgstr "Planificación"
 msgid "No supplier defined for this product !"
 msgstr "¡No se ha definido un proveedor para este producto!"
 
-#. module: procurement
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: procurement
 #: field:make.procurement,uom_id:0
 msgid "Unit of Measure"
@@ -223,20 +218,15 @@ msgstr ""
 "OpenERP lo completa automáticamente."
 
 #. module: procurement
-#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
-msgid "Minimum Inventory Rule"
-msgstr "Regla de inventario mínimo"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: procurement
 #: field:procurement.order,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: procurement
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,state:0
@@ -283,11 +273,6 @@ msgstr "Mejor precio (¡todavía no activo!)"
 msgid "Product & Location"
 msgstr "Producto y Ubicación"
 
-#. module: procurement
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
@@ -329,7 +314,7 @@ msgstr "Cantidad"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr "No suficiente stock y no se ha definido una regla de stock mínimo."
+msgstr ""
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -348,14 +333,9 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: procurement
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Argumentos no válidos"
-
-#. module: procurement
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr "Ctdad múltiple"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -366,21 +346,11 @@ msgstr ""
 "Si codifica manualmente un abastecimiento, seguramente quiere usar un método "
 "\"Obtener bajo pedido\"."
 
-#. module: procurement
-#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
-msgstr "Planificador MRP y Logística"
-
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
 msgid "Automatic Procurements"
 msgstr "Abastecimientos automáticos"
 
-#. module: procurement
-#: help:stock.warehouse.orderpoint,qty_multiple:0
-msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Max Quantity"
@@ -464,17 +434,28 @@ msgstr ""
 "¡Compruebe la cantidad en la(s) orden(es) de abastecimiento, no debería ser "
 "inferior a 1!"
 
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
 msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Cuando el stock virtual se sitúa por debajo de la cantidad mínima, OpenERP "
+"genera un abastecimiento para situar el stock virtual a la cantidad máxima."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr "Si el stock de un producto es menor que 0, actuará como una orden"
+msgstr ""
+"Si el stock de un producto es menor que 0, actuará como una regla de stock "
+"mínimo."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -504,17 +485,9 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: procurement
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: procurement
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Este asistente planificará abastecimientos."
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -553,17 +526,9 @@ msgid "Normal"
 msgstr "Normal"
 
 #. module: procurement
-#: view:procurement.order.compute:0
-msgid "This wizard will schedule procurements."
-msgstr "Este asistente planificará abastecimientos."
-
-#. module: procurement
-#: help:stock.warehouse.orderpoint,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the orderpoint "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la orden sin eliminarla."
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -597,9 +562,9 @@ msgid "Automatic Order Point"
 msgstr "Orden automática"
 
 #. module: procurement
-#: field:stock.warehouse.orderpoint,qty_multiple:0
-msgid "Qty Multiple"
-msgstr "Ctdad múltiple"
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Regla de inventario mínimo"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -616,6 +581,11 @@ msgstr "Información extra"
 msgid "Procurement name."
 msgstr "Nombre abastecimiento."
 
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Reason"
@@ -695,9 +665,9 @@ msgid "Done"
 msgstr "Realizada"
 
 #. module: procurement
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr "La cantidad abastecida será redondeada hacia arriba a este múltiplo."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -709,11 +679,6 @@ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: procurement
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
@@ -856,6 +821,11 @@ msgstr ""
 "abastecimiento puede generar tareas, órdenes de producción o pedidos de "
 "compra."
 
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr "Planificador de MRP y logística"
+
 #. module: procurement
 #: field:mrp.property,name:0
 #: field:stock.warehouse.orderpoint,name:0
@@ -911,20 +881,57 @@ msgstr "Muy urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr "Orden automática"
+msgstr ""
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Details"
 msgstr "Detalles de abastecimiento"
 
-#. module: procurement
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
 #. module: procurement
 #: code:addons/procurement/schedulers.py:0
 #, python-format
 msgid "SCHEDULER"
 msgstr "PLANIFICADOR"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "Planificador MRP y Logística"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Argumentos no válidos"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the orderpoint "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la orden sin eliminarla."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index cb4ab6c5e89..0bfdb811d45 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 12:51+0000\n"
+"PO-Revision-Date: 2010-12-08 08:45+0000\n"
 "Last-Translator: Lorenzo Battistini - agilebg.com "
 "<lorenzo.battistini@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: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -97,7 +97,7 @@ msgstr ""
 #: field:procurement.order,company_id:0
 #: field:stock.warehouse.orderpoint,company_id:0
 msgid "Company"
-msgstr "Company"
+msgstr "Azienda"
 
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
@@ -258,7 +258,7 @@ msgstr "Punto di stoccaggio"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
 msgid "Picking List"
-msgstr "Lista di prelievo"
+msgstr "Picking List"
 
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index cd6f8fca693..cf6b1033a5a 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 19:07+0000\n"
+"PO-Revision-Date: 2010-12-05 06:53+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 1ad7bd0ace5..625b118b7d3 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:33+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: 2010-12-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -28,9 +28,7 @@ msgid "Number of Layers"
 msgstr "Anzahl Ebenen"
 
 #. module: product
-#: code:addons/product/pricelist.py:0
 #: constraint:product.pricelist.item:0
-#, python-format
 msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
@@ -47,11 +45,6 @@ msgstr ""
 "Trage Vorlage ein falls diese Regel nur auf eine bestimmte Produktvorlage "
 "angewendet werden soll. Lasse das Feld leer für alle Produkte."
 
-#. module: product
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
@@ -220,11 +213,6 @@ msgstr "ME"
 msgid "PCE"
 msgstr "Stück"
 
-#. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
@@ -399,6 +387,7 @@ msgstr "Grundeinheit für diese Kategorie"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
 msgid "Public Price"
 msgstr "Allgemeiner Preis"
 
@@ -412,11 +401,6 @@ msgstr "Menge-5"
 msgid "IT components"
 msgstr "IT Komponenten"
 
-#. module: product
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
@@ -522,6 +506,13 @@ msgstr "Verkauf & Einkauf"
 msgid "Working Time"
 msgstr "Arbeitszeit"
 
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
@@ -606,6 +597,7 @@ msgid "Restaurant Expenses"
 msgstr "Kosten Verpflegung"
 
 #. module: product
+#: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Fehler: Falscher EAN code"
@@ -676,15 +668,6 @@ msgstr "Kit Keyboard + Mouse"
 msgid "Price Name"
 msgstr "Preisbezeichnung"
 
-#. module: product
-#: help:product.pricelist,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the pricelist "
-"without removing it."
-msgstr ""
-"Wenn das Aktiv Feld ausgewählt wurde, ermöglicht dieses die Preisliste zu "
-"verbergen, ohne diese gleich zu entfernen."
-
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
@@ -819,11 +802,6 @@ msgstr ""
 msgid "Kitchen Design Project"
 msgstr "Projekt Küchendesign"
 
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
@@ -1058,11 +1036,6 @@ msgstr "Weitere Info"
 msgid "Price List Items"
 msgstr "Preisliste Einzelpositionen"
 
-#. module: product
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
-
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
@@ -1123,16 +1096,16 @@ msgstr "Bezeichnung"
 msgid "Stockable"
 msgstr "Lagerprodukt"
 
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr "Wood Lintel 4m"
+
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
 msgstr "kg"
 
-#. module: product
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
@@ -1281,9 +1254,9 @@ msgid "Partners"
 msgstr "Partner"
 
 #. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1316,9 +1289,10 @@ msgid "Second UoM"
 msgstr "Weitere ME"
 
 #. module: product
-#: model:product.template,name:product.product_product_woodlintelm0_product_template
-msgid "Wood Lintel 4m"
-msgstr "Wood Lintel 4m"
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1392,7 +1366,7 @@ msgstr "Rack"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr "Mengeneinheit (ME)"
+msgstr "Einkauf Mengeneinheit"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1401,6 +1375,9 @@ msgid ""
 "a category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Sie finden hier Ihre Produkte nach Kategorien zusammengefasst. Sie können "
+"eine Kategorie auswählen und erhalten eine Liste aller Produkte, die zu "
+"dieser Kategorie oder einer der Unterkategorien gehören."
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1417,6 +1394,14 @@ msgstr "Gruppierung ..."
 msgid "Regular processor config"
 msgstr "Regular processor config"
 
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1451,6 +1436,13 @@ msgstr ""
 msgid "Basic PC"
 msgstr "Basic PC"
 
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
@@ -1475,9 +1467,14 @@ msgstr ""
 "derselben Kategorie sein."
 
 #. module: product
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Rundungsgenauigkeit"
 
 #. module: product
 #: view:product.uom:0
@@ -1526,7 +1523,7 @@ msgstr "Variante Preis Marge"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Der Umrechnungefaktor eine Mengeneinheit kann nicht 0 sein!"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1586,6 +1583,10 @@ msgid ""
 "information on your  products related to procurement logistics, sales price, "
 "product category, suppliers and so on."
 msgstr ""
+"Produkte können ge- und/oder verkauft werden. Produkte können Rohstoffe, "
+"Lagerprodukte, Verbrauchswaren, oder Dienstleistungen sein. Die Produktmaske "
+"enthält detailierte Informationen über Ihre Produkte. Zum Beispiel: "
+"Verkaufspreis, Produktkategorie, Lieferant(en) und so weiter.."
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1593,11 +1594,6 @@ msgstr ""
 msgid "Onsite Intervention"
 msgstr "Onsite Intervention"
 
-#. module: product
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
@@ -1613,14 +1609,6 @@ msgstr "Handelswaren"
 msgid "Supplier Product Code"
 msgstr "Kurzbezeichnung bei Partner"
 
-#. module: product
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
@@ -1745,11 +1733,6 @@ msgstr "Produktpreisliste"
 msgid "Company"
 msgstr "Unternehmen"
 
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Verkaufspreis"
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
@@ -1790,8 +1773,8 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
-"Standard Mengeneinheit (ME) wird genutzt für Beschaffungsauftrag. Diese "
-"sollte in der gleichen Kategorie  sein, wie z.B. die Standard Mengeneinheit."
+"Einkauf Mengeneinheit (ME) wird genutzt für Beschaffungsauftrag. Diese "
+"sollte in der gleichen Kategorie  sein, wie die Standard Mengeneinheit (ME)."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
@@ -1877,11 +1860,6 @@ msgstr "Preisliste Bezeichnung"
 msgid "Supplier Product UoM."
 msgstr "Mengeneinheit beim Lieferanten."
 
-#. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Rundungsgenauigkeit"
-
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
@@ -1944,15 +1922,6 @@ msgstr ""
 msgid "Supplier Lead Time"
 msgstr "Lieferzeit des Lieferanten"
 
-#. module: product
-#: help:product.product,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the product "
-"without removing it."
-msgstr ""
-"Wenn dieses Feld aktiviert ist , kann ein Produkt ausgeblendet werden, ohne "
-"es vollständig zu entfernen."
-
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
@@ -1964,6 +1933,8 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Erstellen und Verwalten Sie die Verpackungsgrößen und -typen die Sie in "
+"Ihrem System verwenden wollen."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -2066,6 +2037,11 @@ msgstr "Complete PC With Peripherals"
 msgid "Weigths"
 msgstr "Gewichte"
 
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
@@ -2189,11 +2165,6 @@ msgstr "Preisliste Einzelposition"
 msgid "RAM on demand"
 msgstr "RAM on demand"
 
-#. module: product
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
@@ -2243,6 +2214,8 @@ msgid ""
 "Could not resolve product category, you have defined cyclic categories of "
 "products!"
 msgstr ""
+"Die Produktkategorie kann nicht aufgelöst werden, Sie haben einen "
+"Zirkelbezug für diese Produkategorie definiert!"
 
 #. module: product
 #: view:product.template:0
@@ -2308,11 +2281,6 @@ msgstr "Methode Kalkulation"
 msgid "Palletization"
 msgstr "Pallettierung"
 
-#. module: product
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr ""
-
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
@@ -2384,6 +2352,10 @@ msgid ""
 "versions of a pricelist, you can do it and manage them from here. Some "
 "examples of versions: 2010, 2011, Promotion of February 2010, etc."
 msgstr ""
+"Es kann mehr als eine Version einer Preisliste geben. Wenn Sie weitere "
+"Versionen einer Preisliste benötigen, können Sie hier erstellen und "
+"Verwalten. \r\n"
+"Ein paar Beispiele: 2010, 2011, Promotion Februar 2010, etc."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -2450,6 +2422,9 @@ msgstr ""
 #~ "Diese Preisliste wir anstelle der Standard Preisliste verwendet für den "
 #~ "Verkauf an den aktuellen Kunden (Partner)."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2503,6 +2478,12 @@ msgstr ""
 #~ "Die Gesamtanzahl der Produkte die auf eine Palette (in eine Box) gepackt "
 #~ "werden kann."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2642,6 +2623,9 @@ msgstr ""
 #~ msgid "Purchase UoM"
 #~ msgstr "Einkauf Menge (ME)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #, python-format
 #~ msgid ""
 #~ "Could not resolve product category, ' \\n                                    "
@@ -2651,6 +2635,13 @@ msgstr ""
 #~ "Konnte die Produktkategorie nicht auflösen, ' \\n                            "
 #~ "' die sie innerhalb von regelmässigen zyklischen Abläufen definiert haben!"
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the pricelist "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn das Aktiv Feld ausgewählt wurde, ermöglicht dieses die Preisliste zu "
+#~ "verbergen, ohne diese gleich zu entfernen."
+
 #, python-format
 #~ msgid ""
 #~ "No active version for the selected pricelist !\n"
@@ -2659,3 +2650,31 @@ msgstr ""
 #~ "Ausgewählte Preisliste ist zur Zeit nicht aktiviert !\n"
 #~ "' \\n                                'Bitte erzeugen oder aktivieren Sie "
 #~ "eine Preisliste."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "List Price"
+#~ msgstr "Verkaufspreis"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the product "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn dieses Feld aktiviert ist , kann ein Produkt ausgeblendet werden, ohne "
+#~ "es vollständig zu entfernen."
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index aae9d2b7c4f..1a698afd63c 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 08:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-07 01:22+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -57,8 +57,8 @@ msgstr "Mainboard ASUStek A7V8X-X"
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
-"Αυτή είναι η ελάχιστη ποσότητα που μπορεί να αγοραστεί από τον Κύριο "
-"Προμηθεύτή"
+"Αυτή είναι η ελάχιστη ποσότητα που επιτρέπεται να αγοραστεί από τον Κύριο "
+"Προμηθευτή."
 
 #. module: product
 #: model:product.uom,name:product.uom_day
@@ -68,7 +68,7 @@ msgstr "Ημέρα"
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr "Μ.Μ."
+msgstr "Μονάδα Μέτρησης"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
@@ -100,8 +100,8 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
-"Λάθος:Η προεπιλεγμένη Μ.Μ και η Μ.Μ του προϊόντος του Προμηθευτή πρέπει να "
-"είναι στην ίδια κατηγορία"
+"Λάθος: Η προεπιλεγμένη Μονάδα Μέτρησης και η Μονάδα Μέτρησης του προϊόντος "
+"του Προμηθευτή πρέπει να είναι στην ίδια κατηγορία."
 
 #. module: product
 #: field:product.template,seller_qty:0
@@ -204,7 +204,7 @@ msgstr "Τιμοκατάλογος"
 #: field:product.supplierinfo,product_uom:0
 #: view:product.template:0
 msgid "UOM"
-msgstr "ΜΜ"
+msgstr "Μονάδα Μέτρησης"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -521,7 +521,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "Κατηγορία ΜΜ Προϊόντος"
+msgstr "Κατηγορία μονάδας μέτρησης προϊόντος"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -679,7 +679,7 @@ msgstr "Προμηθευτές"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr "Προς Αγορά"
+msgstr "Επιτρέπεται η αγορά"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -1003,7 +1003,7 @@ msgstr "Εϊδη Τιμοκαταλόγου"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr "Μεγαλύτερο από την αναφερόμενη Μ.Μ."
+msgstr "Μεγαλύτερο από την αναφερόμενη Μονάδα Μέτρησης"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -1013,7 +1013,7 @@ msgstr "Προϊόντα και Τιμοκατάλογοι"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr "Προς Πώληση"
+msgstr "Επιτρέπεται η πώληση"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1238,7 +1238,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "Δεύτερη ΜΜ"
+msgstr "Δεύτερη Μονάδα Μέτρησης"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -1305,7 +1305,7 @@ msgstr "Προμήθεια"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "Κατηγορία ΜΜ"
+msgstr "Κατηγορία Μονάδα Μέτρησης"
 
 #. module: product
 #: field:product.template,loc_rack:0
@@ -1444,7 +1444,7 @@ msgstr "The weight of the empty UL"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr "Μικρότερο απο την αναφερόμενη Μ.Μ."
+msgstr "Μικρότερο απο την αναφερόμενη Μονάδα Μέτρησης"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1549,7 +1549,7 @@ msgstr "Κωδικός Προϊόντος Προμηθευτή"
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr "Προεπιλεγμένη Μ.Μ."
+msgstr "Προεπιλεγμένη Μονάδα Μέτρησης"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1793,7 +1793,7 @@ msgstr "Ονομασία Τιμοκαταλόγου"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "Supplier Product UoM."
-msgstr "Μ.Μ Προϊόντος Προμηθευτή"
+msgstr "Μονάδα Μέτρησης Προϊόντος Προμηθευτή"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -1889,7 +1889,8 @@ msgstr "HDD Seagate 7200.8 80GB"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr "Αυτή είναι ποσότητα που μετατράπηκε στην προεπιλεγμένη Μ.Μ."
+msgstr ""
+"Αυτή είναι ποσότητα που μετατράπηκε στην προεπιλεγμένη Μονάδα Μέτρησης."
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -1924,7 +1925,7 @@ msgstr "Ποντίκι"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr "Τύπος Μ.Μ."
+msgstr "Τύπος Μονάδας Μέτρησης"
 
 #. module: product
 #: help:product.template,product_manager:0
@@ -1937,6 +1938,9 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"Η υπολογιζόμενη ποσότητα θα είναι πολλαπλάσιο της τιμής αυτής. "
+"Χρησιμοποιήστε 1,0 για Μονάδα Μέτρησης που δεν μπορεί να χωριστεί περαιτέρω, "
+"όπως ένα τεμάχιο."
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 1e02cf65ee7..2f5e789cca6 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:56+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -28,9 +28,7 @@ msgid "Number of Layers"
 msgstr "Número de capas"
 
 #. module: product
-#: code:addons/product/pricelist.py:0
 #: constraint:product.pricelist.item:0
-#, python-format
 msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
@@ -47,11 +45,6 @@ msgstr ""
 "Indicar una plantilla si esta regla sólo se aplica a una plantilla de "
 "producto. Dejarlo vacío para todos los productos"
 
-#. module: product
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
@@ -218,11 +211,6 @@ msgstr "UdM"
 msgid "PCE"
 msgstr "Unidad"
 
-#. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
@@ -392,6 +380,7 @@ msgstr "Referencia UdM para esta categoría"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
 msgid "Public Price"
 msgstr "Precio al público"
 
@@ -405,11 +394,6 @@ msgstr "Cantidad-5"
 msgid "IT components"
 msgstr "Componentes TI"
 
-#. module: product
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
@@ -514,6 +498,14 @@ msgstr "Ventas & Compras"
 msgid "Working Time"
 msgstr "Tiempo trabajo"
 
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
+
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
@@ -599,6 +591,7 @@ msgid "Restaurant Expenses"
 msgstr "Gastos restaurante"
 
 #. module: product
+#: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Error: Código EAN erróneo"
@@ -669,14 +662,6 @@ msgstr "Kit Teclado + Ratón"
 msgid "Price Name"
 msgstr "Nombre precio"
 
-#. module: product
-#: help:product.pricelist,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the pricelist "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
-
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
@@ -813,11 +798,6 @@ msgstr ""
 msgid "Kitchen Design Project"
 msgstr "Proyecto diseño cocina"
 
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
@@ -1047,11 +1027,6 @@ msgstr "Otra información"
 msgid "Price List Items"
 msgstr "Elementos de la tarifa"
 
-#. module: product
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "¡El acceso rápido para este menú ya existe!"
-
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
@@ -1111,16 +1086,16 @@ msgstr "Nombre"
 msgid "Stockable"
 msgstr "Estocable"
 
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr "Dintel madera 4m"
+
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
 msgstr "kg"
 
-#. module: product
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
@@ -1272,9 +1247,9 @@ msgid "Partners"
 msgstr "Empresas"
 
 #. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1303,9 +1278,10 @@ msgid "Second UoM"
 msgstr "UdM secundaria"
 
 #. module: product
-#: model:product.template,name:product.product_product_woodlintelm0_product_template
-msgid "Wood Lintel 4m"
-msgstr "Dintel madera 4m"
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1406,6 +1382,14 @@ msgstr "Agrupar por..."
 msgid "Regular processor config"
 msgstr "Config. procesador normal"
 
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1438,6 +1422,14 @@ msgstr ""
 msgid "Basic PC"
 msgstr "PC Básico"
 
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
+
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
@@ -1462,9 +1454,16 @@ msgstr ""
 "categoría."
 
 #. module: product
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Precisión de redondeo"
 
 #. module: product
 #: view:product.uom:0
@@ -1585,11 +1584,6 @@ msgstr ""
 msgid "Onsite Intervention"
 msgstr "Intervención en el mismo lugar"
 
-#. module: product
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
@@ -1605,14 +1599,6 @@ msgstr "Productos negociables"
 msgid "Supplier Product Code"
 msgstr "Código producto proveedor"
 
-#. module: product
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
@@ -1737,11 +1723,6 @@ msgstr "Tarifa de productos"
 msgid "Company"
 msgstr "Compañía"
 
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Precio lista"
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
@@ -1870,11 +1851,6 @@ msgstr "Nombre tarifa"
 msgid "Supplier Product UoM."
 msgstr "UdM del producto del proveedor."
 
-#. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Precisión de redondeo"
-
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
@@ -1937,14 +1913,6 @@ msgstr ""
 msgid "Supplier Lead Time"
 msgstr "Plazo de entrega del proveedor"
 
-#. module: product
-#: help:product.product,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the product "
-"without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
-
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
@@ -2059,6 +2027,11 @@ msgstr "PC completo con periféricos"
 msgid "Weigths"
 msgstr "Pesos"
 
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
@@ -2180,11 +2153,6 @@ msgstr "Elemento de la tarifa"
 msgid "RAM on demand"
 msgstr "RAM bajo pedido"
 
-#. module: product
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
@@ -2302,11 +2270,6 @@ msgstr "Método coste"
 msgid "Palletization"
 msgstr "Paletización"
 
-#. module: product
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
@@ -2417,6 +2380,9 @@ msgstr ""
 #~ msgid "Customer Price"
 #~ msgstr "Precio cliente"
 
+#~ msgid "List Price"
+#~ msgstr "Precio lista"
+
 #~ msgid "The number of layer on a palet or box"
 #~ msgstr "El número de piso en un palet o caja"
 
@@ -2457,6 +2423,9 @@ msgstr ""
 #~ "Esta tarifa será usada en lugar de la tarifa por defecto para las ventas a "
 #~ "la empresa actual."
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2509,6 +2478,12 @@ msgstr ""
 #~ msgid "The total number of products you can put by palet or box."
 #~ msgstr "El número total de productos que puede poner por palet o caja."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
@@ -2581,6 +2556,9 @@ msgstr ""
 #~ "El coste del producto para la valorización contable del inventario. Puede "
 #~ "servir como precio base para el precio de proveedor."
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "You can see the list of suppliers for that product."
 #~ msgstr "Puede ver la lista de proveedores de dicho producto."
 
@@ -2630,6 +2608,24 @@ msgstr ""
 #~ "se administra el almacén de jamón pero se factura en Kg. Dejar sin llenar "
 #~ "para usar UOM por defecto."
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the pricelist "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la tarifa sin eliminarla."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the product "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar el producto sin eliminarlo."
+
 #, python-format
 #~ msgid ""
 #~ "Could not resolve product category, ' \\n                                    "
@@ -2647,3 +2643,24 @@ msgstr ""
 #~ msgstr ""
 #~ "¡No existe versión activa para la tarifa seleccionada!\n"
 #~ "' \\n                                'Debe crear o activar una."
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "¡El acceso rápido para este menú ya existe!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Only one value can be defined for each given usage!"
+#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index b9985575cdf..f741758922f 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:43+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 10:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 58d59c0b673..0fc7c452d30 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:42+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 09:55+0000\n"
 "Last-Translator: Lorenzo Battistini - agilebg.com "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -28,9 +28,7 @@ msgid "Number of Layers"
 msgstr "Numero di strati"
 
 #. module: product
-#: code:addons/product/pricelist.py:0
 #: constraint:product.pricelist.item:0
-#, python-format
 msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
@@ -47,11 +45,6 @@ msgstr ""
 "Impostare un modello se questa regola si applica solo ad un modello di "
 "prodotto. Lasciare vuoto per tutti i prodotti"
 
-#. module: product
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
-
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
@@ -219,11 +212,6 @@ msgstr "U.M."
 msgid "PCE"
 msgstr "Pz"
 
-#. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID del certificato del modulo deve essere unico !"
-
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
@@ -395,6 +383,7 @@ msgstr "U.M. di riferimento per questa categoria"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
 msgid "Public Price"
 msgstr "Prezzo al Pubblico"
 
@@ -408,11 +397,6 @@ msgstr "Quantità - 5"
 msgid "IT components"
 msgstr "Componenti IT"
 
-#. module: product
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Il nome del gruppo deve essere unico !"
-
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
@@ -517,6 +501,15 @@ msgstr "Vendite e Acquisti"
 msgid "Working Time"
 msgstr "Tempo di lavorazione"
 
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"Se il campo 'attivo' non è selezionato, sarà possibile nascondere il "
+"prodotto senza rimuoverlo."
+
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
@@ -601,6 +594,7 @@ msgid "Restaurant Expenses"
 msgstr "Spese ristorante"
 
 #. module: product
+#: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Errore: codice EAN non valido"
@@ -671,15 +665,6 @@ msgstr "Kit Tastiera + Mouse"
 msgid "Price Name"
 msgstr "Nome Prezzo"
 
-#. module: product
-#: help:product.pricelist,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the pricelist "
-"without removing it."
-msgstr ""
-"Se il campo 'attivo' è selezionato, sarà possibile nascondere il listino "
-"senza rimuoverlo."
-
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
@@ -815,11 +800,6 @@ msgstr ""
 msgid "Kitchen Design Project"
 msgstr "Progetto cucina"
 
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
@@ -1048,11 +1028,6 @@ msgstr "Altre informazioni"
 msgid "Price List Items"
 msgstr "Oggetti Listino"
 
-#. module: product
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr "Esiste già una scorciatoia per questo menu!"
-
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
@@ -1112,16 +1087,16 @@ msgstr "Nome"
 msgid "Stockable"
 msgstr "Stoccabile"
 
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr "Architrave di legno 4m"
+
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
 msgstr "kg"
 
-#. module: product
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
-
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
@@ -1271,9 +1246,9 @@ msgid "Partners"
 msgstr "Partners"
 
 #. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico !"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login !"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1305,9 +1280,10 @@ msgid "Second UoM"
 msgstr "Unità di misura secondaria"
 
 #. module: product
-#: model:product.template,name:product.product_product_woodlintelm0_product_template
-msgid "Wood Lintel 4m"
-msgstr "Architrave di legno 4m"
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1408,6 +1384,16 @@ msgstr "Raggruppato per..."
 msgid "Regular processor config"
 msgstr "Consueta Configurazione Processore"
 
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+"La conversione dalla U.M. m alla U.M. Pz non è possibile dal momento che "
+"appartengono a categorie diverse!"
+
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1440,6 +1426,15 @@ msgstr ""
 msgid "Basic PC"
 msgstr "PC Base"
 
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+"Se il campo 'attivo' è deselezionato, sarà possibile nascondere il listino "
+"senza rimuoverlo."
+
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
@@ -1464,9 +1459,14 @@ msgstr ""
 "trovarsi nella stessa categoria"
 
 #. module: product
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore ! Non è possibile creare menu ricorsivi."
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è nelle aziende permesse per questo utente"
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Precisione Arrotondamento"
 
 #. module: product
 #: view:product.uom:0
@@ -1587,11 +1587,6 @@ msgstr ""
 msgid "Onsite Intervention"
 msgstr "Intervento Onsite"
 
-#. module: product
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "La regola deve avere almeno un diritto di accesso verificato !"
-
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
@@ -1607,14 +1602,6 @@ msgstr "Prodotti vendibili"
 msgid "Supplier Product Code"
 msgstr "Codice prodotto fornitore"
 
-#. module: product
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
@@ -1739,11 +1726,6 @@ msgstr "Listino Prodotti"
 msgid "Company"
 msgstr "Azienda"
 
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Listino"
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
@@ -1872,11 +1854,6 @@ msgstr "Nome Listino"
 msgid "Supplier Product UoM."
 msgstr "U.M. prodotto fornitore."
 
-#. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Precisione Arrotondamento"
-
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
@@ -1939,15 +1916,6 @@ msgstr ""
 msgid "Supplier Lead Time"
 msgstr "Tempi di Consegna del Fornitore"
 
-#. module: product
-#: help:product.product,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the product "
-"without removing it."
-msgstr ""
-"Se il campo 'attivo' è selezionato, sarà possibile nascondere il prodotto "
-"senza rimuoverlo."
-
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
@@ -2062,6 +2030,11 @@ msgstr "PC Completo con Periferiche"
 msgid "Weigths"
 msgstr "Pesi"
 
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Errore ! Non è possibile creare membri associati ricorsivi."
+
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
@@ -2183,11 +2156,6 @@ msgstr "Oggetto Listino"
 msgid "RAM on demand"
 msgstr "RAM su Richiesta"
 
-#. module: product
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La dimensione del campo non può mai essere minore di 1 !"
-
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
@@ -2304,11 +2272,6 @@ msgstr "Metodo determinazione costi"
 msgid "Palletization"
 msgstr "Palletizzazione"
 
-#. module: product
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr "Può essere definito solamente un valore per ogni utilizzo!"
-
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
@@ -2498,6 +2461,9 @@ msgstr ""
 #~ "Questo listino verrà utilizzato, al posto di quello predefinito, per le "
 #~ "vendite al partner corrente"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2530,6 +2496,12 @@ msgstr ""
 #~ "Il numero totale di prodotti che possono essere messi sul pallet o in "
 #~ "scatola."
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Price type"
 #~ msgstr "Tipo Prezzo"
 
@@ -2557,12 +2529,18 @@ msgstr ""
 #~ "composto, per il livello di questo prodotto. Diverse tempistiche verranno "
 #~ "sommate per tutti i livelli e gli ordini d'acquisto"
 
+#~ msgid "List Price"
+#~ msgstr "Listino"
+
 #~ msgid "You can see the list of suppliers for that product."
 #~ msgstr "Potete vedere la lista dei fornitori per quel prodotto."
 
 #~ msgid "Rentable Product"
 #~ msgstr "Prodotto Affittabile"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome di modulo non valido nella definizione dell'azione."
+
 #~ msgid "Suppliers of Product"
 #~ msgstr "Fornitore del Prodotto"
 
@@ -2624,3 +2602,44 @@ msgstr ""
 
 #~ msgid "Default UoM"
 #~ msgstr "UOM Predefinita"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico !"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Il nome del gruppo deve essere unico !"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the pricelist "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se il campo 'attivo' è selezionato, sarà possibile nascondere il listino "
+#~ "senza rimuoverlo."
+
+#~ msgid "Shortcut for this menu already exists!"
+#~ msgstr "Esiste già una scorciatoia per questo menu!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Le regole non sono supportate dagli oggetti osv_memory !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "La regola deve avere almeno un diritto di accesso verificato !"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the product "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se il campo 'attivo' è selezionato, sarà possibile nascondere il prodotto "
+#~ "senza rimuoverlo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La dimensione del campo non può mai essere minore di 1 !"
+
+#~ msgid "Only one value can be defined for each given usage!"
+#~ msgstr "Può essere definito solamente un valore per ogni utilizzo!"
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 46718d22fb9..4ff85c2d527 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 19:39+0000\n"
+"PO-Revision-Date: 2010-12-05 07:04+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 3738c1c15c1..700ada8ebe2 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-24 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 20:06+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -27,9 +27,7 @@ msgid "Number of Layers"
 msgstr "Antal lager"
 
 #. module: product
-#: code:addons/product/pricelist.py:0
 #: constraint:product.pricelist.item:0
-#, python-format
 msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
@@ -44,11 +42,6 @@ msgstr ""
 "Välj en mall om denna regel endast gäller en förlaga av produkten. Håll tomt "
 "för alla produkter"
 
-#. module: product
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
@@ -213,11 +206,6 @@ msgstr "Enhet"
 msgid "PCE"
 msgstr "st"
 
-#. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Certifikat ID för modulen måste vara unik!"
-
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
@@ -386,6 +374,7 @@ msgstr "Referensenhet för denna kategori"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
 msgid "Public Price"
 msgstr "Publikt pris"
 
@@ -399,11 +388,6 @@ msgstr "Kvantitet-5"
 msgid "IT components"
 msgstr "IT-komponenter"
 
-#. module: product
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Namned på gruppen måste vara unikt!"
-
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
@@ -508,6 +492,15 @@ msgstr "Försäljning och inköp"
 msgid "Working Time"
 msgstr "Arbetstid"
 
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+"Om aktivfältet är satt till falskt så kommer produkten inte att visas men "
+"den kommer inte tas bort."
+
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
@@ -520,6 +513,8 @@ msgid ""
 "No active version for the selected pricelist !\n"
 "Please create or activate one."
 msgstr ""
+"Det  finns ingen aktiv version av prislistan!\n"
+"Skapa en ny eller aktivera en befintlig."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -552,6 +547,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"En eller flera leverantör(er) kan länkas rill en produkt. All information  "
+"finnspå produktsidan."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -559,6 +556,8 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Antalskonverteringar kan ske automatiskt mellan enheter i samma kategori "
+"beroende på respektive omräkningsfaktor."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -583,9 +582,10 @@ msgstr "Produktmall"
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Resturangutlägg"
 
 #. module: product
+#: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Fel: felaktig EAN-kod"
@@ -656,13 +656,6 @@ msgstr "Paket med tangentbord och  mus"
 msgid "Price Name"
 msgstr "Prisbenämning"
 
-#. module: product
-#: help:product.pricelist,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the pricelist "
-"without removing it."
-msgstr ""
-
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
@@ -686,7 +679,7 @@ msgstr "Leverantörer"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Att köpa"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -791,12 +784,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
-
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ogiltig XML för Vy-arkitektur!"
+msgstr "Köksdesign projekt"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
@@ -816,12 +804,12 @@ msgstr ""
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Ratio & precision"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
@@ -832,7 +820,7 @@ msgstr "IT-komponentpaket"
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -908,7 +896,7 @@ msgstr "Leverantörsinformation"
 #. module: product
 #: view:product.product:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: product
 #: view:product.product:0
@@ -929,6 +917,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Ledtid i dagar mellan bekräftelse av inköpsordern och till det dess att ni "
+"tar emot produkterna i ert lager. Används av för att planera automatiska "
+"inköpsorder."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -959,6 +950,7 @@ msgstr "Nr."
 #: view:product.price_list:0
 msgid "Calculate Product Price per unit base on pricelist version."
 msgstr ""
+"Beräkna produktens pris per enhet baserat på aktuell prislisteversion."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -978,11 +970,15 @@ msgid ""
 "contains a detailed information of your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"Du måste definiera en produkt för allt som du köper eller säljer. Det kan "
+"vara råmterial, lagerprodukter, förbrukningsprodukter eller tjänster. "
+"Produktsidan innehåller detaljerad information om dina produkter relaterad "
+"till logistik, försäljningspriser, produktkategorier, leverantörer mm."
 
 #. module: product
 #: model:ir.model,name:product.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1011,11 +1007,6 @@ msgstr "Annan information"
 msgid "Price List Items"
 msgstr "Element i prislistan"
 
-#. module: product
-#: sql_constraint:ir.ui.view_sc:0
-msgid "Shortcut for this menu already exists!"
-msgstr ""
-
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
@@ -1029,7 +1020,7 @@ msgstr "Produkter och prislistor"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "Att säljas"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1048,6 +1039,8 @@ msgid ""
 "You can define a conversion rate to be used between the several Unit of "
 "Measure within the same category."
 msgstr ""
+"Lägg upp och underhåll de enheter som du vill använda i systemet. Du kan "
+"använda omräkningsfaktorer mellan olika enheter med samma kategori."
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1070,17 +1063,17 @@ msgstr "Namn"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
+msgstr "Lagerförd"
+
+#. module: product
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
 msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
-
-#. module: product
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
@@ -1095,7 +1088,7 @@ msgstr "Föråldrad"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1112,13 +1105,13 @@ msgstr ""
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Sorterar artiklarna när de sorteras per produktkategori."
 
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "Faktor"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -1147,17 +1140,17 @@ msgstr "Associerat fält i produktformuläret."
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Anskaffningsmetod"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Utskriftsdatum"
 
 #. module: product
 #: field:product.template,uos_id:0
@@ -1178,7 +1171,7 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "Huvudleverantör, den som har högst prioritet i leverantörslistan"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1203,7 +1196,7 @@ msgstr "Products"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Antal lager på en en pall eller i en låda"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -1220,7 +1213,7 @@ msgstr "Palldimensioner"
 #: code:addons/product/product.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopia)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1228,9 +1221,9 @@ msgid "Partners"
 msgstr "Alternativa företag"
 
 #. module: product
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ja två användare med samma användarid!"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1256,9 +1249,10 @@ msgid "Second UoM"
 msgstr "Altervativ produktenhet"
 
 #. module: product
-#: model:product.template,name:product.product_product_woodlintelm0_product_template
-msgid "Wood Lintel 4m"
-msgstr ""
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fel !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1347,13 +1341,21 @@ msgstr "Leveransmetod"
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
 msgstr "Regular processor config"
 
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid ""
+"Conversion from Product UoM m to Default UoM PCE is not possible as they "
+"both belong to different Category!."
+msgstr ""
+
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
@@ -1382,6 +1384,14 @@ msgstr ""
 msgid "Basic PC"
 msgstr "Bas-PC"
 
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the pricelist "
+"without removing it."
+msgstr ""
+"Du kan gömma prislistan utan att ta bort den genom att markera denna."
+
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
@@ -1390,7 +1400,7 @@ msgstr "Verkligt lager"
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
@@ -1405,14 +1415,19 @@ msgstr ""
 "Fel: Standardmåttenheten och inköpsmåttenheten måste vara i samma kategori."
 
 #. module: product
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta företag är inte tillåtet för den här användaren-"
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Noggrannhet vid avrundning"
 
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Enhetsinställningar"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
@@ -1456,7 +1471,7 @@ msgstr "Variantprismarginal"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Omvandlingsfaktorn får inte vara noll!"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1493,7 +1508,7 @@ msgstr "Standard måttenhet för all lagerhantering."
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Övr"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1520,11 +1535,6 @@ msgstr ""
 msgid "Onsite Intervention"
 msgstr "Åtgärd på plats"
 
-#. module: product
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
@@ -1538,19 +1548,12 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
-
-#. module: product
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+msgstr "Leverantörens artikelnummer"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Standard enhet"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1620,7 +1623,7 @@ msgstr ""
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Standard enhet"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1671,11 +1674,6 @@ msgstr "Products Price List"
 msgid "Company"
 msgstr "Företag"
 
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Listpris"
-
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
@@ -1702,7 +1700,7 @@ msgstr "Namn på denna pristyp"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Totalt antal produkter som får plats på en pall eller i en låda."
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1715,6 +1713,8 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Standardenhet för inköpsorder. Den måste ha samma kategori som "
+"standardenheten."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
@@ -1729,7 +1729,7 @@ msgstr "Längd"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Längt / distans"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1746,17 +1746,17 @@ msgstr "Prislisttyp"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Andra produkter"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Karakteristik"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Kan säljas"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1776,7 +1776,7 @@ msgstr "Baserad på"
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Råmeterial"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1794,12 +1794,7 @@ msgstr "Prislistenamn"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "Supplier Product UoM."
-msgstr ""
-
-#. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Noggrannhet vid avrundning"
+msgstr "Leverantörens enhet"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -1816,7 +1811,7 @@ msgstr "* ( 1 + "
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "Vikten för ett fullt paket, pall eller låda.."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1826,7 +1821,7 @@ msgstr "HDD Seagate 7200.8 120GB"
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "Anställd"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
@@ -1842,12 +1837,12 @@ msgstr "Produktkategori"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Prislistenamn"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Leveransledtid"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1861,13 +1856,6 @@ msgstr ""
 msgid "Supplier Lead Time"
 msgstr "Leverantörens ledtid"
 
-#. module: product
-#: help:product.product,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the product "
-"without removing it."
-msgstr ""
-
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
@@ -1937,7 +1925,7 @@ msgstr "Mus"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Enhetstyp"
 
 #. module: product
 #: help:product.template,product_manager:0
@@ -1978,10 +1966,15 @@ msgstr "Komplett dator med periferiutrustning"
 msgid "Weigths"
 msgstr "Mått"
 
+#. module: product
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotellutlägg"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2032,7 +2025,7 @@ msgstr "Variabel"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Kan hyras ut"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2053,7 +2046,7 @@ msgstr "Bruttovikt"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Monteringssektion"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
@@ -2079,7 +2072,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -2091,11 +2084,6 @@ msgstr "Element i prislistan"
 msgid "RAM on demand"
 msgstr "RAM vid behov"
 
-#. module: product
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
@@ -2183,7 +2171,7 @@ msgstr "Variant"
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Hyllor"
 
 #. module: product
 #: code:addons/product/pricelist.py:0
@@ -2210,11 +2198,6 @@ msgstr "Metod för kostpris"
 msgid "Palletization"
 msgstr "Palletering"
 
-#. module: product
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr ""
-
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
@@ -2250,7 +2233,7 @@ msgstr "Säljpris"
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Kategorityp"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -2302,6 +2285,14 @@ msgstr ""
 #~ msgid "Can be sold"
 #~ msgstr "Kan säljas"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "List Price"
+#~ msgstr "Listpris"
+
 #~ msgid "Prices Computations"
 #~ msgstr "Prisberäkningar"
 
@@ -2374,6 +2365,9 @@ msgstr ""
 #~ "Den här prislistan används istället för standard,                     vid "
 #~ "order till aktuellt företag"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ogiltig XML för Vy-arkitektur!"
+
 #~ msgid ""
 #~ "Determine if the product can be visible in the list of product within a "
 #~ "selection from a sale order line."
@@ -2561,3 +2555,12 @@ msgstr ""
 
 #~ msgid "Currency :"
 #~ msgstr "Currency :"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Certifikat ID för modulen måste vara unik!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Namned på gruppen måste vara unikt!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index b20630501f9..e656589e780 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:41+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:40+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -23,14 +23,6 @@ msgstr ""
 msgid "Production lot"
 msgstr "Lote producción"
 
-#. module: product_expiry
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
@@ -46,23 +38,16 @@ msgstr "Leche de vaca"
 msgid "Products date of expiry"
 msgstr "Fecha de caducidad de productos"
 
-#. module: product_expiry
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
-
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
 msgstr "Tiempo de vida producto"
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr "La fecha en que el lote empieza a deteriorarse sin ser peligroso."
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -70,16 +55,16 @@ msgid "Product Use Time"
 msgstr "Tiempo de uso producto"
 
 #. module: product_expiry
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+"¡La combinación de número de serie y referencia interna debe ser única!"
 
 #. module: product_expiry
-#: help:stock.production.lot,alert_date:0
-msgid "The date signifying an alert to notify about the production lot."
-msgstr ""
-"La fecha que representa una alerta para notificar sobre el lote de "
-"producción."
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr "La fecha en que el lote debería ser eliminado."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -87,11 +72,13 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: product_expiry
-#: help:stock.production.lot,life_date:0
-msgid "The date the lot may become dangerous and should not be consumed."
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
 msgstr ""
-"Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
-"consumido."
+"El número de días después de lo cuales debería notificarse una alerta sobre "
+"el lote de producción."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -103,6 +90,14 @@ msgstr "Tiempo eliminación producto"
 msgid "Removal Date"
 msgstr "Fecha de eliminación"
 
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr ""
+"La fecha en que el lote puede empezar a ser peligroso y no debería ser "
+"consumido."
+
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
 msgid ""
@@ -137,25 +132,6 @@ msgstr "LTR"
 msgid "Dates"
 msgstr "Fechas"
 
-#. module: product_expiry
-#: sql_constraint:product.uom:0
-msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
-
-#. module: product_expiry
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
-
-#. module: product_expiry
-#: help:product.product,alert_time:0
-msgid ""
-"The number of days after which, needs an alert to notify about the "
-"production lot."
-msgstr ""
-"El número de días después de los cuales se necesita una alerta para "
-"notificar sobre el lote de producción."
-
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
@@ -166,13 +142,6 @@ msgstr "Fecha de fin de vida"
 msgid "Best before Date"
 msgstr "Fecha caducidad"
 
-#. module: product_expiry
-#: help:stock.production.lot,use_date:0
-msgid "The date the lot starts deteriorating without becoming dangerous."
-msgstr ""
-"Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
-"peligroso."
-
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
@@ -183,11 +152,6 @@ msgstr "Queso Camembert francés"
 msgid "The number of days before a production lot should be removed."
 msgstr "Número de días antes de que un lote de producción deba ser retirado."
 
-#. module: product_expiry
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
-
 #. module: product_expiry
 #: help:product.product,use_time:0
 msgid ""
@@ -212,31 +176,84 @@ msgstr ""
 "debe ser consumido."
 
 #. module: product_expiry
-#: help:stock.production.lot,removal_date:0
-msgid "The date the lot should be removed."
-msgstr "Fecha en la que el producto debería ser eliminado."
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr ""
+"La fecha en la que debería notificarse una alerta sobre el lote de "
+"producción."
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr "Tiempo de alerta producto"
 
-#. module: product_expiry
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
 
 #~ msgid "Product alert time"
 #~ msgstr "Fecha alerta producto"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
 #~ msgid "Product removal time"
 #~ msgstr "Fecha eliminación producto"
 
 #~ msgid "Product usetime"
 #~ msgstr "Tiempo de uso producto"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
 #~ msgid "Product lifetime"
 #~ msgstr "Ciclo de vida producto"
 
+#~ msgid "The date the lot starts deteriorating without becoming dangerous."
+#~ msgstr ""
+#~ "Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
+#~ "peligroso."
+
 #~ msgid "Alert Date"
 #~ msgstr "Fecha de alerta"
+
+#~ msgid "The date the lot should be removed."
+#~ msgstr "Fecha en la que el producto debería ser eliminado."
+
+#~ msgid "The date the lot may become dangerous and should not be consumed."
+#~ msgstr ""
+#~ "Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
+#~ "consumido."
+
+#~ msgid "The date signifying an alert to notify about the production lot."
+#~ msgstr ""
+#~ "La fecha que representa una alerta para notificar sobre el lote de "
+#~ "producción."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid ""
+#~ "The number of days after which, needs an alert to notify about the "
+#~ "production lot."
+#~ msgstr ""
+#~ "El número de días después de los cuales se necesita una alerta para "
+#~ "notificar sobre el lote de producción."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The conversion ratio for a unit of measure cannot be 0!"
+#~ msgstr "¡El ratio de conversión para una unidad de medida no puede ser 0!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index a0b014a9278..9bb9638aa56 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-22 19:28+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:40+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-23 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -24,28 +24,16 @@ msgid "Manufacturer Product Code"
 msgstr "Código producto fabricante"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la estructura de la vista!"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "Nombre de plantilla de producto"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con  x_ y no puede contener ningún "
-"carácter especial!"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -62,26 +50,15 @@ msgstr "Atributos producto"
 msgid "Attribute"
 msgstr "Atributo"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "Producto"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "Valor"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: product_manufacturer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 6e4b0f916fd..3c69cc73860 100644
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/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: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-30 12:37+0000\n"
-"Last-Translator: hifly <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 19:24+0000\n"
+"Last-Translator: Roger Zeng <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -23,26 +23,16 @@ msgid "Manufacturer Product Code"
 msgstr "制造商产品代码"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "模块的认证ID必须唯一"
-
-#. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "描述视图架构的XML文件无效"
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "产品"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr "产品模板名称"
 
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
-
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
@@ -59,26 +49,15 @@ msgstr "产品属性"
 msgid "Attribute"
 msgstr "属性"
 
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr "产品"
-
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr "值"
 
 #. module: product_manufacturer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "模块名必须是唯一的！"
-
-#. module: product_manufacturer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "字段的长度不小于1"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "错误:无效EAN编码"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 870855ccaa4..1ec407808e5 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:40+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
@@ -34,9 +34,12 @@ msgid "From"
 msgstr "Desde"
 
 #. module: product_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
+"facturas de cliente"
 
 #. module: product_margin
 #: help:product.product,total_margin:0
@@ -44,9 +47,9 @@ msgid "Turnorder - Standard price"
 msgstr "Volumen de negocio - Precio estándar"
 
 #. module: product_margin
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "Hasta"
 
 #. module: product_margin
 #: field:product.product,date_to:0
@@ -58,33 +61,12 @@ msgstr "Hasta fecha"
 msgid "From Date"
 msgstr "Desde fecha"
 
-#. module: product_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
 msgstr "Borrador, abierto y pagado"
 
-#. module: product_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-"Suma de multiplicaciones del precio del catálogo de venta y cantidad de "
-"facturas de cliente"
-
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
@@ -156,16 +138,6 @@ msgstr "Núm. facturados"
 msgid "Total Cost"
 msgstr "Total coste"
 
-#. module: product_margin
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: product_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
@@ -249,11 +221,6 @@ msgstr "Categorías propiedades"
 msgid "Total margin * 100 / Turnover"
 msgstr "Margen total * 100 / Volumen de negocio"
 
-#. module: product_margin
-#: field:product.margin,to_date:0
-msgid "To"
-msgstr "Hasta"
-
 #. module: product_margin
 #: view:product.product:0
 msgid "Analysis Criteria"
@@ -284,6 +251,11 @@ msgstr "Márgenes de producto"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
 #. module: product_margin
 #: field:product.product,purchase_gap:0
 msgid "Purchase Gap"
@@ -314,11 +286,6 @@ msgstr "Márgenes"
 msgid "Sum of Quantity in Customer Invoices"
 msgstr "Suma de cantidad en facturas de cliente"
 
-#. module: product_margin
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
@@ -330,6 +297,9 @@ msgstr "Margen producto"
 #~ msgid "Reporting"
 #~ msgstr "Informe"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Select "
 #~ msgstr "Seleccionar "
 
@@ -341,3 +311,24 @@ msgstr "Margen producto"
 
 #~ msgid "Turnorder - Total Cost"
 #~ msgstr "Volumen de negocio - Coste total"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index efbe552a4ed..0272fa870a5 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 19:56+0000\n"
+"PO-Revision-Date: 2010-12-05 07:19+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/profile_tools/i18n/pt.po b/addons/profile_tools/i18n/pt.po
new file mode 100644
index 00000000000..dffcdcf4ac6
--- /dev/null
+++ b/addons/profile_tools/i18n/pt.po
@@ -0,0 +1,117 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:52+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr "Almoço"
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Imagem"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Native pad integration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr ""
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr ""
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progresso da configuração"
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index 6a563bd2910..f9db634d51d 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -15,14 +15,7 @@
             res_model="project.project" view_mode="tree,form" 
             view_type="form"/>
 
-        <act_window 
-            id="act_my_account"
-            name="My accounts to invoice"
-            res_model="account.analytic.account"
-            domain="[('user_id','=',uid),('state','&lt;&gt;','close')]"
-            view_id="account.view_account_analytic_account_tree"
-            view_mode="tree,form"
-            view_type="form"/>
+        <act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 2da4383005e..32a6a1a50e1 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:35+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: 2010-12-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -38,11 +39,6 @@ msgstr "Die Aufgabe '%s' wurde delegiert an %s."
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr "Die ausgew. Firma ist nicht zugelassen für diesen Benutzer"
 
-#. module: project
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr "2 Benuzter können nicht den gleichen Login Code haben."
-
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
@@ -159,9 +155,7 @@ msgid "My Tasks"
 msgstr "Meine Aufgaben"
 
 #. module: project
-#: code:addons/project/project.py:0
 #: constraint:project.task:0
-#, python-format
 msgid "Error ! You cannot create recursive tasks."
 msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
@@ -271,7 +265,7 @@ msgstr "Aufgaben"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr "Mitglieder"
+msgstr "Mitarbeiter"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -427,13 +421,16 @@ msgid "res.users"
 msgstr ""
 
 #. module: project
-#: help:project.project,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the project "
-"without removing it."
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "Softwaretest"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
 msgstr ""
-"Wenn dieses Feld aktiviert ist , kann ein Projekt ausgeblendet werden, ohne "
-"dieses vollständig zu entfernen."
+"Erwarteter Zeitbedarf für die Bearbeitung der delegierten Aufgabe durch den "
+"zugewiesenen Mitarbeiter"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -539,9 +536,9 @@ msgid "Date Stop: %(date)s"
 msgstr "Ende Datum: %(date)s"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_testing
-msgid "Testing"
-msgstr "Softwaretest"
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "2 Benuzter können nicht den gleichen Login Code haben."
 
 #. module: project
 #: view:project.project:0
@@ -549,9 +546,9 @@ msgid "Reset as Project"
 msgstr "Zurücksetzen als Projekt"
 
 #. module: project
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Vorlage"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -564,9 +561,9 @@ msgid "My projects"
 msgstr "Meine Projekte"
 
 #. module: project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -578,11 +575,6 @@ msgstr "Nächste"
 msgid "From draft state, it will come into the open state."
 msgstr "Vom Entwurf Stadium ausgehend ist der nächste Status Offen."
 
-#. module: project
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
@@ -681,11 +673,6 @@ msgstr "Verzug"
 msgid "Medium"
 msgstr "Medium"
 
-#. module: project
-#: selection:project.vs.hours,state:0
-msgid "Template"
-msgstr "Vorlage"
-
 #. module: project
 #: view:project.task:0
 #: field:project.task,remaining_hours:0
@@ -700,7 +687,7 @@ msgstr "Verbleibende Stunden"
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "erledigte Aufgaben"
+msgstr "Erledigte Aufgaben"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_board_note_tree
@@ -860,14 +847,14 @@ msgid "Project"
 msgstr "Projekt"
 
 #. module: project
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr "Bestätige"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr "Mein Pinnwand"
+msgstr "Meine Pinnwand"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1064,9 +1051,9 @@ msgid "Project Tasks"
 msgstr "Projekt Aufgaben"
 
 #. module: project
-#: help:project.task.delegate,planned_hours:0
-msgid "Estimated time to close this task by the delegated user"
-msgstr "Erwarteter Zeitbedarf pro User"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1085,15 +1072,10 @@ msgstr "Entwurf"
 msgid "Low"
 msgstr "Ausreichend"
 
-#. module: project
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr "Leistungsfähigkeit"
+msgstr "Bearbeitungsdauer"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1164,11 +1146,6 @@ msgstr ""
 "Implementierung und Anwendung innovativer Konzepte und neuer Aufgabentypen "
 "durch die SCRUM Methodik."
 
-#. module: project
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
@@ -1179,7 +1156,7 @@ msgstr "Tage f. Beend."
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Projektmitarbeiter Pinnwand"
+msgstr "Pinnwand Projektmitarbeiter"
 
 #. module: project
 #: view:project.project:0
@@ -1238,9 +1215,11 @@ msgid "Manager Email"
 msgstr "EMail Manager"
 
 #. module: project
-#: selection:report.project.task.user,month:0
-msgid "January"
-msgstr "Januar"
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -1355,7 +1334,8 @@ msgid ""
 msgstr ""
 "Projekt Management Module ermöglicht über multi-level Projekte eine "
 "Auswertung von ,\n"
-"* geplanten und erledigten Aufgaben,* Mitglieder dieses Projekts.\n"
+"* geplanten und erledigten Aufgaben,\n"
+"* Mitglieder dieses Projekts.\n"
 "    "
 
 #. module: project
@@ -1425,11 +1405,6 @@ msgstr ""
 msgid "Done"
 msgstr "Erledigt"
 
-#. module: project
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
-
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
@@ -1449,11 +1424,6 @@ msgstr "Beenden"
 msgid "Open"
 msgstr "Offen"
 
-#. module: project
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
@@ -1475,14 +1445,6 @@ msgstr "ID: %(task_id)s"
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#. module: project
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
@@ -1582,11 +1544,6 @@ msgstr ""
 msgid "Re-evaluate Task"
 msgstr "Neuberechnung verbleibender Stunden"
 
-#. module: project
-#: view:project.task.reevaluate:0
-msgid "_Evaluate"
-msgstr "Bestätige"
-
 #. module: project
 #: help:project.installer,project_long_term:0
 msgid ""
@@ -1698,6 +1655,11 @@ msgstr "Geleistete Stunden"
 msgid "My accounts to invoice"
 msgstr "Meine abrechenbaren Zeiten"
 
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "Januar"
+
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
@@ -1819,6 +1781,11 @@ msgstr "Öffne Erledigte Aufgaben"
 msgid "Project Time Unit"
 msgstr "Projekt Zeiteinheit"
 
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
@@ -1853,11 +1820,6 @@ msgstr "Benutzer"
 msgid "Overpassed Tasks"
 msgstr "Aufgaben mit Verzug"
 
-#. module: project
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
@@ -2074,6 +2036,9 @@ msgstr "Budgets"
 #~ msgid "Contact"
 #~ msgstr "Kontakt"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Task type"
 #~ msgstr "Aufgabentyp"
 
@@ -2152,6 +2117,12 @@ msgstr "Budgets"
 #~ msgid "Create a Task"
 #~ msgstr "Erzeuge Aufgabe"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Parent Task"
 #~ msgstr "(Ober-) Aufgabe"
 
@@ -2228,6 +2199,9 @@ msgstr "Budgets"
 #~ msgstr ""
 #~ "Wenn ein [?] im Projektnamen ist, dann ist kein Analyse Konto definiert"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
 #~ msgid "All Attachments"
 #~ msgstr "Alle Anhänge"
 
@@ -2348,3 +2322,31 @@ msgstr "Budgets"
 
 #~ msgid "Closed Tasks"
 #~ msgstr "Abgeschlossene Aufgaben"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the project "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Wenn dieses Feld aktiviert ist , kann ein Projekt ausgeblendet werden, ohne "
+#~ "dieses vollständig zu entfernen."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 2d71baf8991..e951c4005b7 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-05 00:10+0000\n"
+"PO-Revision-Date: 2010-12-08 21:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -108,7 +108,7 @@ msgstr "Tarea '%s' cerrada"
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"¡Error! Fecha de inicio del proyecto debe ser inferior que la fecha final "
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
 "del proyecto."
 
 #. module: project
@@ -490,7 +490,7 @@ msgstr "Empresa"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear menús recursivos."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -558,7 +558,7 @@ msgstr "Mis proyectos"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: project
 #: view:project.task:0
@@ -1046,7 +1046,7 @@ msgstr "Tareas de proyecto"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1212,6 +1212,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el proyecto sin eliminarlo."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -1782,7 +1783,7 @@ msgstr "Unidad de tiempo proyecto"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Horas consumidas"
 
 #. module: project
 #: code:addons/project/project.py:0
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 63548f231e3..cb8e8304d70 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-02 07:27+0000\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 14:01+0000\n"
+"Last-Translator: Lorenzo Battistini - agilebg.com "
+"<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-03 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -24,7 +25,7 @@ msgstr "Attività Assegnate"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Ri-include la descrizione dell'attività nell'attività dell'utente"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -35,7 +36,7 @@ msgstr "L'attività '%s' è stata affidata a %s."
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "L'azienda scelta non è fra la aziende permesse per questo utente"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -45,7 +46,7 @@ msgstr "Inserire qui le ore che restano per chiudere l'attività"
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Scadenze"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -62,7 +63,7 @@ msgstr "CONTROLLA: "
 #. module: project
 #: field:project.installer,project_issue:0
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Tracciatore problemi"
 
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
@@ -77,7 +78,7 @@ msgstr "Deleghe"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Ore da Confermare"
+msgstr "Ore da convalidare"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -105,11 +106,12 @@ msgstr "Attività '%s' chiusa"
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Errore ! La data inizio del progetto deve essere antecedente alla data fine."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Attività di rivalutazione"
 
 #. module: project
 #: field:project.project,members:0
@@ -124,7 +126,7 @@ msgstr "Attività da delegare"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: project
 #: view:project.task:0
@@ -151,11 +153,9 @@ msgid "My Tasks"
 msgstr "Le Mie Attività"
 
 #. module: project
-#: code:addons/project/project.py:0
 #: constraint:project.task:0
-#, python-format
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Errore ! Non è possibile creare attività ricorsive."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -163,22 +163,22 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr "Compagnia"
+msgstr "Azienda"
 
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Progetti: ore pianificate rispetto a totali"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Messaggio di avviso"
 
 #. module: project
 #: help:project.project,members:0
@@ -195,7 +195,7 @@ msgstr "Nome fase"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "Imposta a Sospeso"
+msgstr "Imposta a 'In Sospeso'"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -211,12 +211,13 @@ msgstr "Cambia fase"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Nuovo progetto basato su modello"
+msgstr "Nuovo progetto basato su template"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
+"Errore ! Non è possibile assegnare l'escalation allo stesso progetto!"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -227,25 +228,25 @@ msgstr "Molto Urgente"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "L'utente a cui si vuole delegare questa attività"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Giorno"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "L'attività '%s' è completata"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Attività chiusura progetto"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -276,7 +277,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Lavoro attività progetto"
 
 #. module: project
 #: view:project.project:0
@@ -288,7 +289,7 @@ msgstr "Note"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Il Progetto rispetto alle ore rimanenti"
 
 #. module: project
 #: view:project.project:0
@@ -303,7 +304,7 @@ msgstr "Descrizione attività"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Non un'attività di template"
 
 #. module: project
 #: view:project.task:0
@@ -361,7 +362,7 @@ msgstr "Attività Completata"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Titolo per l'attività di convalida"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -378,12 +379,12 @@ msgstr "L'attività è stata completata"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data fine"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mese   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -395,7 +396,7 @@ msgstr "Delega le attività ad un altro utente"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -415,21 +416,22 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
-#: help:project.project,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the project "
-"without removing it."
-msgstr ""
-"Se viene selezionato il campo attivo, sarà possibile nascondere il progetto "
-"senza rimuoverlo."
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "Testing"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr "Tempo stimato in cui l'utente delegato chiuderà questa attività"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Lavoro Eseguito"
+msgstr "Lavoro Completato"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -449,9 +451,16 @@ msgid "Done by"
 msgstr "Completato da"
 
 #. module: project
-#: view:project.task:0
-msgid "Planning"
-msgstr "Pianificazione"
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define here the steps that will be used on the project from the creation of "
+"the task, up to the closing of the task or issue. You will use these stages "
+"in order to track the progress of the resolution of a task or an issue."
+msgstr ""
+"Definire qui i passi che saranno usati nel progetto a partire dalla "
+"creazione dell'attività fino alla chiusura dell'attività o del problema. "
+"Queste fasi saranno usate per tracciare il progresso della risoluzione di "
+"una attività o di un problema."
 
 #. module: project
 #: view:project.task:0
@@ -465,12 +474,7 @@ msgstr "Scadenza"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
-
-#. module: project
-#: view:project.task.delegate:0
-msgid "_Delegate"
-msgstr ""
+msgstr "_Annulla"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -484,40 +488,52 @@ msgstr "Partner"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (copia)"
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Responsible"
+msgstr "Responsabile"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Traccia ed aiuta i dipendenti ad inserire e convalidare i timesheet e le "
+"presenze."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# di attività"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Precedente"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Rivaluta attività"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_testing
-msgid "Testing"
-msgstr ""
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr "Data Stop: %(date)s"
+
+#. module: project
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login !"
 
 #. module: project
 #: view:project.project:0
@@ -525,14 +541,14 @@ msgid "Reset as Project"
 msgstr "Reimpostare come Progetto"
 
 #. module: project
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modulo non valido nella definizione dell'azione."
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Template"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Specifica"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -540,14 +556,14 @@ msgid "My projects"
 msgstr "I Miei Progetti"
 
 #. module: project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Errore! Non è possibile creare aziende ricorsive."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Prossimo"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -558,7 +574,7 @@ msgstr "Dallo stato bozza, passerà allo stato aperto."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# di giorni"
 
 #. module: project
 #: help:project.task,active:0
@@ -567,6 +583,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Questo campo è calcolato automaticamente e ha lo stesso comportamento del "
+"campo 'attivo': se l'attività è collegata ad un template o un progetto "
+"deattivato, sarà nascosta se non richieseto esplicitamente."
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -574,10 +593,26 @@ msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr "Percentuale di attività chiuse in base alle attività da completare."
 
 #. module: project
-#: view:project.task.delegate:0
-#: field:project.task.delegate,new_task_description:0
-msgid "New Task Description"
-msgstr "Nuova Descrizione dell'attività"
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to antoher user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be re-"
+"opened when you have to review the work achieved. If you install the "
+"project_timesheet module, tasks works can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
+"Un'attività rappresenta un lavoro che deve essere fatto. Ogni utente lavora "
+"alla propria lista di attività dove può segnare il proprio lavoro in ore. "
+"Può lavorare e chiudere l'attività lui stesso oppure delegarla ad un altro "
+"utente. Se si delega un'attività ad un altro utente, si ottiene un'attività "
+"nello stato 'in sospeso', che sarà riaperta al momento di esaminare il "
+"lavoro realizzato. Se si installa il modulo project_timesheet, i lavori "
+"delle attività possono essere fatturati sulla base della configurazione del "
+"progetto. Con il modulo project_mrp, gli ordini di vendita possono creare "
+"automaticamente le attività quando confermati."
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -587,7 +622,7 @@ msgstr "Attività del Progetto"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodologie"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -608,23 +643,23 @@ msgstr "Ore Effettive"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Titolo attività di convalida"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Rivaluta"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Manda email dopo la chiusura dell'attività"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Ritardo"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -632,11 +667,6 @@ msgstr ""
 msgid "Medium"
 msgstr "Medio"
 
-#. module: project
-#: selection:project.vs.hours,state:0
-msgid "Template"
-msgstr "Modello"
-
 #. module: project
 #: view:project.task:0
 #: field:project.task,remaining_hours:0
@@ -666,12 +696,12 @@ msgstr "Tempo pianificato"
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Avvisa il manager per email"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Attività non assegnate ad utenti"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -700,7 +730,7 @@ msgstr "Informazioni Aggiuntive"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -740,7 +770,7 @@ msgstr "Assegnato a"
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "L'attività '%s' è aperta."
 
 #. module: project
 #: view:project.task:0
@@ -750,12 +780,12 @@ msgstr "Date"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Nuovo titolo dell'attività delegata all'utente"
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Il Progetto rispetto alle ore totali e pianificate"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -774,9 +804,10 @@ msgstr "Ore di Ritardo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Analisi attività"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -792,7 +823,7 @@ msgstr "Delega"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Template di progetti"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -812,7 +843,7 @@ msgstr "Progetto"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Valuta"
 
 #. module: project
 #: view:board.board:0
@@ -823,7 +854,7 @@ msgstr "La Mia Scheda"
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Si prega di specificare l'indirizzo email del Project Manager."
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -834,13 +865,13 @@ msgstr "Gestione Progetti"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento configurazione"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Delega attività progetto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -862,22 +893,22 @@ msgstr "Genitore"
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delega attività"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Immagine"
 
 #. module: project
 #: field:project.task,progress:0
@@ -893,6 +924,11 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Se l'attività è creata, lo stato è 'Boza'.\n"
+" Se l'attività è iniziata, lo stato diventa 'In corso'.\n"
+" Se è necessaria una revisione, l'attività è nello stato 'In sospeso'.       "
+"         \n"
+" Se l'attività è finita, lo stato è impostato su 'Completato'."
 
 #. module: project
 #: help:project.task,progress:0
@@ -928,7 +964,7 @@ msgstr "Ore Pianificate"
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr "Imposta come Modello"
+msgstr "Imposta come Template"
 
 #. module: project
 #: view:project.project:0
@@ -938,7 +974,7 @@ msgstr "Stato: %(state)s"
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Pianificazione a lungo termine"
 
 #. module: project
 #: view:project.project:0
@@ -959,7 +995,7 @@ msgstr "Avvisa Partner"
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Anno  "
 
 #. module: project
 #: view:project.project:0
@@ -974,13 +1010,13 @@ msgstr "Informazioni"
 #. module: project
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
-msgstr ""
+msgstr "Aiuta i contabili a gestire i budget analitici ed incrociati."
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorità"
 
 #. module: project
 #: view:project.project:0
@@ -990,17 +1026,17 @@ msgstr "Amministrazione"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Le mie attività"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Membro"
 
 #. module: project
 #: view:project.task:0
@@ -1008,9 +1044,9 @@ msgid "Project Tasks"
 msgstr "Attività del Progetto"
 
 #. module: project
-#: help:project.task.delegate,planned_hours:0
-msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Errore ! Non è possibile creare membri associati ricorsivi."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1029,15 +1065,10 @@ msgstr "Bozza"
 msgid "Low"
 msgstr "Basso"
 
-#. module: project
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Performance"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1065,7 +1096,7 @@ msgstr "In sospeso"
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "Modifica attività"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -1076,7 +1107,7 @@ msgstr "Fasi"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: project
 #: view:project.project:0
@@ -1090,11 +1121,13 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Nuovo stato della propria attività. L'attività in sospeso verrà aperta "
+"automaticamente quando l'attività delegata verrà chiusa"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1102,6 +1135,8 @@ msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
 msgstr ""
+"Implementa e tiene traccia dei concetti e dei tipi di attività definiti "
+"nella metodologia SCRUM."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1133,12 +1168,12 @@ msgstr "Definisce le richieste e imposta le ore pianificate"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri estesi..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
@@ -1149,7 +1184,7 @@ msgstr "Email del cliente"
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Il progetto '%s' è stato chiuso."
 
 #. module: project
 #: view:project.task:0
@@ -1159,7 +1194,7 @@ msgstr "Modifica Attività"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1169,17 +1204,21 @@ msgstr "Apri Attività"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "Email manager"
 
 #. module: project
-#: selection:report.project.task.user,month:0
-msgid "January"
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
 msgstr ""
+"Se il campo 'attivo' è deselezionato, sarà possibile nascondere il progetto "
+"senza rimuoverlo."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Aziende"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1190,7 +1229,7 @@ msgstr "Quando l'attività sarà completata, diverrà in stato completato."
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Il progetto '%s' è stato aperto."
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1200,7 +1239,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1231,10 +1270,9 @@ msgid "Reactivate Project"
 msgstr "Riattiva Progetto"
 
 #. module: project
-#: selection:project.task,priority:0
-#: selection:report.project.task.user,priority:0
-msgid "Urgent"
-msgstr "Urgente"
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr "_Delega"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1247,7 +1285,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Numero di giorni per aprire l'attività"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1257,7 +1295,7 @@ msgstr "Delegato a"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Storia"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1272,12 +1310,12 @@ msgstr "Attività Delegata"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Getting Things Done"
 
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "Avvisa cliente per email"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1289,6 +1327,14 @@ msgid ""
 "    * Members list of project\n"
 "    "
 msgstr ""
+"Il modulo di gestione progetti tiene traccia di progetti multi-livello, "
+"delle attività,\n"
+"del lavoro effettuato sulle attività... E' in grado di produrre "
+"pianificazioni, ordinare le attività...\n"
+" Le dashboard per i membri del progetto includono:\n"
+"    * Lista delle proprie attività aperte\n"
+"    * Lista membri del progetto\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -1313,6 +1359,14 @@ msgstr "Sequenza"
 msgid "State"
 msgstr "Stato"
 
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
@@ -1357,7 +1411,7 @@ msgstr "Annulla"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Chiuso"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1386,14 +1440,6 @@ msgstr "ID: %(task_id)s"
 msgid "In Progress"
 msgstr "In corso"
 
-#. module: project
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
@@ -1409,22 +1455,23 @@ msgstr "Riattiva"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Manda email"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Attività in corso"
 
 #. module: project
-#: field:project.task,user_id:0
-msgid "Responsible"
-msgstr ""
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "Nuova Descrizione dell'attività"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Cerca progetto"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1432,18 +1479,21 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"GTD è una metodologia per organizzare efficientemente le proprie attività. "
+"Questo modulo integra completamente i principi GTD con la gestione progetti "
+"di OpenERP."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Progetto rispetto alle ore"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "In corso"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1451,6 +1501,11 @@ msgstr ""
 msgid "Very Low"
 msgstr "Molto Bassa"
 
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "Pianificazione"
+
 #. module: project
 #: field:project.project,warn_manager:0
 #: field:project.task.close,manager_warn:0
@@ -1460,7 +1515,7 @@ msgstr "Avvisa Manager"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Scadenza superata"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1500,6 +1555,17 @@ msgstr ""
 msgid "Bill Time on Tasks"
 msgstr ""
 
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned on it. A project can be put into a hierarchy, as a child "
+"of a Parent Project. This allows you to  design large project structure with "
+"different phases spread over the project duration cycle. Each user can set "
+"his default project in his own preferences, in order to filter automatically "
+"the tasks or issues he usually works on."
+msgstr ""
+
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
@@ -1520,14 +1586,15 @@ msgid "Your Task Title"
 msgstr "Titolo della tua Attività"
 
 #. module: project
-#: view:project.project:0
-msgid "Scheduling"
-msgstr "Pianificazione"
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "Urgente"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1537,14 +1604,14 @@ msgstr "Attività di Convalida"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Attività totali"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Le mie attività delegate"
 
 #. module: project
 #: view:project.project:0
@@ -1572,6 +1639,11 @@ msgstr "Tempo impiegato"
 msgid "My accounts to invoice"
 msgstr "I Miei Conti da Fatturare"
 
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "Gennaio"
+
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
@@ -1614,14 +1686,14 @@ msgstr "Data fine"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days
 #: view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Attività per giorni"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1629,11 +1701,12 @@ msgstr ""
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
+"Impossibile inviare l'email! Controllare gli id email e le impostazioni smtp"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Avvisa cliente"
 
 #. module: project
 #: view:project.task:0
@@ -1649,7 +1722,7 @@ msgstr "Codifica le tue ore di lavoro."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1659,17 +1732,17 @@ msgstr ""
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "I miei progetti: Ore pianificate rispetto a totali"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "project.installer"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1680,7 +1753,7 @@ msgstr "Ore Spese"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Miscellanea"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1692,11 +1765,16 @@ msgstr "Apri Attività Completate"
 msgid "Project Time Unit"
 msgstr "Unità di tempo del progetto"
 
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr "Ore impiegate"
+
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "L'attività '%s' è in sospeso."
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1714,33 +1792,28 @@ msgstr "Stabilisce l'ordine in cui visualizzare una lista di progetti"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
-
-#. module: project
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Attività superate"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "Merge"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Ore rimanenti per progetto"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1773,27 +1846,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Tempo stimato per la convalida del lavoro effettuato dall'utente a cui è "
+"stata delegata questa attività"
 
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "L'attività '%s' è annullata."
 
 #. module: project
 #: view:project.task.close:0
 msgid "_Send"
-msgstr ""
+msgstr "_Invia"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1802,18 +1877,19 @@ msgstr "Cronologia Lavoro"
 
 #. module: project
 #: view:project.project:0
-msgid "Date Stop: %(date_stop)s"
-msgstr "Data di Fine: %(date_stop)s"
+msgid "Scheduling"
+msgstr "Pianificazione"
 
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "titolo"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
 msgstr ""
+"Sincronizza automaticamente le attività di un progetto con i casi del CRM."
 
 #. module: project
 #: view:project.project:0
@@ -1835,7 +1911,7 @@ msgstr "Mail Footer"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Budget"
 
 #~ msgid "Update"
 #~ msgstr "Aggiorna"
@@ -2031,6 +2107,9 @@ msgstr ""
 #~ msgid "Contact"
 #~ msgstr "Contatto"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Task type"
 #~ msgstr "Tipo di Attività"
 
@@ -2058,6 +2137,12 @@ msgstr ""
 #~ msgid "Task summary"
 #~ msgstr "Riassunto Attività"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Parent Task"
 #~ msgstr "Attività Superiore"
 
@@ -2073,9 +2158,15 @@ msgstr ""
 #~ msgid "Partner Info"
 #~ msgstr "Informazioni Partner"
 
+#~ msgid "Date Stop: %(date_stop)s"
+#~ msgstr "Data di Fine: %(date_stop)s"
+
 #~ msgid "Tasks Process"
 #~ msgstr "Flusso Attività"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
+
 #~ msgid "All Attachments"
 #~ msgstr "Tutti gli allegati"
 
@@ -2229,3 +2320,10 @@ msgstr ""
 #~ "lavoro fatto per una attività, eso. E' in grado di disegnare un Planning, "
 #~ "ordinare attività, eso.\n"
 #~ "    "
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the project "
+#~ "without removing it."
+#~ msgstr ""
+#~ "Se viene selezionato il campo attivo, sarà possibile nascondere il progetto "
+#~ "senza rimuoverlo."
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index c5c5ec70685..1f7bb53788f 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 16:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 18:44+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -30,22 +30,22 @@ msgstr ""
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Zadanie '%s' zostało przekazane dla %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Wprowadź godziny pozostałe do wykonania zadania."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Termin"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -57,7 +57,7 @@ msgstr "Niedozwolona operacja !"
 #: code:addons/project/wizard/project_task_delegate.py:0
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "SPRAWDŹ: "
 
 #. module: project
 #: field:project.installer,project_issue:0
@@ -99,17 +99,17 @@ msgstr ""
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Zadanie '%s' zamknięto"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Błąd ! data początkowa projektu musi być mniejsza od daty końcowej."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Przeliczenie zadania"
 
 #. module: project
 #: field:project.project,members:0
@@ -124,7 +124,7 @@ msgstr "Zadania wg przydzieleń"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 #. module: project
 #: view:project.task:0
@@ -142,6 +142,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Nagłówek dodany do wiadomości ostrzegającej wysyłanej do klienta przy "
+"zamknięciu zadania."
 
 #. module: project
 #: view:project.task:0
@@ -149,11 +151,9 @@ msgid "My Tasks"
 msgstr "Moje zadania"
 
 #. module: project
-#: code:addons/project/project.py:0
 #: constraint:project.task:0
-#, python-format
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -171,12 +171,12 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Projekty: Planowane w porówaniu z Sumami godzin"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Wiadomość ostrzegająca"
 
 #. module: project
 #: help:project.project,members:0
@@ -187,7 +187,7 @@ msgstr "Członek projektu. Nie stosowane w obliczeniach, tylko do informacji."
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nazwa etapu"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -203,7 +203,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Zmień etap"
 
 #. module: project
 #: view:project.project:0
@@ -213,7 +213,7 @@ msgstr "Nowy projekt na podstawie szablonu"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Błąd! Nie możesz wiązać przedziału do tego samego projektu!"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -224,25 +224,25 @@ msgstr "Bardzo pilne"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Użytkownik, któremu chcesz przydzielić zadanie"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dzień"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Zadanie '%s' wykonano"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Zamknięcie zadania"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -259,7 +259,7 @@ msgstr "Zadanie"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Członkowie"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -273,7 +273,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Praca w zadaniu"
 
 #. module: project
 #: view:project.project:0
@@ -285,22 +285,22 @@ msgstr "Uwagi"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Proejkt w porównaniu z pozostałymi godzinami"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adres faktury"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Podsumowanie zadania"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Nie szablon zadania"
 
 #. module: project
 #: view:project.task:0
@@ -318,7 +318,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Zadania nadrzędne"
 
 #. module: project
 #: view:project.project:0
@@ -345,7 +345,7 @@ msgstr "Moje otwarte zadania"
 #: view:project.project:0
 #: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr "Magłówke wiadomości"
+msgstr "Magłówek wiadomości"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -372,12 +372,12 @@ msgstr "Zadanie zostało wypełnione"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data końcowa"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Miesiąc   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -389,7 +389,7 @@ msgstr "Przydziela zadanie innemu użytkownikowi"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -402,6 +402,8 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Jeśli będzie zaznaczone, to użytkownik zobaczy okno przy zamykaniu zadania z "
+"propozycję wysłania wiadomości do klienta."
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -409,11 +411,15 @@ msgid "res.users"
 msgstr ""
 
 #. module: project
-#: help:project.project,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the project "
-"without removing it."
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "Testowanie"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Szacowany czas do zamknięcia tego zadania przez przydzielonego użytkownika."
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -438,9 +444,12 @@ msgid "Done by"
 msgstr "Wykonane przez"
 
 #. module: project
-#: view:project.task:0
-msgid "Planning"
-msgstr "Planowanie"
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define here the steps that will be used on the project from the creation of "
+"the task, up to the closing of the task or issue. You will use these stages "
+"in order to track the progress of the resolution of a task or an issue."
+msgstr ""
 
 #. module: project
 #: view:project.task:0
@@ -454,12 +463,7 @@ msgstr "Termin"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
-
-#. module: project
-#: view:project.task.delegate:0
-msgid "_Delegate"
-msgstr ""
+msgstr "_Anuluj"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -473,19 +477,24 @@ msgstr "Partner"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych."
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopia)"
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Responsible"
+msgstr "Odpowiedzialny"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
-msgstr ""
+msgstr "Rejestruje i wspomaga prowadzenie kart czasu pracy i obecności."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -496,17 +505,22 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Poprzednie"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Ponowanie oszacuj zadanie"
 
 #. module: project
-#: model:project.task.type,name:project.project_tt_testing
-msgid "Testing"
-msgstr ""
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr "Data zatrzymania: %(date)s"
+
+#. module: project
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie możesz mieć dwóch użytkowników z tym samym loginem !"
 
 #. module: project
 #: view:project.project:0
@@ -514,14 +528,14 @@ msgid "Reset as Project"
 msgstr "Przywróć jako projekt"
 
 #. module: project
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+#: selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "Szablon"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Specyfikacja"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -529,14 +543,14 @@ msgid "My projects"
 msgstr "Moje projekty"
 
 #. module: project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Następne"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -563,10 +577,17 @@ msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr "Procent zadań zamkniętych do sumy zadań do wykonania."
 
 #. module: project
-#: view:project.task.delegate:0
-#: field:project.task.delegate,new_task_description:0
-msgid "New Task Description"
-msgstr "Opis nowego zadania"
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to antoher user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be re-"
+"opened when you have to review the work achieved. If you install the "
+"project_timesheet module, tasks works can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -576,7 +597,7 @@ msgstr "Zadanie projektu"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodologie"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -602,7 +623,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Ponownie oszacuj"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -621,11 +642,6 @@ msgstr ""
 msgid "Medium"
 msgstr "Średni"
 
-#. module: project
-#: selection:project.vs.hours,state:0
-msgid "Template"
-msgstr "Szablon"
-
 #. module: project
 #: view:project.task:0
 #: field:project.task,remaining_hours:0
@@ -655,12 +671,12 @@ msgstr "Czas planowany"
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Ostrzeż menedżera wiadomością"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Zadania nie przydzielone użytkownikom"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -668,6 +684,7 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma planowanych godzin wszystkich zadań projektu i projektów podrzędnych."
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -687,7 +704,7 @@ msgstr "Dodatkowe informacje"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -716,18 +733,18 @@ msgstr "Projekty"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etap"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Przypisany do"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Zadanie '%s' jest otwarte."
 
 #. module: project
 #: view:project.task:0
@@ -761,9 +778,10 @@ msgstr "Opóźnienie"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Analiza zadań"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -779,7 +797,7 @@ msgstr "Przydziel"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Szablony projektów"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -799,7 +817,7 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Oszacuj"
 
 #. module: project
 #: view:board.board:0
@@ -810,7 +828,7 @@ msgstr "Moja konsola"
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Wprowadź adres email Menedżera projektu"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -821,7 +839,7 @@ msgstr "Projekty"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Postęp konfiguracji"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -844,7 +862,7 @@ msgstr "Zadania"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Nadrzędny"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -854,17 +872,17 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obraz"
 
 #. module: project
 #: field:project.task,progress:0
@@ -995,8 +1013,8 @@ msgid "Project Tasks"
 msgstr "Zadania projektu"
 
 #. module: project
-#: help:project.task.delegate,planned_hours:0
-msgid "Estimated time to close this task by the delegated user"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: project
@@ -1016,11 +1034,6 @@ msgstr "Projekt"
 msgid "Low"
 msgstr "Niski"
 
-#. module: project
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: project
 #: view:project.project:0
 msgid "Performance"
@@ -1159,8 +1172,10 @@ msgid "Manager Email"
 msgstr ""
 
 #. module: project
-#: selection:report.project.task.user,month:0
-msgid "January"
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
 msgstr ""
 
 #. module: project
@@ -1218,10 +1233,9 @@ msgid "Reactivate Project"
 msgstr "Reaktywuj projekt"
 
 #. module: project
-#: selection:project.task,priority:0
-#: selection:report.project.task.user,priority:0
-msgid "Urgent"
-msgstr "Pilne"
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
@@ -1298,6 +1312,14 @@ msgstr "Numeracja"
 msgid "State"
 msgstr "Stan"
 
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
@@ -1370,14 +1392,6 @@ msgstr ""
 msgid "In Progress"
 msgstr "W toku"
 
-#. module: project
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:0
 #, python-format
@@ -1401,9 +1415,10 @@ msgid "Current Activity"
 msgstr ""
 
 #. module: project
-#: field:project.task,user_id:0
-msgid "Responsible"
-msgstr ""
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "Opis nowego zadania"
 
 #. module: project
 #: view:project.project:0
@@ -1435,6 +1450,11 @@ msgstr ""
 msgid "Very Low"
 msgstr "Bardzo niski"
 
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "Planowanie"
+
 #. module: project
 #: field:project.project,warn_manager:0
 #: field:project.task.close,manager_warn:0
@@ -1482,6 +1502,17 @@ msgstr ""
 msgid "Bill Time on Tasks"
 msgstr ""
 
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned on it. A project can be put into a hierarchy, as a child "
+"of a Parent Project. This allows you to  design large project structure with "
+"different phases spread over the project duration cycle. Each user can set "
+"his default project in his own preferences, in order to filter automatically "
+"the tasks or issues he usually works on."
+msgstr ""
+
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
@@ -1502,9 +1533,10 @@ msgid "Your Task Title"
 msgstr "Tytuł twojego zadania"
 
 #. module: project
-#: view:project.project:0
-msgid "Scheduling"
-msgstr ""
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "Pilne"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1554,6 +1586,11 @@ msgstr "Spędzony czas"
 msgid "My accounts to invoice"
 msgstr "Moje konta do fakturowania"
 
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr ""
+
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
@@ -1672,6 +1709,11 @@ msgstr "Otwórz wykonane zadania"
 msgid "Project Time Unit"
 msgstr "Jednostka czasu w projekcie"
 
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
@@ -1706,11 +1748,6 @@ msgstr ""
 msgid "Overpassed Tasks"
 msgstr ""
 
-#. module: project
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
@@ -1782,8 +1819,8 @@ msgstr "Podsumowanie pracy"
 
 #. module: project
 #: view:project.project:0
-msgid "Date Stop: %(date_stop)s"
-msgstr "Data zakończenia: %(date_stop)s"
+msgid "Scheduling"
+msgstr ""
 
 #. module: project
 #: view:project.installer:0
@@ -1820,6 +1857,15 @@ msgstr ""
 #~ msgid "All Tasks"
 #~ msgstr "Wszystkie zadania"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
+
 #~ msgid "Close Task"
 #~ msgstr "Zamknij zadanie"
 
@@ -2028,6 +2074,9 @@ msgstr ""
 #~ msgid "Review"
 #~ msgstr "Rewiduj"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "My Running Projects"
 #~ msgstr "Moje projekty w toku"
 
@@ -2065,6 +2114,9 @@ msgstr ""
 #~ msgid "Send mail to customer"
 #~ msgstr "Wyślij wiadomość do klienta"
 
+#~ msgid "Date Stop: %(date_stop)s"
+#~ msgstr "Data zakończenia: %(date_stop)s"
+
 #~ msgid "My project's planning"
 #~ msgstr "Planowanie mojego projektu"
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 15c90caa6f4..a06397341bb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -109,12 +109,12 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
+                       <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager" default="1">
+                       <field name="user_id" string="Project Manager">
                             <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
                        </field>
                        <field name="partner_id" string="Partner"/>
@@ -379,7 +379,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index 566c7db1f5d..c8357a9de2c 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:42+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
@@ -30,7 +30,7 @@ msgstr ""
 #. module: project_caldav
 #: field:project.task,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Mier"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
@@ -73,16 +73,16 @@ msgstr "Público"
 msgid "Caldav URL"
 msgstr "URL de caldav"
 
-#. module: project_caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No puede mapear un campo más de una vez"
-
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "March"
 msgstr "Marzo"
 
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Friday"
@@ -179,11 +179,6 @@ msgstr "Participantes"
 msgid "Sun"
 msgstr "Dom"
 
-#. module: project_caldav
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: project_caldav
 #: selection:project.task,select1:0
 msgid "Day of month"
@@ -192,7 +187,7 @@ msgstr "Día del mes"
 #. module: project_caldav
 #: field:project.task,location:0
 msgid "Location"
-msgstr "Localización"
+msgstr "Ubicación"
 
 #. module: project_caldav
 #: view:project.task:0
@@ -204,11 +199,6 @@ msgstr "Enviar correo a"
 msgid "Weeks"
 msgstr "Semanas"
 
-#. module: project_caldav
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
-
 #. module: project_caldav
 #: field:project.task,select1:0
 msgid "Option"
@@ -244,11 +234,6 @@ msgstr "Julio"
 msgid "Thu"
 msgstr "Jue"
 
-#. module: project_caldav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
-
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Daily"
@@ -373,7 +358,7 @@ msgstr "Junio"
 #. module: project_caldav
 #: field:project.task,write_date:0
 msgid "Write Date"
-msgstr "Fecha escritura"
+msgstr "Fecha de escritura"
 
 #. module: project_caldav
 #: selection:project.task,month_list:0
@@ -425,24 +410,11 @@ msgstr "Frecuencia"
 msgid "of"
 msgstr "de"
 
-#. module: project_caldav
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Busy"
 msgstr "Ocupado"
 
-#. module: project_caldav
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: project_caldav
 #: view:project.task:0
 #: field:project.task,rrule_type:0
@@ -580,3 +552,24 @@ msgstr "Sábado"
 #: selection:project.task,byday:0
 msgid "Fifth"
 msgstr "Quinto"
+
+#~ msgid "Can not map a field more than once"
+#~ msgstr "No puede mapear un campo más de una vez"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/project_caldav/i18n/nl.po b/addons/project_caldav/i18n/nl.po
new file mode 100644
index 00000000000..52c1dc3b3cb
--- /dev/null
+++ b/addons/project_caldav/i18n/nl.po
@@ -0,0 +1,546 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Exclude range"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Minutes"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every x"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Seconds"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr ""
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Custom Recurrency Rule"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat max that times"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Edit All"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Count"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Custom"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/project_caldav/i18n/pl.po b/addons/project_caldav/i18n/pl.po
new file mode 100644
index 00000000000..5e2405ea2b9
--- /dev/null
+++ b/addons/project_caldav/i18n/pl.po
@@ -0,0 +1,550 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 18:37+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Ta właściwość definiuje listę wyjątków w datach/czasach dla powtarzalnych "
+"komponentów kalendarza."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Śro"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Miesięcznie"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Niedziela"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Czwarty"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Pokaż jako"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr "Szczegóły przypisanych"
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Dzień miesiąca"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Publiczne"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Marzec"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych zadań."
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Piątek"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Cały dzień"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Strefa czasowa"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Wolny"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Pon"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Zadanie"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Ostatnie"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Dni"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "Bez powtarzania"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Exclude range"
+msgstr "Wyłączony zakres"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Minutes"
+msgstr "Minuty"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Cor rok"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "Wto"
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Powtarzaj do"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every x"
+msgstr "Powtarzaj co x"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Organizator"
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "Sob"
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Uczestnicy"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "Nie"
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Dzień miesiąca"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Strefa"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr "Wiadomość DO"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Tygodnie"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Opcja"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Poufne"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Seconds"
+msgstr "Sekundy"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Godziny"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID rekurencji"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "Lipiec"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "Czw"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Codziennie"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Zaznacz jako"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Powtarzaj zdarzenie automatycznie co podany interwał"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Pierwsze"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Zadania"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "Wrzesień"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "Grudzień"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr "CalDAV do zarządzania zadaniami"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Custom Recurrency Rule"
+msgstr "Własna reguła rekurencji"
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat max that times"
+msgstr "Powtórz maksymalnie tyle razy"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Tygodniowo"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Edit All"
+msgstr "Edytuj wszystko"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "Pią"
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Miejsce zdarzenia"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Reguła rekurencyjna"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Przypomnienie"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr "Szczegóły przydzielonych"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "Sierpień"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "Poniedziałek"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Trzecie"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "Czerwiec"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "Listopad"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Count"
+msgstr "Liczba"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "Październik"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "Styczeń"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Miesiące"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "Środa"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr "Do"
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "Data ID powtarzalności"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Częstotliwość"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "z"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Zajęte"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Rekurencja"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "Czwartek"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Custom"
+msgstr "Własne"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Reguła wyjątku"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Inne"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Szczegóły"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Definiuje regułę lub wzór powtarzania w czasie, aby wyłączyć z reguły "
+"rekurencyjnej."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Lata"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "Maj"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr "Przydziel zadanie"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "Luty"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Interval"
+msgstr "Interwał"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Daty/Czasy wyjątków"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "Kwiecień"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Dzień tygodnia"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "w"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr "wg dni"
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Ustaw alarm na czas przed wystąpieniem zdarzenia"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr "Prywatne"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Sekunda"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr "Czas trwania"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr "Sobota"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr "Piąty"
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index ad92ac3a630..e62c911705c 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -6,828 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 10:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 11:27+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-go-year"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-rating-rated"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GO_FORWARD"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-go-back-ltr"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CDROM"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_UNDELETE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_EXECUTE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SAVE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIALOG_QUESTION"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-account"
-msgstr ""
-
-#. module: project_gtd
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#. module: project_gtd
-#: model:ir.model,name:project_gtd.model_project_timebox_empty
-msgid "Project Timebox Empty"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-folder-orange"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SORT_ASCENDING"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_REFRESH"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-accessories-archiver+"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_FORWARD"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_STOP"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_HOME"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_PASTE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
-msgid "This Week"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-dialog-close"
-msgstr ""
-
-#. module: project_gtd
-#: field:project.gtd.timebox,icon:0
-msgid "Icon"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock_format-default"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.timebox.fill.plan:0
-msgid "Add to Timebox"
-msgstr "Hinzufügen zu Aufgabenliste"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CONVERT"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.context,name:project_gtd.context_car
-msgid "Car"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-accessories-archiver-minus"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-emblem-important"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-calendar"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-partner"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ITALIC"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_RECORD"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_PLAY"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.timebox.fill.plan:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-folder-green"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.task:0
-msgid "Previous"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_YES"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GO_BACK"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_NEW"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CANCEL"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-go-home"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.task:0
-msgid "Next"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mail-forward"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-administration"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.timebox,name:project_gtd.timebox_lt
-msgid "Long Term"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
-
-#. module: project_gtd
-#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
-msgid "Getting Things Done - Time Management Module"
-msgstr "DInge zu erledigen - Zeit Management Modul"
-
-#. module: project_gtd
-#: help:project.gtd.context,sequence:0
-msgid "Gives the sequence order when displaying a list of contexts."
-msgstr ""
-
-#. module: project_gtd
-#: field:project.timebox.fill.plan,timebox_to_id:0
-msgid "Set to Timebox"
-msgstr "Setze auf Zeiterfassung"
-
-#. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
-#, python-format
-msgid "Error !"
-msgstr "Fehler!"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_FILE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock_format-scientific"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_QUIT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_EDIT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CONNECT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SAVE_AS"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GO_DOWN"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_NETWORK"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.timebox,name:project_gtd.timebox_daily
-msgid "Today"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_OK"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GOTO_TOP"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ABOUT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_COLOR_PICKER"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-hr"
-msgstr ""
-
-#. module: project_gtd
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SELECT_FONT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-purchase"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DELETE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock_effects-object-colorize"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DND"
-msgstr ""
-
-#. module: project_gtd
-#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
-#: view:project.timebox.fill.plan:0
-msgid "Plannify Timebox"
-msgstr "Plane Aufgabenliste"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-document-new"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-dolar_ok!"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_UNINDENT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-locked"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CLEAR"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.timebox.empty:0
-msgid "_Ok"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-project"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-personal+"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-personal-"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_HELP"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mail_delete"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GO_UP"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-go-month"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.gtd.timebox:0
-msgid "Timebox Definition"
-msgstr "Aufgabenliste Definition"
-
-#. module: project_gtd
-#: model:project.gtd.context,name:project_gtd.context_home
-msgid "Home"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ADD"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GOTO_LAST"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_FIND"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_PROPERTIES"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_UNDO"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gnome-cpu-frequency-applet+"
-msgstr ""
-
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "Zeitrahmen, in dem Aufgabe erledigt werden soll"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_FLOPPY"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIRECTORY"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.context,name:project_gtd.context_travel
-msgid "Travel"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-go-week"
-msgstr ""
-
-#. module: project_gtd
-#: field:project.timebox.fill.plan,task_ids:0
-msgid "Tasks selection"
-msgstr "Aufgabenauswahl"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-media-pause"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_JUSTIFY_CENTER"
-msgstr ""
-
-#. module: project_gtd
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_OPEN"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-jump-to-rtl"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_STOP"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-face-plain"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MISSING_IMAGE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_UNDERLINE"
-msgstr ""
-
-#. module: project_gtd
-#: help:project.task,context_id:0
-msgid "The context place where user has to treat task"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock_align_left_24"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DND_MULTIPLE"
-msgstr ""
-
-#. module: project_gtd
-#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
-#: view:project.timebox.empty:0
-msgid "Empty Timebox"
-msgstr "Leere Aufgabenliste"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-folder-blue"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_JUSTIFY_FILL"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_REMOVE"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_REVERT_TO_SAVED"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-idea"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.timebox.empty:0
-msgid "Timebox Empty Process Completed Successfully."
-msgstr ""
-
-#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
-#, python-format
-msgid "GTD"
-msgstr ""
-
-#. module: project_gtd
-#: view:project.gtd.timebox:0
-#: field:project.gtd.timebox,name:0
-#: view:project.task:0
-#: field:project.task,timebox_id:0
-msgid "Timebox"
-msgstr "Aufgabenliste"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_BOLD"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_APPLY"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ZOOM_OUT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-go-back-rtl"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-graph"
-msgstr ""
-
-#. module: project_gtd
-#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
-#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
-#: view:project.gtd.timebox:0
-msgid "Timeboxes"
-msgstr "Aufgabenlisten"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-dolar"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mail-replied"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-personal"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-crm"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_STRIKETHROUGH"
-msgstr ""
-
-#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
-#, python-format
-msgid "Getting Things Done"
-msgstr "To Do Liste (GTD)"
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_REWIND"
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.context,name:project_gtd.context_office
-msgid "Office"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mail-"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SELECT_COLOR"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_PRINT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_NO"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mrp"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-product"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-go-today"
-msgstr ""
-
-#. module: project_gtd
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "project.gtd.timebox"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CLOSE"
-msgstr ""
+msgstr "Wiederherstellen"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr ""
+msgstr "Anzeige der Reihenfolge bei Ausgabe und Anzeige der Zeitfenster"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-mail-message-new"
-msgstr ""
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Reise"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-call-start"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-check"
-msgstr ""
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "Bereinigung des Zeitfensters war erfolgreich"
 
 #. module: project_gtd
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:0
@@ -836,84 +53,111 @@ msgid "No timebox child of this one !"
 msgstr "Kein Zeitrahmen"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-camera_test"
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. It defines "
+"a period of time in order to categorize your tasks: today, this week, this "
+"month, long term."
+msgstr ""
+"Bei der  \"Getting Things Done\" Methodik werden Zeitfenster definiert. "
+"Repräsentiert wird hierdurch eine definierte Zeitvorgabe, in die Sie Ihre "
+"Aufgaben zu Organisationszwecken einsortieren können."
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "GTD"
+msgstr "Zeitfenster"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Später"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Leeres Zeitfenster"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Heute"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+#: field:project.gtd.timebox,name:0
+#: view:project.task:0
+#: field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Zeitfenster"
+
+#. module: project_gtd
+#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
+msgid "Getting Things Done - Time Management Module"
+msgstr "Getting Things Done - Zeitmanagement"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Zuweisen zu Zeitfenster"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fehler!"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_CUT"
-msgstr ""
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "Abbrechen"
 
 #. module: project_gtd
-#: model:ir.model,name:project_gtd.model_project_task
-msgid "Task"
-msgstr ""
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Leeres Zeitfenster"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-report"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-folder-yellow"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stock_symbol-selection"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-jump-to-ltr"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_INDENT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr ""
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Diese Woche"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_monthly
 msgid "This Month"
-msgstr ""
+msgstr "Dieser Monat"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_JUMP_TO"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_HARDDISK"
-msgstr ""
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Icon"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "Zeitfenster ausfüllen"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Aufgabe"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Hinzufügen zu Zeitfenster"
 
 #. module: project_gtd
 #: field:project.timebox.empty,name:0
 msgid "Name"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-tools"
-msgstr ""
+msgstr "Bezeichnung"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -922,14 +166,22 @@ msgid "Contexts"
 msgstr "Kontext"
 
 #. module: project_gtd
-#: model:ir.model,name:project_gtd.model_project_gtd_timebox
-msgid "project.gtd.timebox"
-msgstr "project.gtd.timebox"
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Bei Anreise"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr ""
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Plane Zeitfenster"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Zeitfenster"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -940,24 +192,25 @@ msgid "Context"
 msgstr "Kontext"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-sale"
-msgstr ""
+#: view:project.task:0
+msgid "Next"
+msgstr "Nächste"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_JUSTIFY_RIGHT"
-msgstr ""
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "OK"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_DIALOG_ERROR"
-msgstr ""
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-select-all"
-msgstr ""
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Im Büro"
 
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
@@ -966,69 +219,68 @@ msgid "Sequence"
 msgstr "Sequenzer"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_INDEX"
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at office, at home, when I take my car, etc."
 msgstr ""
+"Kontexte werden im Rahmen der  \"Getting Things Done\" Methode verwendet. "
+"Hierdurch können Sie Ihre Aufgaben nach den Orten klassifizieren, an denen "
+"die jeweilige Aufgabe erledigt werden soll, z.B. Zu Hause, Im Büro oder "
+"Während Anreise."
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gtk-stop"
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
 msgstr ""
+"Anzeige der Reihenfolge bei Ausgabe der Liste mit den definierten Kontexten"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-stage"
-msgstr ""
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Zeitfenster Definition"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_GOTO_BOTTOM"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_NEXT"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-accessories-archiver"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_REDO"
-msgstr ""
-
-#. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_COPY"
-msgstr ""
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Aufgabenauswahl"
 
 #. module: project_gtd
 #: code:addons/project_gtd/project_gtd.py:0
 #, python-format
 msgid "Inbox"
-msgstr ""
+msgstr "Eingang"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
 msgid "Get from Timebox"
-msgstr "Erhalte aus Zeiterfassung"
+msgstr "Empfange aus Zeitfenster"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "STOCK_MEDIA_PAUSE"
-msgstr ""
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "Der Kontext für den Ort, an dem die Aufgabe durchgeführt wird"
 
 #. module: project_gtd
-#: selection:project.gtd.timebox,icon:0
-msgid "terp-gdu-smart-failing"
-msgstr ""
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Zu Hause"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Vorherige"
 
 #~ msgid "Visible Columns"
 #~ msgstr "Sichtbare Spalten"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "My Deadlines"
 #~ msgstr "Meine Deadlines"
 
@@ -1038,6 +290,9 @@ msgstr ""
 #~ msgid "Parent Timebox"
 #~ msgstr "(Ober-) Aufgabenliste"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Priority"
 #~ msgstr "Priorität"
 
@@ -1136,3 +391,6 @@ msgstr ""
 
 #~ msgid "Child Timeboxes"
 #~ msgstr "abhängige Zeitrahmen"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index a4dcf29cae5..be235ff37d1 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-05 00:14+0000\n"
+"PO-Revision-Date: 2010-12-08 21:24+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -116,7 +116,7 @@ msgstr "¡Error!"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "¡Error! No puede crear tareas recursivas."
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 5f293d4e681..a452972fdd2 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:23+0000\n"
+"PO-Revision-Date: 2010-12-08 18:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -64,7 +64,7 @@ msgstr "Progreso (%)"
 #: view:project.issue.report:0
 #: field:project.issue.report,company_id:0
 msgid "Company"
-msgstr "Empresa"
+msgstr "Compañía"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e3493f5af9b..0687c4fe26a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -210,7 +210,7 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and To Do" icon="terp-check" default="1"/>
+                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and To Do" icon="terp-check"/>
                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 5a8c4886d2f..c4bee877127 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -79,7 +79,6 @@
                            <separator orientation="vertical" />
                            <field name="section_id"
                                string="Sale Team    "
-                               default="context.get('section_id', False)"
                                widget="selection"
                                context="{'invisible_section': False}">
 
diff --git a/addons/project_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
new file mode 100644
index 00000000000..2522c4f7f37
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/pt.po
@@ -0,0 +1,68 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:57+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Conta analítica"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Data de criação"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 7bffac3ad2f..09e7c0d2143 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-12-01 09:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-02 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr "Management v. Langzeit Projekten"
+msgstr "Management von Langzeit Projekten"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -50,16 +50,9 @@ msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: project_long_term
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehlerhafter Modellname in der Aktion."
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource
-#: view:project.resource.allocation:0
-msgid "Resources"
-msgstr "Ressourcen"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -72,11 +65,21 @@ msgstr "Ressourcenaufteilung"
 msgid "Schedule"
 msgstr "Zeitplanung"
 
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Zuweisung Ressourcen"
 
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
+
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
@@ -157,7 +160,7 @@ msgstr "Frist"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr "_Abbrechen"
+msgstr "Abbrechen"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
@@ -177,16 +180,6 @@ msgstr " (Kopie)"
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Dates"
-msgstr "Daten"
-
-#. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
@@ -204,11 +197,6 @@ msgstr "Berechne"
 msgid "Compute Scheduling of phases for all or specified project"
 msgstr "Berechne Terminierung aller Phasen für das spezifizierte Projekt"
 
-#. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
@@ -237,6 +225,13 @@ msgstr "Zuweisung Projekt Ressource"
 msgid "Compute Scheduling of Task"
 msgstr "Berechne Aufgabenterminierung"
 
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Ressourcen"
+
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
 msgid ""
@@ -259,9 +254,9 @@ msgid "Related Tasks"
 msgstr "Verknüpfte Aufgaben"
 
 #. module: project_long_term
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Daten"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
@@ -288,7 +283,7 @@ msgstr "Projekt Ressourcen"
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "_Ok"
-msgstr "_OK"
+msgstr "OK"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -319,7 +314,7 @@ msgstr "Zuweisung Ressourcen"
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr "erzwinge Ende d. Periode vor"
+msgstr "erzwinge Ende der Periode vor"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -327,11 +322,6 @@ msgstr "erzwinge Ende d. Periode vor"
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: project_long_term
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
 msgid ""
@@ -438,25 +428,12 @@ msgstr "Erledigt"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: project_long_term
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#. module: project_long_term
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
-"!"
-
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
@@ -486,13 +463,14 @@ msgstr "Aktuell"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr "Start d. Phase"
+msgstr "Start der Phase"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:0
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr "Bitte spezif. Projekt für Terminierung"
+msgstr ""
+"Bitte spezifizieren Sie ein Projekt für die automatische Terminierung"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -531,9 +509,9 @@ msgid ""
 msgstr ""
 "Durch Erstellung einer Phase ist diese zunächst im Status 'Entwurf'.\n"
 " Durch Start der Phase wechselt der Status zu 'In Bearbeitung'.\n"
-" Falls eine Überarbeitung oder Prüdfung erforderlich ist, kann in den "
-"'Unbearbeitet' Status gewechselt werden.\n"
-"n Wenn die Phase beendet ist, wird der Status auf'Erledigt' geändert."
+" Falls eine Überarbeitung oder Prüfung erforderlich ist, kann in den Status "
+"'Im Wartezustand' gewechselt werden.\n"
+"Wenn die Phase beendet ist, wird der Status auf 'Erledigt' geändert."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
@@ -629,3 +607,27 @@ msgstr "Gem. Standard in Tagen"
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Dauer"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehlerhafter Modellname in der Aktion."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
+#~ "!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8c7595f24bc..39d9d1cfa8b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -257,7 +257,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-	                    <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check" default="1"/>
+	                    <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index df51f5a9380..6c86be707af 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/i18n/es.po
@@ -7,60 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:24+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_mailgate
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
-
 #. module: project_mailgate
 #: view:project.task:0
 msgid "History Information"
-msgstr "Historial de la información"
-
-#. module: project_mailgate
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
+msgstr "Información histórica"
 
 #. module: project_mailgate
 #: model:ir.model,name:project_mailgate.model_project_task
 msgid "Task"
 msgstr "Tarea"
 
-#. module: project_mailgate
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: project_mailgate
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
 #. module: project_mailgate
 #: model:ir.module.module,description:project_mailgate.module_meta_information
 msgid ""
@@ -81,9 +48,19 @@ msgstr ""
 "    "
 
 #. module: project_mailgate
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "Ruta de enlace del proyecto"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
 
 #. module: project_mailgate
 #: code:addons/project_mailgate/project_mailgate.py:0
@@ -124,3 +101,21 @@ msgstr "Pendiente"
 #: view:project.task:0
 msgid "History"
 msgstr "Historial"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
diff --git a/addons/project_messages/i18n/es.po b/addons/project_messages/i18n/es.po
index 3cfff46535d..d42744e53ec 100644
--- a/addons/project_messages/i18n/es.po
+++ b/addons/project_messages/i18n/es.po
@@ -7,54 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-29 07:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:24+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_messages
-#: field:project.messages,from_id:0
-msgid "From"
-msgstr "De"
-
-#. module: project_messages
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Error! No puede crear un menú recursivo."
-
 #. module: project_messages
 #: field:project.messages,to_id:0
 msgid "To"
 msgstr "Para"
 
 #. module: project_messages
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción"
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
 
 #. module: project_messages
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: project_messages
-#: view:project.messages:0
-msgid "Today"
-msgstr "Hoy"
-
-#. module: project_messages
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El Id del certificado debe ser único!"
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "De"
 
 #. module: project_messages
 #: help:project.messages,to_id:0
@@ -64,22 +41,18 @@ msgstr "Mantenga este vacío para transmitir el mensaje."
 #. module: project_messages
 #: field:project.messages,create_date:0
 msgid "Creation Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 #. module: project_messages
-#: model:ir.model,name:project_messages.model_project_messages
-msgid "project.messages"
-msgstr "project.messages"
-
-#. module: project_messages
-#: model:ir.module.module,shortdesc:project_messages.module_meta_information
-msgid "In-Project Messaging System"
-msgstr "Sistema de mensajes en proyectos"
-
-#. module: project_messages
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la definición de la vista!"
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messagery system permits an efficient and trackable "
+"communication between project members. The messages are kept in the system "
+"and can then be used for post-analysis."
+msgstr ""
+"Un sistema de mensajes en proyectos permite una comunicación eficiente y "
+"trazable entre los miembros del proyecto. Los mensajes se conservan en el "
+"sistema y se pueden utilizar para análisis posteriores."
 
 #. module: project_messages
 #: model:ir.actions.act_window,name:project_messages.act_project_messages
@@ -97,38 +70,25 @@ msgstr "Mensajes"
 msgid "Project"
 msgstr "Proyecto"
 
-#. module: project_messages
-#: view:project.messages:0
-msgid "Message To"
-msgstr "Mensaje a"
-
-#. module: project_messages
-#: model:ir.actions.act_window,help:project_messages.messages_form
-msgid ""
-"An in-project messagery system permits an efficient and trackable "
-"communication between project members. The messages are kept in the system "
-"and can then be used for post-analysis."
-msgstr ""
-"Un sistema de mensajes en proyectos permite una comunicación eficiente y "
-"trazable entre los miembros del proyecto. Los mensajes se conservan en el "
-"sistema y se pueden utilizar para análisis posteriores."
-
-#. module: project_messages
-#: model:ir.actions.act_window,name:project_messages.messages_form
-#: model:ir.ui.menu,name:project_messages.menu_messages_form
-#: view:project.messages:0
-msgid "Project Messages"
-msgstr "Mensajes de proyectos"
-
 #. module: project_messages
 #: view:project.messages:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: project_messages
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: view:project.messages:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Mensaje a"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_messages
 #: view:project.messages:0
@@ -143,6 +103,44 @@ msgid "Message From"
 msgstr "Mensajes de"
 
 #. module: project_messages
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Mensajes de proyectos"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Sistema de mensajes en proyectos"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El Id del certificado debe ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Error! No puede crear un menú recursivo."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la definición de la vista!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/project_messages/i18n/pt.po b/addons/project_messages/i18n/pt.po
new file mode 100644
index 00000000000..3319bbd744f
--- /dev/null
+++ b/addons/project_messages/i18n/pt.po
@@ -0,0 +1,116 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:42+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Para"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "De"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Data de criação"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messagery system permits an efficient and trackable "
+"communication between project members. The messages are kept in the system "
+"and can then be used for post-analysis."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Hoje"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Mensagem para"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Mensagem"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Mensagem de"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr ""
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr ""
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index 0e9525f9e58..9ac70304b1c 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -6,31 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: project_mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
 msgstr "Para cada producto, sobre tipo servicio y sobre orden"
 
 #. module: project_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Tarea abastecimiento"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_project_task
@@ -40,23 +35,20 @@ msgstr "¡XML no válido para la estructura de la vista!"
 msgid "Task"
 msgstr "Tarea"
 
-#. module: project_mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
 msgstr "Tipo de producto es servicio, luego se crea la tarea."
 
 #. module: project_mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "si tipo de producto es 'servicio' entonces se crea la tarea."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No puede crear tareas recursivas."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
@@ -64,9 +56,9 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: project_mrp
-#: model:process.transition,name:project_mrp.process_transition_procuretask0
-msgid "Procurement Task"
-msgstr "Tarea abastecimiento"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -116,16 +108,6 @@ msgstr "Integración de abastecimientos y gestión de proyectos"
 msgid "In case you sell services on sale order"
 msgstr "En caso que venda servicios sobre pedido de venta"
 
-#. module: project_mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
-#. module: project_mrp
-#: model:process.transition,note:project_mrp.process_transition_procuretask0
-msgid "if product type is 'service' then it creates the task."
-msgstr "si tipo de producto es 'servicio' entonces se crea la tarea."
-
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "si método de abastecimiento es Fabricar bajo pedido y método de suministro "
@@ -136,3 +118,21 @@ msgstr "si tipo de producto es 'servicio' entonces se crea la tarea."
 
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Gestión de proyectos - Integración con MRP y ventas"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
index e331d0c9d28..058507037d4 100644
--- a/addons/project_planning/i18n/es.po
+++ b/addons/project_planning/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-05 00:24+0000\n"
+"PO-Revision-Date: 2010-12-08 21:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
@@ -39,7 +39,7 @@ msgstr "Estadísticas de planificación"
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning.line:0
 msgid "Planning Line"
-msgstr ""
+msgstr "Línea de planificación"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
@@ -54,7 +54,7 @@ msgstr "Nombre planificación"
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "¡Error! No puede crear tareas recursivas."
 
 #. module: project_planning
 #: view:board.board:0
@@ -193,7 +193,7 @@ msgstr "Desde"
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Error! Usted no puede crear empresas recursiva."
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
@@ -279,7 +279,7 @@ msgstr "Delegar"
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "Análisis planificación"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
diff --git a/addons/project_planning/i18n/pl.po b/addons/project_planning/i18n/pl.po
index 664aa4bb516..bf694f495c9 100644
--- a/addons/project_planning/i18n/pl.po
+++ b/addons/project_planning/i18n/pl.po
@@ -1,43 +1,472 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_planning
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 11:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 18:36+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "To:"
-msgstr "Do:"
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
 
 #. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Statystyki planowania"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Pozycja planowania"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Nazwa planowania"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Karta czasu pracy"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Moduł planowania projektów"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Konto"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Zadanie"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Notatki"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Planowania"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Rozpocznij zadanie"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Suma zaplanowana (w dniach)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Niedozwolone planowanie ! Daty planowania nie mogę na siebie zachodzić dla "
+"tego samego odpowiedzialnego. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Planowanie wg kont"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without"
+msgstr "Czas bez"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Bieżące planowania"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Przywróć do projektu"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Dodatkowe informacje"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Suma planowana"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Alokacja czasu bez zadań"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Konto analityczne"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Różne"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "To ustali jednostkę miary stosowaną w planowaniu."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planowanie kadrowe"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Pozostałe zadania"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Planowanie"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planowanie wg kont"
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Podsumowanie wg projektów"
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Przydziel"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Analiza planowania"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Planowanie wg użytkowników"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Zadania"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Planowanie w kont (w dniach)"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Data Początkowa"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total Planned Tasks"
+msgstr "Suma planowanych zadań"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Suma wolnych"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "tasks"
+msgstr "zadania"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Il. JM"
 
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Notatka"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Projekt"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Pozycje planowania"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Oczekujące"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Planowane dni"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Stan"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Suma pozostałych zadań"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Ilość w bazowej JM"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Pozycje planowania"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Wykonano"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Planowanie wg użytkowników (w dniach)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Statystyka planowania"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Otwarte"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Planowanie wg użytkowników"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Informacja"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Dni pracy"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Reaktywuj"
+
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
+#: report:report_account_analytic.planning.print:0
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
@@ -47,112 +476,42 @@ msgid "Planning stat"
 msgstr "Stat. planowania"
 
 #. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Stan"
+#: report:report_account_analytic.planning.print:0
+msgid "To"
+msgstr "Do"
 
 #. module: project_planning
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Konto analityczne"
-
-#. module: project_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: project_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
 msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statystyki planowania"
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Podsumowanie wg użytkowników"
 
 #. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
-msgid "Planning account stat"
-msgstr "Stat. planowania konta"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned hours"
-msgstr "Planowane godziny"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Real"
-msgstr "Rzeczywiste"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
-msgid "My Planning Statistics"
-msgstr "Moje statystyki planowania"
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid "Planning on analytic accounts."
-msgstr "Planowanie wg kont analitycznych"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nazwa planowania"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Quantities"
-msgstr "Ilości"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planowanie kadrowe"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
-msgid "Timesheet"
-msgstr "Karta czasu pracy"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning:0
-msgid "Planning Line"
-msgstr "Pozycja planowania"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Responsible:"
-msgstr "Odpowiedzialna(y):"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Ilość"
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its commun system for scheduling all resources of a company (people and "
+"materials), OpenERP allows you to encode then compute automatically tasks "
+"and phases scheduling, track resources allocation and availibility."
+msgstr ""
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
-msgid "Quantities by Account"
-msgstr "Ilości wg kont"
+msgid "Total Time Allocation without Tasks"
+msgstr ""
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "From:"
-msgstr "Od:"
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Nieobecności"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
-msgid "Time by Account"
-msgstr "Czas wg kont"
+msgid "Total Time Allocation of Tasks"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
@@ -160,139 +519,24 @@ msgid "End Date"
 msgstr "Data końcowa"
 
 #. module: project_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Pozostałe zadania"
 
 #. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by User"
-msgstr "Czas wg użytkownika"
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Podsumowanie wg projektów"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
-msgid "Planning Statistics of My Projects"
-msgstr "Statystyki planowania dla moich projektów"
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Jednostka czas dla planowania"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
-msgid "Current Planning"
-msgstr "Bieżące planowanie"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Podsumowanie na użytkownika"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Analysis"
-msgstr "Analiza"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.stat.user,user_id:0
-msgid "User"
-msgstr "Użytkownik"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Timesheet"
-msgstr "Suma karty czasu pracy"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Details of user's time by projects"
-msgstr "Szczegóły czasu użytkownika wg projektów"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
-msgid "Planning user stat"
-msgstr "Stat. planowania użytkownika"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat.account,quantity:0
-#: field:report_account_analytic.planning.stat.user,quantity:0
-msgid "Planned"
-msgstr "Planowane"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analiza planowania"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Pozycje planowania"
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Analytic planning - Reporting"
-msgstr "Planowanie analityczne - Raportowanie"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
-msgid "My Planning"
-msgstr "Moje planowania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_user_ids:0
-msgid "Planning by user"
-msgstr "Planowanie wg użytkownika"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Uwaga"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Zadania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_account_ids:0
-msgid "Planning by account"
-msgstr "Planowanie wg kont"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by User"
-msgstr "Ilości wg użytkowników"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
-msgid "My Current Planning"
-msgstr "Moje bieżące planowania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat.account,account_id:0
-msgid "Analytic Account"
-msgstr "Konto analityczne"
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Planowane zadania"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
@@ -300,47 +544,8 @@ msgid "Manager"
 msgstr "Menedżer"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: model:ir.ui.menu,name:project_planning.planning_main
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.stat.account,planning_id:0
-#: field:report_account_analytic.planning.stat.user,planning_id:0
-msgid "Planning"
-msgstr "Planowanie"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Planned"
-msgstr "Suma planowana"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data początkowa"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statystyka planowania"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Otwarte"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
-msgid "New Planning"
-msgstr "Nowe planowanie"
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
diff --git a/addons/project_planning/i18n/pt.po b/addons/project_planning/i18n/pt.po
index 5775c525c09..85cfdbf0bb2 100644
--- a/addons/project_planning/i18n/pt.po
+++ b/addons/project_planning/i18n/pt.po
@@ -1,50 +1,362 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_planning
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:36+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 17:16+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "To:"
-msgstr "Para:"
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr ""
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planeamento por contas"
+msgid "Total Unallocated Time"
+msgstr ""
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Sumário por projectos"
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr ""
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Erro! Não se pode criar tarefas recursivamente"
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Conta"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Tarefa"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Projeto"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Iniciar tarefa"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr ""
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Voltar a rascunho"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr ""
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erro! Não pode criar contas analíticas recursivamente"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From"
+msgstr ""
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivamente."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Conta analítica"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Diversos"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planeamento dos RH"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Tarefas restantes"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Planeamento"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr ""
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Delegar"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr ""
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Planeamento por utilizador"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Tarefas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Data de início"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total Planned Tasks"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr ""
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "tasks"
+msgstr "tarefas"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr "Quantidade de UdM"
+msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsável"
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr ""
 
 #. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Stado do planeamento"
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
@@ -52,86 +364,39 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: project_planning
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Conta da contabilidade analítica"
-
-#. module: project_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.model:0
+#: help:report_account_analytic.planning.user,holiday:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estatísticas do planeamento"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
-msgid "Planning account stat"
-msgstr "Estado do planeamento da conta"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Real"
-msgstr "Real"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
-msgid "My Planning Statistics"
-msgstr "Minhas estatísticas do planeamento"
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid "Planning on analytic accounts."
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
 msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nome do planeamento"
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Utilizador"
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Quantities"
-msgstr "Quantidades"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planeamento dos RH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
-msgid "Timesheet"
-msgstr "Horário"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
-msgid "Planning Line"
-msgstr "Linha de planeamento"
+msgid "Total Remaining Tasks"
+msgstr ""
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Responsible:"
-msgstr "Responsável:"
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -139,207 +404,146 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by Account"
-msgstr "Quantidades por conta"
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Código"
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "From:"
-msgstr "De:"
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr ""
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
-msgid "Time by Account"
-msgstr "Tempo por contas"
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Planeamento por utilizador"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Informação"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Dias úteis"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Reativar"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To"
+msgstr "Para"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Resumo por utilizador"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its commun system for scheduling all resources of a company (people and "
+"materials), OpenERP allows you to encode then compute automatically tasks "
+"and phases scheduling, track resources allocation and availibility."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr "Data de Finalização"
-
-#. module: project_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by User"
-msgstr "Tempo por utilizador"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
-msgid "Planning Statistics of My Projects"
-msgstr "Estatísticas do planeamento de meus projectos"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
-msgid "Current Planning"
 msgstr ""
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Sumário por utilizador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Analysis"
-msgstr "Análise"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.stat.user,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Timesheet"
-msgstr "Horário total"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Details of user's time by projects"
-msgstr "Detalhes do tempo dos utilizadores por projecto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
-msgid "Planning user stat"
-msgstr "Estado do planeamento do utilizador"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat.account,quantity:0
-#: field:report_account_analytic.planning.stat.user,quantity:0
-msgid "Planned"
-msgstr "Planeado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análise de planeamento"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linhas de planeamento"
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Analytic planning - Reporting"
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
 msgstr ""
 
 #. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Resumo por projeto"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
-msgid "My Planning"
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
 msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,stat_user_ids:0
-msgid "Planning by user"
-msgstr "Planeamento por utilizador"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_account_ids:0
-msgid "Planning by account"
-msgstr "Planeamento por conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by User"
-msgstr "Quantidades por utilizador"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
-msgid "My Current Planning"
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
 msgstr ""
 
-#. module: project_planning
-#: field:report_account_analytic.planning.stat.account,account_id:0
-msgid "Analytic Account"
-msgstr "Conta da contabilidade analítica"
-
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Gestor"
 
 #. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: model:ir.ui.menu,name:project_planning.planning_main
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.stat.account,planning_id:0
-#: field:report_account_analytic.planning.stat.user,planning_id:0
-msgid "Planning"
-msgstr "Planeamento"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Planned"
-msgstr "Total planeado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data de Início"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estatísticas do planeamento"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
-msgid "New Planning"
-msgstr "Novo planeamento"
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index 9cb6ef05c2b..ed8cbb37737 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:22+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
@@ -28,19 +28,25 @@ msgid "Project Retro planning"
 msgstr "Retroplanificación para proyectos"
 
 #. module: project_retro_planning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: project_retro_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
 
 #. module: project_retro_planning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/project_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
index 6ecd23c1151..71b4639b0ce 100644
--- a/addons/project_retro_planning/i18n/pt.po
+++ b/addons/project_retro_planning/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-26 23:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:28+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
@@ -27,19 +27,23 @@ msgid "Project Retro planning"
 msgstr "Projecto Retro Planeamento"
 
 #. module: project_retro_planning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
 
 #. module: project_retro_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-"especial !"
 
-#. module: project_retro_planning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial !"
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
new file mode 100644
index 00000000000..9438e9a8b3a
--- /dev/null
+++ b/addons/project_scrum/i18n/el.po
@@ -0,0 +1,1064 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 20:46+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_scrum
+#: help:project.scrum.email,scrum_master_email:0
+msgid "Email Id of Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "_Assign"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,name:0
+msgid "Meeting Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,note:project_scrum.process_transition_backlogtask0
+msgid "From backlog create task."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,user_id:0
+msgid "Author"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "What did you do since the last meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Group By..."
+msgstr "Ομαδοποίηση ανά..."
+
+#. module: project_scrum
+#: model:process.node,note:project_scrum.process_node_productbacklog0
+msgid "Create task from backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.module.module,shortdesc:project_scrum.module_meta_information
+msgid "Scrum, Agile Development Method"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,progress:0
+msgid "Progress"
+msgstr "Πρόοδος"
+
+#. module: project_scrum
+#: field:project.scrum.meeting,user_id:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,scrum_master_id:0
+msgid "Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "The sprint '%s' has been opened."
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Are your Sprint Backlog estimate accurate ?"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Send Email"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj
+msgid "View project's backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
+msgid "Merge Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
+#: view:project.scrum.backlog.merge:0
+msgid "Merge Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid "Scrum Meeting : %s"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.task:0
+msgid "Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_email
+msgid "project.scrum.email"
+msgstr ""
+
+#. module: project_scrum
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,name:0
+msgid "Sprint Name"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Spent hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a daily meeting is organized by the scrum master with his "
+"team in order to detect the difficulties the team faced/will face."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Please provide email address for product owner defined on sprint."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Scrum Meeting of %s"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
+#: view:project.scrum.product.backlog:0
+#: field:project.task,product_backlog_id:0
+#, python-format
+msgid "Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_project
+#: field:project.scrum.backlog.merge,project_id:0
+#: field:project.scrum.meeting,project_id:0
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,project_id:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Start Task"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "*Blocks encountered:"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Change Stage"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Sprint Info"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_stop:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Links"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid "Task for Today"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Open Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Total Spent Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid "Blocking points encountered:"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Planning"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.assign.sprint:0
+#: view:project.scrum.backlog.create.task:0
+#: view:project.scrum.email:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,scrum_master_id:0
+msgid "The person who is maintains the processes for the product"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,expected_hours:0
+#: field:project.scrum.sprint,expected_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.email,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
+#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Sprints"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the product owner %s"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Convert To Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Are you sure you want to merge these Backlogs?"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.create.task,user_id:0
+msgid "Responsible user who can work on task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,state:0
+msgid "State"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
+msgid "View sprint Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,meeting_ids:0
+msgid "Daily Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "for the Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.create.task:0
+msgid "C_onvert"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
+#: view:project.scrum.product.backlog:0
+msgid "Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Are there anything blocking you?"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_scrum
+msgid "Scrum"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Hello "
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_today:0
+msgid "Tasks for today"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: field:project.scrum.meeting,question_yesterday:0
+#, python-format
+msgid "Tasks since yesterday"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
+msgid "Assign sprint to backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,expected_hours:0
+msgid "Estimated time to do the task."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,task_hours:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Dates"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Send to Scrum Master"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
+msgid "View project's tasks"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid ""
+"Hello  , \n"
+"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+msgid "Daily"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,backlog_ids:0
+msgid "Sprint Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Postpone Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
+#: view:project.task:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,date:0
+msgid "Meeting Date"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
+#: view:project.scrum.meeting:0
+#: field:project.scrum.meeting,task_ids:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.email,product_owner_email:0
+msgid "Product Owner Email"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "_Send"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,sprint_id:0
+msgid "Select Sprint to assign backlog."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,progress:0
+#: help:project.scrum.sprint,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Month"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_blocks:0
+msgid "Blocks encountered"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,state_open:0
+msgid "Change the state of product backlogs to open if its in draft state"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+#: field:project.scrum.email,message:0
+msgid "Message"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.email,scrum_master_email:0
+msgid "Scrum Master Email"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,product_owner_id:0
+#: help:project.scrum.sprint,product_owner_id:0
+msgid "The person who is responsible for the product"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "*Tasks since yesterday:"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Product owner"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Review"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,retrospective:0
+msgid "Sprint Retrospective"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,note:0
+msgid "Note"
+msgstr ""
+
+#. module: project_scrum
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.task,product_backlog_id:0
+msgid ""
+"Related product backlog that contains this task. Used in SCRUM methodology"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "What do you plan to do till the next meeting?"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
+#: view:postpone.wizard:0
+#: view:project.scrum.product.backlog:0
+msgid "Postpone"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: selection:project.scrum.sprint,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Optional Info"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
+msgid "Create Tasks from Product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.project,sprint_size:0
+msgid "Number of days allocated for sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.project,product_owner_id:0
+#: field:project.scrum.sprint,product_owner_id:0
+msgid "Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,sequence:0
+msgid "Gives the sequence order when displaying a list of product backlog."
+msgstr ""
+
+#. module: project_scrum
+#: model:process.node,name:project_scrum.process_node_productbacklog0
+#: view:project.scrum.product.backlog:0
+msgid "Product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
+msgid "Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Thank you"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
+msgid "Create Task for Product Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
+#: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
+msgid "Scrum Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,expected_hours:0
+msgid "Estimated total time to do the Backlog"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.backlog.merge,project_id:0
+msgid "Select project for the new product backlog"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Merge"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid ""
+"The scrum agile methodology is used in software development projects. The "
+"Product Backlog is the list of features to be implemented. A product backlog "
+"can be planified in a sprint of developement and can be split into several "
+"tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
+msgid "View sprint backlog"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "No Blocks"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.meeting,question_backlog:0
+msgid "Backlog Accurate"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
+#: view:project.scrum.backlog.create.task:0
+#: view:project.scrum.product.backlog:0
+msgid "Convert to Task"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.sprint,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Send to Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
+#: view:project.scrum.product.backlog:0
+msgid "Backlog Progress"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Email notification could not be sent to the scrum master %s"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: selection:project.scrum.sprint,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+#: view:project.scrum.product.backlog:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Close"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: selection:project.scrum.product.backlog,state:0
+#: view:project.scrum.sprint:0
+#: selection:project.scrum.sprint,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+#: field:project.scrum.sprint,effective_hours:0
+msgid "Effective hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Information"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
+msgid ""
+"The scrum agile methodology is used in software development projects. In "
+"this methodology, a sprint is a short period of time (one month) on which "
+"the team implement a list of product backlogs. The sprint review is "
+"organized when the team presents his work to the customer and product owner."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,name:0
+msgid "Feature"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.meeting:0
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+#: view:project.task:0
+msgid "Current"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "My Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.email:0
+msgid "Send Email for Scrum Meeting Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:process.transition,name:project_scrum.process_transition_backlogtask0
+msgid "Backlog Task"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+#: view:project.scrum.sprint:0
+msgid "Planned hours"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_project_scrum_email
+#: model:ir.model,name:project_scrum.model_project_scrum_meeting
+#: view:project.scrum.email:0
+#: view:project.scrum.meeting:0
+#: view:project.scrum.sprint:0
+msgid "Scrum Meeting"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart
+#: view:project.scrum.sprint:0
+msgid "Burndown Chart"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Daily Meetings"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.sprint:0
+msgid "Expected hours"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.project,sprint_size:0
+msgid "Sprint Days"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.email,product_owner_email:0
+msgid "Email Id of Product Owner"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,progress:0
+msgid "Progress (0-100)"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "I am sending you Daily Meeting Details of date"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,active:0
+msgid ""
+"If Active field is set to true, it will allow you to hide the product "
+"backlog without removing it."
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,task_hours:0
+msgid "Estimated time of the total hours of the tasks"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.project:0
+msgid "Scrum Data"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.project,scrum:0
+msgid "Is a Scrum Project"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Edit"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,tasks_id:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_postpone_wizard
+msgid "postpone.wizard"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Total Planned Hours"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid ""
+"This wizard merge backlogs and create one new backlog with draft state (Old "
+"backlogs Will be deleted). And it also merge old tasks from backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "*Task for Today:"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "Please provide email address for scrum master defined on sprint."
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.backlog.merge:0
+msgid "Select the project for merged backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
+msgid "My Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.product.backlog,effective_hours:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project_scrum
+#: help:project.scrum.product.backlog,effective_hours:0
+msgid "Computed using the sum of the time spent on every related tasks"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
+#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
+msgid "Scrum Dashboard"
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.model,name:project_scrum.model_project_scrum_sprint
+msgid "Project Scrum Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: view:project.scrum.product.backlog:0
+msgid "Feature Description"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#, python-format
+msgid "Please select any Project."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#, python-format
+msgid "Thank you,"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:0
+#, python-format
+msgid "The sprint '%s' has been closed."
+msgstr ""
+
+#. module: project_scrum
+#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
+#: view:project.scrum.backlog.assign.sprint:0
+msgid "Assign Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.create.task,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project_scrum
+#: view:postpone.wizard:0
+msgid "Are you sure to postpone Backlog ?"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.backlog.assign.sprint,sprint_id:0
+#: view:project.scrum.meeting:0
+#: field:project.scrum.meeting,sprint_id:0
+#: view:project.scrum.product.backlog:0
+#: field:project.scrum.product.backlog,sprint_id:0
+#: view:project.task:0
+#: field:project.task,sprint_id:0
+msgid "Sprint"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#, python-format
+msgid "Please select at least two product Backlogs"
+msgstr ""
+
+#. module: project_scrum
+#: field:project.scrum.sprint,review:0
+msgid "Sprint Review"
+msgstr ""
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 6f5d6e61f70..8d290261f8e 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 23:08+0000\n"
+"PO-Revision-Date: 2010-12-05 08:10+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 122f68edc16..f3f2b27c11d 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -130,7 +130,7 @@
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
-                        <filter default="1"
+                        <filter
                             icon="terp-check"
                             string="Current"
                             name="current"
@@ -429,7 +429,7 @@
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id">
-                            <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
+                            <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
                         <field name="date"/>
                     </group>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 8a6c3c0ce25..c73bc9dc039 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -48,7 +48,7 @@
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}" default="1" />
+                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 220e9da6b06..f8c6523792c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 09:33+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:38+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: 2010-12-02 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -39,11 +39,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr "Berechnet & Bezahlt"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Freundliche Gruesse."
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -69,7 +64,7 @@ msgstr "Erstellungsdatum des Belegs"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr "durch Lieferauftrag"
+msgstr "Rechnung durch Lieferung"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -82,11 +77,6 @@ msgstr "Lieferanschrift:"
 msgid "Validated By"
 msgstr "Geprüft durch"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -110,7 +100,7 @@ msgstr "Eingangsrechnungen"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr "Auswertung Beschaffungsaufträge"
+msgstr "Statistik Beschaffungsaufträge"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -225,7 +215,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr "Teillieferung"
+msgstr "Lieferung Teilmenge"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -236,7 +226,7 @@ msgstr "Beschaffungsauftrag '%s' wurde bestätigt."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr "Bestellbestätigung (durch Lieferant)"
+msgstr "Auftragsannahme"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -260,7 +250,7 @@ msgstr "Lagerbuchungen"
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr "Analyse Wareneingang"
+msgstr "Statistik Wareneingang"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -416,7 +406,7 @@ msgid ""
 "can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
 "Wenn Sie beim Beschaffungsauftrag für die Einstellung zur Erstellung einer "
-"Rechnung \"Händische Erstellung\" gewählt haben, können Sie hier "
+"Rechnung \"Manuelle Rechnung\" gewählt haben, können Sie hier "
 "nachvollziehen, für welche Auftragspositionen Sie bislang noch keine "
 "Rechnung von Ihrem Lieferanten bekommen haben. Sobald Sie dann eine "
 "Eingangsrechnung empfangen, können Sie auch eine Eingangsrechnung zunächst "
@@ -455,7 +445,7 @@ msgstr "Warnung"
 #. module: purchase
 #: field:purchase.installer,purchase_analytic_plans:0
 msgid "Purchase Analytic Plans"
-msgstr "Einkauf Analyse Planung"
+msgstr "Einkaufsplanung"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_installer
@@ -518,16 +508,14 @@ msgid "Invoice Control"
 msgstr "Rechnungserstellung"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Angebotsanfrage"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Angebotsanfrage"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Referenz Lieferant"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -555,7 +543,7 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
-"Analyse Wareneingang ermöglicht Ihnen eine Prüfung und Analyse Ihrer zu "
+"Statistik Wareneingang ermöglicht Ihnen eine Prüfung und Analyse Ihrer zu "
 "bearbeitenden Lieferaufträge im Wareneingang sowie auch eine Kontrolle der "
 "Liefertreue von Lieferanten."
 
@@ -607,11 +595,6 @@ msgstr "Gesamtpreis"
 msgid "To be Invoiced"
 msgstr "Abzurechnen"
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID sollte eindeutig sein"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -627,12 +610,12 @@ msgid ""
 "Manual: allows you to generate suppliers invoices by chosing in the "
 "uninvoiced lines of all manual purchase orders."
 msgstr ""
-"Von Auftrag: Ein Rechnungsentwurf wird vorgeneriert auf Basis des "
+"Rechnung durch Auftrag: Ein Rechnungsentwurf wird vorgeneriert auf Basis des "
 "Beschaffungsauftrags. Der Finanzbuchhalter muss lediglich den Erhalt der "
 "Rechnung prüfen und bestätigen.\n"
-"Von Lieferauftrag: Ein Rechnungsentwurf wird durch bestätigte Wareneingang "
-"erzeugt.\n"
-"Händische Erstellung / Manuell: Sie können die Eingangsrechnung für einzelne "
+"Rechnung durch Lieferung: Ein Rechnungsentwurf wird durch bestätigte "
+"Wareneingänge erzeugt.\n"
+"Manuell Rechnung: Sie können die Eingangsrechnung für einzelne "
 "Auftragspositionen, die als noch nicht bezahlt angezeigt werden indirekt "
 "über den Auftrag ableiten."
 
@@ -670,15 +653,10 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
-"Analyse Beschaffung ermöglicht Ihnen eine Überwachnung aller Vorgänge im "
+"Statistik Beschaffung ermöglicht Ihnen eine Auswertung aller Vorgänge im "
 "Rahmen der Beschaffung sowie eine Prüfung der Produktivität, des "
 "Beschaffungsumfangs sowie auch der Lieferfähigkeit und Termintreue."
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Preislisten Versionen dürfen sich nicht überschneiden"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -757,14 +735,15 @@ msgid "Validated by"
 msgstr "Geprüft durch"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Angebotsanfrage"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Supplier Invoices to Receive"
-msgstr "Noch zu erwartende Eingangsrechnungen"
+msgstr "Erwartete Eingangsrechnungen"
 
 #. module: purchase
 #: help:purchase.installer,purchase_requisition:0
@@ -788,13 +767,6 @@ msgstr ""
 "Es wurde noch kein Journal für Eingangsrechnungen für dieses Unternehmen "
 "erstellt: \"%s\" (id:%d)"
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-"Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-"vorhanden sein !"
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -868,7 +840,7 @@ msgstr "Tage b. Liefer."
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr "Wareneingang"
+msgstr "Produktzugänge"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
@@ -883,7 +855,7 @@ msgstr "September"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr "Bestätige Beschaffungsaufträge ohne Eingangsrechnung"
+msgstr "Abzurechnende Beschaffungsaufträge"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
@@ -902,23 +874,10 @@ msgid "Month"
 msgstr "Monat"
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
-msgstr ""
-"Der Status der Bestellung oder der Anfrage eines Angebot. Eine Anfrage ist "
-"eine Bestellung im Status 'Entwurf' ('Anfrage eines Angebots') ! Bei "
-"Bestätigung durch den Benutzer wechselt der Status zu 'Bestätigt'. Durch die "
-"Auftragsbestätigung des Lieferanten wechselt der Status zu 'Angenommen' . "
-"Wenn der Einkaufsauftrag bezahlt ist und die Ware empfangen wurde, wechselt "
-"der Status auf 'Erledigt' (Done). Falls ein Abbruch auftritt bei der "
-"Rechnungserfassung oder bei der Wareneingangserfassung wechselt der Status "
-"auf 'Fehler' (Exception)."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Erwarte Auftragsbestätigung"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -934,12 +893,7 @@ msgstr "Erwarte Auftragsbestätigung"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr "Gesamtbetrag Netto"
-
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr "Beschaffungsauftrag ist durch Lieferant angenommen."
+msgstr "Nettobetrag"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -974,7 +928,7 @@ msgstr "Zu erneuern durch den Finanzbuchhalter"
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "Purchase Lines Not Invoiced"
-msgstr "Noch nicht berechnete Beschaffungsauftragspositionen"
+msgstr "Nicht berechnete Produktzugänge"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1021,6 +975,11 @@ msgstr "Erzeuge Rechnungen"
 msgid "Purchase Order Line"
 msgstr "Einkaufspositionen"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -1032,12 +991,11 @@ msgid "Purchase Order Merge"
 msgstr "Zusammenfassung Beschaffungsaufträge"
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Freundliche Gruesse."
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1092,6 +1050,11 @@ msgstr "August"
 msgid "Qty. per product"
 msgstr "Menge nach Produkt"
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1107,11 +1070,6 @@ msgstr "Verkauf & Einkauf"
 msgid "June"
 msgstr "Juni"
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1214,9 +1172,9 @@ msgid "Cancel Purchase Order"
 msgstr "Storniere Beschaffungsauftrag"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
-msgstr "Referenz Lieferant"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1236,14 +1194,6 @@ msgstr "Pinnwand"
 msgid "Products Value"
 msgstr "Produktpreis"
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1275,7 +1225,7 @@ msgstr "Beschaffungsaufträge"
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr "Tage b. Auftragsgen."
+msgstr "Tage b. Bestellung"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1283,9 +1233,23 @@ msgid "Reference of the document that generated this purchase order request."
 msgstr "Referenz zu Dokument der Anfrage für diesen Beschaffungsauftrag"
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"Der Status der Bestellung oder der Anfrage eines Angebot. Eine Anfrage ist "
+"eine Bestellung im Status 'Entwurf' ('Anfrage eines Angebots') ! Bei "
+"Bestätigung durch den Benutzer wechselt der Status zu 'Bestätigt'. Durch die "
+"Auftragsbestätigung des Lieferanten wechselt der Status zu 'Angenommen' . "
+"Wenn der Einkaufsauftrag bezahlt ist und die Ware empfangen wurde, wechselt "
+"der Status auf 'Erledigt' (Done). Falls ein Abbruch auftritt bei der "
+"Rechnungserfassung oder bei der Wareneingangserfassung wechselt der Status "
+"auf 'Fehler' (Exception)."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1301,7 +1265,7 @@ msgstr "Angebotsanfragen"
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr "Datum der Auftragserteilung"
+msgstr "Datum der Auftragsannahme"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1362,9 +1326,9 @@ msgid "Purchase Order Lines"
 msgstr "Bestellpositionen"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "Beschaffungsauftrag ist durch Lieferant angenommen."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1377,21 +1341,13 @@ msgstr "Beschaffungsaufträge"
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr "Ursprungsbeleg"
+msgstr "Referenzbeleg"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
 msgstr "Zusammenfassung Bestellung"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1444,6 +1400,12 @@ msgstr "Suche Beschaffungsauftrag"
 msgid "Warehouse"
 msgstr "Zentrallager"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Angebotsanfrage"
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1461,12 +1423,6 @@ msgstr "Datum Annahme"
 msgid "Could not cancel this purchase order !"
 msgstr "Konnte den Beschaffungsauftrag nicht abbrechen!"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr "Erwarte Auftragsbestätigung"
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1534,7 +1490,7 @@ msgstr "Erwartete Auslieferungsadresse:"
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr "Gesamtbetrag Brutto"
+msgstr "Nettobetrag"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1612,7 +1568,7 @@ msgstr "Februar"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr "Analyse Beschaffung"
+msgstr "Statistik Beschaffung"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1700,7 +1656,7 @@ msgstr "Produkt ME"
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr "Einstandspreis"
+msgstr "Diff. zu Standardpreis"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1721,7 +1677,7 @@ msgstr "Bestätige"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr "Erwarte Lieferantenbestätigung"
+msgstr "Erwarte Auftragsbestätigung"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1764,11 +1720,6 @@ msgstr "Gesamt Betrag"
 msgid "Addresses"
 msgstr "Adressen"
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1795,7 +1746,7 @@ msgstr "USt."
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr "Gesamtbetrag"
+msgstr "Gesamt Betrag"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1815,9 +1766,9 @@ msgid ""
 "accountant (Invoice control = Manual)."
 msgstr ""
 "Die Rechnung wird automatisch erstellt, sobald die Konfiguration zur "
-"Rechnungserstellung bei einem Auftrag 'vom Lieferauftrag' ist. Die Rechnung "
-"kann alternativ auch händisch erstellt wird (Rechnungserstellung = Manuelle "
-"Rechnung)."
+"Rechnungserstellung bei einem Auftrag 'Rechnung durch Auftrag' ist. Die "
+"Rechnung kann alternativ auch per Hand erstellt werden (Rechnungserstellung "
+"= Manuelle Rechnung)."
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1833,7 +1784,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_move
 msgid "Partial Move"
-msgstr "Teillieferung"
+msgstr "Lieferung Teilmenge"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -1923,6 +1874,9 @@ msgstr "Pinnwand Einkauf"
 #~ msgid "When controlling invoice from orders"
 #~ msgstr "Eingangsrechnung durch Bestellung"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Pre-generated supplier invoice to control based on order"
 #~ msgstr "Vorab Eingangsrechnung zur Wareneingangskontrolle"
 
@@ -1997,6 +1951,12 @@ msgstr "Pinnwand Einkauf"
 #~ msgid "Order Ref"
 #~ msgstr "Referenz Auftrag"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "New Purchase Order"
 #~ msgstr "Neuer Beschaffungsauftrag"
 
@@ -2039,6 +1999,9 @@ msgstr "Pinnwand Einkauf"
 #~ "Nach Bestätigung des Beschaffungsauftrag wird der Vorgang unter 'Rechnung "
 #~ "Lieferanten' weiter fortgesetzt."
 
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Preislisten Versionen dürfen sich nicht überschneiden"
+
 #~ msgid "Date"
 #~ msgstr "Datum"
 
@@ -2053,3 +2016,35 @@ msgstr "Pinnwand Einkauf"
 
 #~ msgid "Quotation"
 #~ msgstr "Angebot"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID sollte eindeutig sein"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr ""
+#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
+#~ "vorhanden sein !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Fehler ! Sie können nicht die Basispreisliste als andere Preisliste zuweisen."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 652d5a06413..178f719f469 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-25 09:38+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:43+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -39,11 +39,6 @@ msgstr ""
 msgid "Invoiced & Paid"
 msgstr "Facturada & Pagada (conciliada)"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Recuerdos,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -82,11 +77,6 @@ msgstr "Dirección destinatario"
 msgid "Validated By"
 msgstr "Validado por"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -505,16 +495,14 @@ msgid "Invoice Control"
 msgstr "Control factura"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Solicitud de presupuesto"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Petición presupuesto"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Referencia proveedor"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -593,11 +581,6 @@ msgstr "Precio total"
 msgid "To be Invoiced"
 msgstr "Para facturar"
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -653,11 +636,6 @@ msgstr ""
 "controlar el rendimiento de su negociación, el funcionamiento de las "
 "entregas de sus proveedores, etc."
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -735,9 +713,10 @@ msgid "Validated by"
 msgstr "Validada por"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición presupuesto"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -764,11 +743,6 @@ msgstr "    Mes-1    "
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "No se ha definido un diario para esta compañía: \"%s\" (id:%d)"
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -876,22 +850,10 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
-msgstr ""
-"El estado del pedido de compra o de la solicitud de presupuesto. Un "
-"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
-"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
-"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
-"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
-"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
-"en la recepción de mercancías, el estado se convierte en 'Excepción'."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Esperando aceptación proveedor"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -909,11 +871,6 @@ msgstr "Pedido de compra esperando aprobación"
 msgid "Total Untaxed amount"
 msgstr "Total importe base"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr "El proveedor aprueba el pedido de compra."
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -994,6 +951,11 @@ msgstr "Crear facturas"
 msgid "Purchase Order Line"
 msgstr "Línea pedido de compra"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -1005,12 +967,11 @@ msgid "Purchase Order Merge"
 msgstr "Fusión pedido compra"
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1059,6 +1020,11 @@ msgstr "Agosto"
 msgid "Qty. per product"
 msgstr "Ctdad por producto"
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1074,11 +1040,6 @@ msgstr "Ventas y Compras"
 msgid "June"
 msgstr "Junio"
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1173,9 +1134,9 @@ msgid "Cancel Purchase Order"
 msgstr "Cancelar pedido de compra"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
-msgstr "Referencia proveedor"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1193,15 +1154,6 @@ msgstr "Tablero"
 msgid "Products Value"
 msgstr "Valor productos"
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
-"elemento de la tarifa."
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1242,9 +1194,22 @@ msgstr ""
 "Referencia al documento que ha generado esta solicitud de pedido de compra."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"El estado del pedido de compra o de la solicitud de presupuesto. Un "
+"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
+"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
+"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
+"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
+"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
+"en la recepción de mercancías, el estado se convierte en 'Excepción'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1321,9 +1286,9 @@ msgid "Purchase Order Lines"
 msgstr "Líneas orden de compra"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "El proveedor aprueba el pedido de compra."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1343,14 +1308,6 @@ msgstr "Documento origen"
 msgid "Merge orders"
 msgstr "Fusionar pedidos"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1403,6 +1360,12 @@ msgstr "Buscar pedido de compra"
 msgid "Warehouse"
 msgstr "Almacén"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Solicitud de presupuesto"
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1420,12 +1383,6 @@ msgstr "Fecha aprobación"
 msgid "Could not cancel this purchase order !"
 msgstr "¡No se puede cancelar este pedido de compra!"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr "Esperando aceptación proveedor"
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1695,11 +1652,6 @@ msgstr "Total"
 msgid "Addresses"
 msgstr "Direcciones"
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1856,6 +1808,9 @@ msgstr "Tablero de compras"
 #~ msgid "When controlling invoice from orders"
 #~ msgstr "Cuando se controla factura desde pedidos"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Pre-generated supplier invoice to control based on order"
 #~ msgstr "Factura de proveedor pre-generada para control basada en pedido"
 
@@ -1925,6 +1880,12 @@ msgstr "Tablero de compras"
 #~ msgid "Order Ref"
 #~ msgstr "Ref. pedido"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "New Purchase Order"
 #~ msgstr "Nuevo pedido de compra"
 
@@ -1956,6 +1917,12 @@ msgstr "Tablero de compras"
 #~ msgstr ""
 #~ "Después del pedido de compra aprobado, se convierte en factura de proveedor"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
 #~ msgid "Purchase orders"
 #~ msgstr "Pedidos de compra"
 
@@ -1965,6 +1932,13 @@ msgstr "Tablero de compras"
 #~ msgid "Request For Quotations"
 #~ msgstr "Solicitud de presupuestos"
 
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "¡Error!  No puede asignar la tarifa principal como otra tarifa en un "
+#~ "elemento de la tarifa."
+
 #~ msgid "Manual in progress"
 #~ msgstr "Manual en progreso"
 
@@ -1976,3 +1950,24 @@ msgstr "Tablero de compras"
 
 #~ msgid "Waiting Schedule"
 #~ msgstr "Esperando planificación"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index c80438b584a..7caa6791a3c 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:27+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-06 17:06+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: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -23,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"L'acheteur doit d'abord approuver l'appel d'offre avant de pouvoir l'envoyer "
+"au fournisseur. L'appel d'offre devient alors un ordre d'achat confirmé."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -55,7 +56,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "Date à laquelle ce document a été créé"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -91,7 +92,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:0
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Factures fournisseur"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -120,7 +121,7 @@ msgstr "Quantité"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Sélectionnez une commande de vente ouverte"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -128,12 +129,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "C'est le délai / temps de sécurité pour chaque commande d'achat."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -148,7 +149,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Achats mensuels par catégorie"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -215,7 +216,7 @@ msgstr "Traitement partiel"
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "L'ordre d'achat '%s' est confirmé."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -233,7 +234,7 @@ msgstr "Confirmé par fournisseur"
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Achats"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -244,7 +245,7 @@ msgstr "Mouvements de stock"
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "Analyses des réceptions"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -261,6 +262,9 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Vous devez sélectionner une liste de prix ou un fournisseur dans le "
+"formulaire d'achat !\n"
+"Veuillez en sélectionner un avant de choisir un produit."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -297,7 +301,7 @@ msgstr "Total Net :"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 msgid "Products"
-msgstr ""
+msgstr "Produits"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
@@ -323,12 +327,12 @@ msgstr "Annulé"
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Purchase amount over the limit"
-msgstr ""
+msgstr "Montant d'achat supérieur à la limite"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "Convertir en ordre d'achat"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
@@ -366,7 +370,7 @@ msgstr "Corrigé manuellement"
 #. module: purchase
 #: view:purchase.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mois   "
 
 #. module: purchase
 #: view:purchase.order:0
@@ -397,13 +401,13 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "L'ordre d'achat '%s' a été passé au statut 'Brouillon'."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -420,7 +424,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attention"
 
 #. module: purchase
 #: field:purchase.installer,purchase_analytic_plans:0
@@ -435,7 +439,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -468,7 +472,7 @@ msgstr "Visé par acheteur"
 #: view:purchase.report:0
 #: field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prix moyen"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -490,7 +494,7 @@ msgstr "Contrôle facture"
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de sociétés récursives"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
@@ -504,6 +508,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Une réception génère une facture fournisseur. En fonction du contrôle de "
+"facturation de l'ordre d'achat, la facturation est basée sur les quantités "
+"réceptionnés ou sur les quantités commandées."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -512,7 +519,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -520,6 +527,9 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"L'analyse des réceptions vous permet de facilement contrôler et analyser les "
+"réceptions des ordres d'achat de votre société, et les performances de "
+"livraison de vos fournisseurs."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -535,12 +545,12 @@ msgstr "Opération de manutention"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimer"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Fusionner les ordres d'achat"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -567,7 +577,7 @@ msgstr "Prix total"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "À facturer"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -605,7 +615,7 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mon tableau de bord"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -664,18 +674,18 @@ msgstr "Terminé"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
 #: view:purchase.report:0
 msgid "Purchase by supplier"
-msgstr ""
+msgstr "Achats par fournisseur"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -685,7 +695,7 @@ msgstr "Montant total"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Réceptions"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -714,13 +724,15 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Il n'y a pas de journal d'achats défini pour cette société: \"%s\" (id. : "
+"%id)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -737,7 +749,7 @@ msgstr ""
 #: field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Date de commande"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -747,13 +759,13 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Approbation"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -795,7 +807,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Réceptionner les produits"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
@@ -805,17 +817,17 @@ msgstr "Besoin"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Ordres d'achat confirmés à facturer"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -826,7 +838,7 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -848,7 +860,7 @@ msgstr "Commande d'achat en attente d'approbation"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Montant total hors taxe"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -859,7 +871,7 @@ msgstr "Reçu"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "Liste des produits commandés"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
@@ -885,7 +897,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "Purchase Lines Not Invoiced"
-msgstr ""
+msgstr "Lignes d'achat non facturées"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -902,28 +914,28 @@ msgstr "Facturée"
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Etat de l'ordre d'achat."
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Année  "
 
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "État de l'ordre d'achat"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Créer les factures"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
@@ -956,7 +968,7 @@ msgstr "Bien à vous,"
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Négociation par fournisseur"
 
 #. module: purchase
 #: view:res.partner:0
@@ -970,6 +982,10 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Un ordre d'achat génère une facture fournisseur dès qu'il est confirmé par "
+"l'acheteur. En fonction de la méthode de contrôle facture de l'ordre "
+"d'achat, la facture est basée sur les quantités réceptionnées ou les "
+"quantités commandées."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -979,7 +995,7 @@ msgstr "Montant hors-taxe"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Ceci indique qu'une facture a été payée"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -991,13 +1007,13 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Qté par produit"
 
 #. module: purchase
 #: constraint:stock.move:0
@@ -1017,17 +1033,17 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Ordres d'achat"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Factures manuelles"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1039,12 +1055,12 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1091,7 +1107,7 @@ msgstr "Exception"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1101,12 +1117,12 @@ msgstr "Calculer"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Sociétés"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1126,18 +1142,18 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Tableau de bord"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Valeur des produits"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Le montant des taxes"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1149,7 +1165,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "Ordres d'achat par mois"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1159,7 +1175,7 @@ msgstr "Historique"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "Achats"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1199,12 +1215,12 @@ msgstr "Sous-total"
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "Appels d'offre"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Date à laquelle l'ordre d'achat a été approuvé"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1220,12 +1236,12 @@ msgstr "Version par Défaut de la liste de Prix d'Achat"
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Informations générales"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
 msgid "Purchases Application Configuration"
-msgstr ""
+msgstr "Configuration de l'application des achats"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -1247,7 +1263,7 @@ msgstr "Facture"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Décembre"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1262,12 +1278,12 @@ msgstr "Annuler"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Lignes d'ordre d'achat"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Le fournisseur valide l'ordre d'achat."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1280,7 +1296,7 @@ msgstr "Commandes d'achats"
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Document d'origine"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1319,7 +1335,7 @@ msgstr "Tél. :"
 #: view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1343,7 +1359,7 @@ msgstr "Entrepôt"
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Appel d'offres"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1371,7 +1387,7 @@ msgstr "Prix"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "Livraison et facturation"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -1401,7 +1417,7 @@ msgstr "Produit"
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmation"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1423,7 +1439,7 @@ msgstr "Adresse de Livraison Attendue :"
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Montant hors-taxe"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1436,7 +1452,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Lignes de facture"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1447,7 +1463,7 @@ msgstr "Livraison"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Appel d'offres"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1464,7 +1480,7 @@ msgstr "Qté"
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
@@ -1487,13 +1503,13 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Analyse des achats"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1538,12 +1554,12 @@ msgstr "Contrôle d'achat"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1564,7 +1580,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM du produit"
 
 #. module: purchase
 #: field:purchase.report,negociation:0
@@ -1590,12 +1606,12 @@ msgstr "Approuver"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "À approuver"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturation"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1613,7 +1629,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "L'ordre d'achat '%s' est annulé."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1623,7 +1639,7 @@ msgstr "Total"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adresses"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1635,7 +1651,7 @@ msgstr "Êtes-vous sûr de vouloir fusionner ces commandes ?"
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
@@ -1650,17 +1666,17 @@ msgstr "TVA :"
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Montant total"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Délai d'achat"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1674,12 +1690,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: purchase
 #: view:purchase.installer:0
 msgid "title"
-msgstr ""
+msgstr "Titre"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_move
@@ -1689,7 +1705,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Mouvement de stock"
 
 #. module: purchase
 #: view:purchase.order:0
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index acf5d01b621..3152d0cbc4e 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-26 15:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 12:34+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-27 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -34,11 +34,6 @@ msgstr "Não pode confirmar uma ordem de compra sem linhas."
 msgid "Invoiced & Paid"
 msgstr "Facturado & Pago"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "Cumprimentos,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -76,11 +71,6 @@ msgstr "Endereço de destino"
 msgid "Validated By"
 msgstr "Validado por"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -110,7 +100,7 @@ msgstr "Estatísticas de ordens de compra."
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "A partir das receções"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -310,7 +300,7 @@ msgstr "Artigos"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Quantidades e valores por mês"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -498,16 +488,14 @@ msgid "Invoice Control"
 msgstr "Contolo de facturas"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Pedido de cotações"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivamente."
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "Cotação"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Código do fornecedor"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -583,11 +571,6 @@ msgstr "Preço total"
 msgid "To be Invoiced"
 msgstr "A ser facturado"
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -639,11 +622,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Não pode ter duas versões de listas de preços que se sobreponham."
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -718,9 +696,10 @@ msgid "Validated by"
 msgstr "Validado por"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Cotação"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -748,11 +727,6 @@ msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 "Não há um diário de compras definido para esta companhia: \"%s\" (id:%d)"
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -860,21 +834,10 @@ msgid "Month"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
 msgstr ""
-"O estado da ordem de compra ou do pedido de cotação. Uma cotação é uma ordem "
-"de compra em estado 'rascunho'. Depois de a ordem confirmada pelo "
-"utilizador, o estado muda para ' Confirmado'. Então o fornecedor deve "
-"confirmar a ordem para mudar o estado para ' Aprovado'. Quando ordem é paga "
-"e recebida, o estado passa 'Concluído'. Se uma acção de cancelamento ocorre "
-"na factura ou na recepção dos bens, o estado passa a \"Excepção\"."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -892,11 +855,6 @@ msgstr "Ordem de compra aguardando aprovação"
 msgid "Total Untaxed amount"
 msgstr ""
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -977,6 +935,11 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Linha de ordem de compra"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -988,12 +951,11 @@ msgid "Purchase Order Merge"
 msgstr ""
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "Cumprimentos,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1040,6 +1002,11 @@ msgstr ""
 msgid "Qty. per product"
 msgstr ""
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1055,11 +1022,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1154,8 +1116,8 @@ msgid "Cancel Purchase Order"
 msgstr "Cancelar ordem de compra"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: purchase
@@ -1174,15 +1136,6 @@ msgstr ""
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Erro ! Não pode atribuir a Lista de Preço Principal como Outra Lista de "
-"Preço em Lista de Preço do Item !"
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1222,9 +1175,21 @@ msgid "Reference of the document that generated this purchase order request."
 msgstr "Referencia do documento que gerou a cotação de ordem de compra."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
 msgstr ""
+"O estado da ordem de compra ou do pedido de cotação. Uma cotação é uma ordem "
+"de compra em estado 'rascunho'. Depois de a ordem confirmada pelo "
+"utilizador, o estado muda para ' Confirmado'. Então o fornecedor deve "
+"confirmar a ordem para mudar o estado para ' Aprovado'. Quando ordem é paga "
+"e recebida, o estado passa 'Concluído'. Se uma acção de cancelamento ocorre "
+"na factura ou na recepção dos bens, o estado passa a \"Excepção\"."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1301,8 +1266,8 @@ msgid "Purchase Order Lines"
 msgstr "Linhas de Ordem de Compra"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
 msgstr ""
 
 #. module: purchase
@@ -1323,14 +1288,6 @@ msgstr ""
 msgid "Merge orders"
 msgstr "Fundir ordens"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
-"especial !"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1383,6 +1340,12 @@ msgstr ""
 msgid "Warehouse"
 msgstr "Armazem"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Pedido de cotações"
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1400,12 +1363,6 @@ msgstr "Data de aprovação"
 msgid "Could not cancel this purchase order !"
 msgstr "Não é possivel cancelar esta ordem de compra !"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr ""
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1669,11 +1626,6 @@ msgstr "Total"
 msgid "Addresses"
 msgstr ""
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1814,6 +1766,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Factura do fornecedor pré-gerada nas recepções para controlo"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção"
+
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Criar factura pela recepção do artigo."
 
@@ -1893,6 +1848,12 @@ msgstr ""
 #~ msgid "New Purchase Order"
 #~ msgstr "Nova ordem de compra"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+#~ "especial !"
+
 #~ msgid "Out Packing"
 #~ msgstr "Pacote a sair"
 
@@ -1914,3 +1875,22 @@ msgstr ""
 
 #~ msgid "Request For Quotations"
 #~ msgstr "Pedidos de cotação"
+
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Erro ! Não pode atribuir a Lista de Preço Principal como Outra Lista de "
+#~ "Preço em Lista de Preço do Item !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Não pode ter duas versões de listas de preços que se sobreponham."
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitectura da vista!"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index c86ea5d2b73..c97fb247cc3 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-22 06:56+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 20:06+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-23 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -36,11 +36,6 @@ msgstr "Вы не можете подтвердить заказ на закуп
 msgid "Invoiced & Paid"
 msgstr "Счета получены и оплачены"
 
-#. module: purchase
-#: report:purchase.quotation:0
-msgid "Regards,"
-msgstr "С уважением,"
-
 #. module: purchase
 #: field:purchase.order,location_id:0
 #: view:purchase.report:0
@@ -79,11 +74,6 @@ msgstr "Адрес назначения"
 msgid "Validated By"
 msgstr "Утверждено"
 
-#. module: purchase
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,partner_id:0
@@ -508,16 +498,14 @@ msgid "Invoice Control"
 msgstr "Управление счетами"
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_draftpurchaseorder0
-#: model:process.node,note:purchase.process_node_draftpurchaseorder1
-msgid "Request for Quotations."
-msgstr "Запрос цен"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
 
 #. module: purchase
-#: model:process.node,name:purchase.process_node_draftpurchaseorder0
-#: model:process.node,name:purchase.process_node_draftpurchaseorder1
-msgid "RFQ"
-msgstr "ЗЦ"
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr "Ссылка на поставщика"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -596,11 +584,6 @@ msgstr "Итоговая цена"
 msgid "To be Invoiced"
 msgstr "Счет будет выставлен"
 
-#. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
@@ -652,11 +635,6 @@ msgid ""
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Нельзя иметь 2 перекрывающиеся версии каталога!"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
@@ -731,9 +709,10 @@ msgid "Validated by"
 msgstr "Проверил(а)"
 
 #. module: purchase
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "ЗЦ"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -760,11 +739,6 @@ msgstr "    Месяц-1    "
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Журнал закупок не определен для этой компании:  \"%s\" (id:%d)"
 
-#. module: purchase
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
-
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
@@ -872,22 +846,10 @@ msgid "Month"
 msgstr "Месяц"
 
 #. module: purchase
-#: help:purchase.order,state:0
-msgid ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
-msgstr ""
-"Состояние заказа на закупку или запроса предложения. Предложение - это заказ "
-"на закупку в состоянии 'Черновик'. Когда заказ подтвержден пользователем, "
-"статус меняется на 'Подтверждено'. Затем поставщик должен подтвердить заказ "
-"для изменения состояния в 'Утверждено'. Когда заказ на закупку оплачен и "
-"получен, состояние меняется на 'Выполнено'. Если возникает отмена в процессе "
-"расчетов или поставки товаров, состояние устанавливается в 'Исключительная "
-"ситуация'."
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr "Ожидание"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -905,11 +867,6 @@ msgstr "Заказ на закупку в ожидании утверждени
 msgid "Total Untaxed amount"
 msgstr "Итого без налога"
 
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
-msgid "The supplier approves the Purchase Order."
-msgstr "Продавец утвердил заказ на закупку"
-
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
@@ -991,6 +948,11 @@ msgstr "Создать счета"
 msgid "Purchase Order Line"
 msgstr "Позиция заказа на закупку"
 
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
+
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
@@ -1002,12 +964,11 @@ msgid "Purchase Order Merge"
 msgstr "Объединить заказ на закупку"
 
 #. module: purchase
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr "С уважением,"
 
 #. module: purchase
-#: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
@@ -1054,6 +1015,11 @@ msgstr "Август"
 msgid "Qty. per product"
 msgstr "Кол-во на ТМЦ"
 
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
@@ -1069,11 +1035,6 @@ msgstr "Продажи и Закупки"
 msgid "June"
 msgstr "Июнь"
 
-#. module: purchase
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "Название группы должно быть уникальным !"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
@@ -1167,9 +1128,9 @@ msgid "Cancel Purchase Order"
 msgstr "Отмена заказа на закупку"
 
 #. module: purchase
-#: field:purchase.order,partner_ref:0
-msgid "Supplier Reference"
-msgstr "Ссылка на поставщика"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1187,15 +1148,6 @@ msgstr "Панель"
 msgid "Products Value"
 msgstr ""
 
-#. module: purchase
-#: constraint:product.pricelist.item:0
-msgid ""
-"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
-"Item!"
-msgstr ""
-"Ошибка ! Нельзя определить Главный Каталог как Другой Каталог в объекте "
-"Каталог!"
-
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
@@ -1235,9 +1187,22 @@ msgid "Reference of the document that generated this purchase order request."
 msgstr "Ссылка на документ из которого был создан этот заказ на закупку."
 
 #. module: purchase
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"Состояние заказа на закупку или запроса предложения. Предложение - это заказ "
+"на закупку в состоянии 'Черновик'. Когда заказ подтвержден пользователем, "
+"статус меняется на 'Подтверждено'. Затем поставщик должен подтвердить заказ "
+"для изменения состояния в 'Утверждено'. Когда заказ на закупку оплачен и "
+"получен, состояние меняется на 'Выполнено'. Если возникает отмена в процессе "
+"расчетов или поставки товаров, состояние устанавливается в 'Исключительная "
+"ситуация'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1314,9 +1279,9 @@ msgid "Purchase Order Lines"
 msgstr "Позиции заказа на закупку"
 
 #. module: purchase
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr "Продавец утвердил заказ на закупку"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1336,14 +1301,6 @@ msgstr "Документ источник"
 msgid "Merge orders"
 msgstr "Объединить заказы"
 
-#. module: purchase
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
@@ -1396,6 +1353,12 @@ msgstr "Искать заказ на закупку"
 msgid "Warehouse"
 msgstr "Склад"
 
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr "Запрос цен"
+
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
@@ -1413,12 +1376,6 @@ msgstr "Дата утверждения"
 msgid "Could not cancel this purchase order !"
 msgstr "Не удалось отменить этот заказ на закупку"
 
-#. module: purchase
-#: selection:purchase.order,state:0
-#: selection:purchase.report,state:0
-msgid "Waiting Supplier Ack"
-msgstr "Ожидание"
-
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
@@ -1682,11 +1639,6 @@ msgstr "Всего"
 msgid "Addresses"
 msgstr "Адреса"
 
-#. module: purchase
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Правила не поддерживаются в объектах osv_memory !"
-
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
@@ -1787,6 +1739,9 @@ msgstr "Панель закупок"
 #~ msgid "Merge purchases"
 #~ msgstr "Объединить закупки"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "Purchase orders"
 #~ msgstr "Заказы на закупку"
 
@@ -1811,6 +1766,12 @@ msgstr "Панель закупок"
 #~ msgid "Order Ref"
 #~ msgstr "Ссылка на заказ"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Создать счет из принятого товара"
 
@@ -1874,9 +1835,19 @@ msgstr "Панель закупок"
 #~ msgid "Approved Purchase"
 #~ msgstr "Утвержденная закупка"
 
+#~ msgid "You cannot have 2 pricelist versions that overlap!"
+#~ msgstr "Нельзя иметь 2 перекрывающиеся версии каталога!"
+
 #~ msgid "Date"
 #~ msgstr "Дата"
 
+#~ msgid ""
+#~ "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+#~ "Item!"
+#~ msgstr ""
+#~ "Ошибка ! Нельзя определить Главный Каталог как Другой Каталог в объекте "
+#~ "Каталог!"
+
 #~ msgid "Create Packing list"
 #~ msgstr "Создать упаковочный лист"
 
@@ -1892,6 +1863,9 @@ msgstr "Панель закупок"
 #~ msgid "Purchase Invoice"
 #~ msgstr "Счет на закупку"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Invoice from Packing list"
 #~ msgstr "Счет из упаковочного листа"
 
@@ -1955,3 +1929,24 @@ msgstr "Панель закупок"
 
 #~ msgid "Product Receipt"
 #~ msgstr "Получение ТМЦ"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "Название группы должно быть уникальным !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Правила не поддерживаются в объектах osv_memory !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index 8e50e9fc5be..3f6133e87d0 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:36+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-05 20:00+0000\n"
+"Last-Translator: swinter <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: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
@@ -39,7 +38,7 @@ msgstr ""
 #: view:purchase.requisition:0
 #: field:purchase.requisition,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -54,24 +53,24 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,exclusive:0
@@ -110,7 +109,7 @@ msgstr ""
 #: model:ir.model,name:purchase_requisition.model_product_product
 #: field:purchase.requisition.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -121,7 +120,7 @@ msgstr ""
 #: report:purchase.requisition:0
 #: field:purchase.requisition,description:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -133,13 +132,13 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
 #: field:purchase.requisition.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -164,22 +163,22 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Référence de la commande"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start Date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantité"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -190,7 +189,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
-msgstr ""
+msgstr "Date de fin"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -201,7 +200,7 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,line_ids:0
 msgid "Products to Purchase"
-msgstr ""
+msgstr "Produits à acheter"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,date_end:0
@@ -216,12 +215,12 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Notes"
-msgstr ""
+msgstr "Remarques"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Date de commande"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,exclusive:0
@@ -248,23 +247,23 @@ msgstr ""
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur!"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM du produit"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Products"
-msgstr ""
+msgstr "Produits"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Order Date"
-msgstr ""
+msgstr "Date de commande"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,state:0
@@ -274,7 +273,7 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -289,7 +288,7 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Quotation Detail"
-msgstr ""
+msgstr "Détail de l'offre de prix"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -299,7 +298,7 @@ msgstr ""
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
 msgid "Purchase orders"
-msgstr ""
+msgstr "Ordres d'achat"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -311,7 +310,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_procurement_order
@@ -331,7 +330,7 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Qty"
-msgstr ""
+msgstr "Qté"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -346,13 +345,13 @@ msgstr ""
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: Code EAN invalide"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Done"
-msgstr ""
+msgstr "Terminé"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
@@ -367,12 +366,12 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: purchase_requisition
 #: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
@@ -387,7 +386,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Requisition"
-msgstr ""
+msgstr "Demande"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index ea023104865..9a1dba7c123 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 19:57+0000\n"
+"PO-Revision-Date: 2010-12-05 08:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
diff --git a/addons/report_designer/i18n/el.po b/addons/report_designer/i18n/el.po
index 1c6947c4f07..037828d94f3 100644
--- a/addons/report_designer/i18n/el.po
+++ b/addons/report_designer/i18n/el.po
@@ -7,81 +7,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-24 10:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 20:45+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
 msgid "Reporting Tools Configuration"
 msgstr ""
 
-#. module: report_designer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: report_designer
 #: field:report_designer.installer,base_report_creator:0
 msgid "Query Builder"
-msgstr ""
+msgstr "Κατασκευαστής Ερωτημάτων"
 
 #. module: report_designer
 #: field:report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Πρόοδος Ρυθμίσεων"
 
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "τίτλος"
 
 #. module: report_designer
 #: model:ir.model,name:report_designer.model_report_designer_installer
 msgid "report_designer.installer"
-msgstr ""
+msgstr "report_designer.installer"
 
 #. module: report_designer
 #: field:report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Εικόνα"
 
 #. module: report_designer
 #: field:report_designer.installer,base_report_designer:0
 msgid "OpenOffice Report Designer"
-msgstr ""
+msgstr "Σχεδιαστής αναφορών OpenOffice"
 
 #. module: report_designer
 #: model:ir.module.module,shortdesc:report_designer.module_meta_information
 msgid "Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: report_designer
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: report_designer
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Εργαλεία Αναφορών"
 
 #. module: report_designer
 #: model:ir.module.module,description:report_designer.module_meta_information
@@ -90,14 +64,12 @@ msgid ""
 "    "
 msgstr ""
 
-#. module: report_designer
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
 msgid ""
 "Allows you to create any statistic reports  on several objects. It's a SQL "
 "query builder and browser for end users."
 msgstr ""
+"Σας επιτρέπει να δημιουργήσετε τις στατιστικές αναφορές σχετικά με διάφορα "
+"αντικείμενα. Είναι ένας κατασκευαστής ερωτημάτων SQL και πρόγραμμα "
+"περιήγησης για τους τελικούς χρήστες."
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index e95b65fda2c..6e7b4ca442c 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -6,45 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 21:44+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_intrastat
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: report_intrastat
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
-msgid "Canceled Invoice"
+msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr "¡El código de país debe ser único!"
+
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Disc. (%)"
 msgstr "Desc. (%)"
 
-#. module: report_intrastat
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Invoice"
@@ -56,9 +48,12 @@ msgid "Unit Price"
 msgstr "Precio unidad"
 
 #. module: report_intrastat
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -85,11 +80,6 @@ msgstr "PRO-FORMA"
 msgid "Taxes:"
 msgstr "Impuestos:"
 
-#. module: report_intrastat
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
@@ -141,20 +131,15 @@ msgid "Base"
 msgstr "Base"
 
 #. module: report_intrastat
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: view:report.intrastat:0
+msgid "This Year"
+msgstr "Este año"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: report_intrastat
-#: report:account.invoice.intrastat:0
-msgid "Tax"
-msgstr "Impuesto"
-
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
@@ -203,11 +188,21 @@ msgstr "Informe Intrastat"
 msgid "Invoice"
 msgstr "Factura"
 
+#. module: report_intrastat
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
+
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
 msgstr "País"
 
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr "¡El nombre del país debe ser único!"
+
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
@@ -276,6 +271,11 @@ msgstr "Factura de abono"
 msgid "Source document"
 msgstr "Documento origen"
 
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fiscal Position Remark :"
+msgstr "Observación posición fiscal :"
+
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
@@ -298,20 +298,15 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: report_intrastat
-#: selection:report.intrastat,month:0
-msgid "June"
-msgstr "Junio"
+#: report:account.invoice.intrastat:0
+msgid "Tax"
+msgstr "Impuesto"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
 msgstr "Código del país"
 
-#. module: report_intrastat
-#: view:report.intrastat:0
-msgid "This Year"
-msgstr "Este año"
-
 #. module: report_intrastat
 #: field:report.intrastat,month:0
 msgid "Month"
@@ -352,11 +347,6 @@ msgstr "Total (sin impuestos):"
 msgid "Price"
 msgstr "Precio"
 
-#. module: report_intrastat
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
@@ -364,14 +354,41 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 msgid "Intrastat Code"
 msgstr "Código Intrastat"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Canceled Invoice"
+#~ msgstr "Factura cancelada"
+
 #~ msgid "Intrastat (this month)"
 #~ msgstr "Intrastat (este mes)"
 
 #~ msgid "All Months"
 #~ msgstr "Todos los meses"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Period"
 #~ msgstr "Periodo"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "Origin"
 #~ msgstr "Origen"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index c4e60d332c5..ba5a294487a 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-29 07:48+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:46+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
@@ -43,11 +44,6 @@ msgstr "Imagen cabecera"
 msgid "Webkit Executable Path"
 msgstr "Ruta ejecutable WebKit"
 
-#. module: report_webkit
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
@@ -164,9 +160,9 @@ msgid "B2  17  500 x 707 mm"
 msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
-#: model:ir.model,name:report_webkit.model_ir_header_img
-msgid "ir.header_img"
-msgstr ""
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -178,11 +174,6 @@ msgstr "A0 5 841 x 1189 mm"
 msgid "C5E 24  163 x 229 mm"
 msgstr "C5E 24 163 x 229 mm"
 
-#. module: report_webkit
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: report_webkit
 #: field:ir.header_img,type:0
 msgid "Type"
@@ -194,11 +185,6 @@ msgstr "Tipo"
 msgid "Client Actions Connections"
 msgstr "Conexiones acciones cliente"
 
-#. module: report_webkit
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: report_webkit
 #: field:res.company,header_image:0
 msgid "Available Images"
@@ -296,11 +282,6 @@ msgstr "B5 1 176 x 250 mm, 6,93 x 9,84 pulgadas"
 msgid "Content and styling"
 msgstr "Contenido y estilo"
 
-#. module: report_webkit
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A7  11  74 x 105 mm"
@@ -383,9 +364,9 @@ msgid "Portrait"
 msgstr "Horizontal"
 
 #. module: report_webkit
-#: selection:ir.header_webkit,orientation:0
-msgid "Landscape"
-msgstr "Apaisado"
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.acciones.informe.xml"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
@@ -397,11 +378,6 @@ msgstr "configuración página"
 msgid "B8  22  62 x 88 mm"
 msgstr "B8 22 62 x 88 mm"
 
-#. module: report_webkit
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear un menú recursivo"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A2  7   420 x 594 mm"
@@ -458,9 +434,9 @@ msgid "Set Webkit Report Header"
 msgstr "Establecer cabecera informe Webkit"
 
 #. module: report_webkit
-#: field:ir.header_webkit,format:0
-msgid "Paper size"
-msgstr "Tamaño del papel"
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr "ir.cabecera_img"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -472,24 +448,11 @@ msgstr ":B10 16 31 x 44 mm"
 msgid "Header CSS"
 msgstr "Cabecera CSS"
 
-#. module: report_webkit
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B4  19  250 x 353 mm"
 msgstr "B4 19 250 x 353 mm"
 
-#. module: report_webkit
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A3  8   297 x 420 mm"
@@ -557,6 +520,11 @@ msgstr "Añadir botones imprimir"
 msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25 105 x 241 mm, Sobre U.S. Común 10"
 
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Tamaño del papel"
+
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:0
 #, python-format
@@ -584,6 +552,30 @@ msgid "B9  23  33 x 62 mm"
 msgstr "B9 23 33 x 62 mm"
 
 #. module: report_webkit
-#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
-msgid "ir.actions.report.xml"
-msgstr ""
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Apaisado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear un menú recursivo"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
index da964255630..ed65c86dd7c 100644
--- a/addons/report_webkit_sample/i18n/es.po
+++ b/addons/report_webkit_sample/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:27+0000\n"
+"PO-Revision-Date: 2010-12-08 22:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit_sample
@@ -117,7 +117,7 @@ msgstr "Impuestos"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "VAT"
-msgstr ""
+msgstr "CIF/NIF"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 2b1670e8c9f..e2da0cafbb0 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-05 00:22+0000\n"
+"PO-Revision-Date: 2010-12-08 22:58+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -41,7 +41,7 @@ msgstr "Tipo de recurso"
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr "Detalle Ausencia"
+msgstr "Detalle ausencia"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
@@ -102,6 +102,8 @@ msgstr "Buscar periodo de trabajo"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"¡Error! La fecha inicial de ausencia debe ser anterior a la fecha final de "
+"ausencia."
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -220,6 +222,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el registro del recurso sin "
+"eliminarlo."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
@@ -326,7 +330,7 @@ msgstr "Fecha inicio"
 #: code:addons/resource/resource.py:0
 #, python-format
 msgid " (copy)"
-msgstr " (copiar)"
+msgstr " (copia)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
new file mode 100644
index 00000000000..05143bcc491
--- /dev/null
+++ b/addons/resource/i18n/pt.po
@@ -0,0 +1,323 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 13:06+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Sexta-Feira"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Tipo de Recurso"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Time"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Quinta-Feira"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Gestor do grupo de trabalho"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr ""
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Dia da semana"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Data de inicio"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Data"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Data de fim"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Quarta-Feira"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr "Horário de trabalho"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Segunda-Feira"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Terça-Feira"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Humano"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Data de início"
+
+#. module: resource
+#: code:addons/resource/resource.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (cópia)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sábado"
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 48403ea1874..e9062820fb7 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -7,22 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 09:37+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:23+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: sale
 #: help:sale.order,picking_policy:0
 msgid ""
@@ -42,12 +37,6 @@ msgstr "Tag"
 msgid "Cancel Order"
 msgstr "Auftrag stornieren"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-#: view:sale.report:0
-msgid "Sales By Partner"
-msgstr "Verkauf je Partner"
-
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
@@ -79,7 +68,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "Komplett Ausliefern"
+msgstr "Nur Gesamtmenge liefern"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -140,7 +129,7 @@ msgstr "Standard Zahlungsbedingung"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr "Konfiguration der Lieferausführung für diesen Verkaufsauftrag"
+msgstr "Konfiguration der Lieferbedingungen für diesen Verkaufsauftrag"
 
 #. module: sale
 #: view:sale.order:0
@@ -161,11 +150,6 @@ msgstr "Rabatt (%)"
 msgid "Total Price"
 msgstr "Gesamtumsatz"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
@@ -178,6 +162,13 @@ msgstr ""
 msgid "Ordered Quantities"
 msgstr "Beauftragte Menge"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -197,7 +188,7 @@ msgstr "Andere Informationen"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sale order is created"
-msgstr "Datum der Erzeugung dieses Verkaufsauftrages"
+msgstr "Datum der Erstellung dieses Verkaufsauftrags"
 
 #. module: sale
 #: view:sale.order:0
@@ -218,13 +209,6 @@ msgstr ""
 "Abrechnung eines Verkaufsauftrags durch eine abschliessende Rechnung "
 "bevorzugen."
 
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
-"Mengeneinheit"
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
@@ -232,7 +216,7 @@ msgid ""
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
 "Die Rechnung wird für die Abrechnungsbedingungen \"Rechnung durch "
-"Lieferung\" und \"Rechnung durch Auftrag\"  automatisch erzeugt."
+"Lieferung\" und \" Rechnung durch Auftrag\"  automatisch erzeugt."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -254,7 +238,7 @@ msgstr "Rabatt (%)"
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr "Pinnwand für Verkaufsmanager"
+msgstr "Pinnwand Vertriebsleitung"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -300,8 +284,8 @@ msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
 msgstr ""
-"Kein Erlöskonto für diese Produktkategorie oder eine beim Partner "
-"hinterlegte Steuerzuordnung definiert."
+"Kein Erlöskonto für diese Produktkategorie oder eine beim Partner oder "
+"Auftrag zugewiesene Steuerzuordnung  definiert !"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -314,6 +298,11 @@ msgstr "August"
 msgid "EAN: "
 msgstr "EAN: "
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
@@ -534,6 +523,11 @@ msgstr "Rechnungsanschrift:"
 msgid "Cannot delete Sale Order(s) which are already confirmed !"
 msgstr "Kann keinen Verkaufsauftrag löschen der bereits bestätigt wurde!"
 
+#. module: sale
+#: view:board.board:0
+msgid "Sales by Customer"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
@@ -593,7 +587,7 @@ msgstr "Nettobetrag"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr "Abzurechnende Positionen"
+msgstr "Rechnungserstellung von Lieferpositionen"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -643,18 +637,16 @@ msgid ""
 "  - The 'Invoice from the picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
-"Die Abrechnungsbedingung bestimmt die zeitliche Abfolge von Abrechnung und "
-"Lieferung .\n"
-"  -  Bei 'Zahlung vor Lieferung'  wird die Rechnung automatisch generiert, "
-"dann erst der Lieferauftrag nach Zahlungseingang .\n"
-"  -  Bei 'Auslieferung & Manuelle Rechnung' wird der Lieferauftrag sofort "
-"erzeugt, die Abrechnung muss später manuell erstellt werden.\n"
-"  -  Bei 'Rechnung durch Auftrag nach Lieferung' wird die Abrechnung "
-"automatisch nach vollständiger Lieferung auf Basis des Verkaufsauftrags "
-"erstellt.\n"
-"  -  Bei 'Rechnung durch Auslieferung' erfolgt die Abechnung im "
-"unmittelbaren Anschluss an die Bearbeitung von Lieferaufträgen auf Basis "
-"gelieferter Mengen."
+"Die Abrechnungsbedingung bestimmt die zeitliche Abfolge von "
+"Rechnungsstellung und Lieferung .\n"
+"  - Bei 'Zahlung vor Lieferung'  wird zuerst die Rechnung generiert, dann "
+"erfolgt ein Lieferauftrag aufgrund der Zahlung .\n"
+"  -  Bei 'Lieferung & Manuelle Rechnung' ist der Lieferauftrag unmittelbar "
+"verfügbar. Die Rechnung muss dann noch manuell erzeugt werden.\n"
+"  -  Bei 'Rechnung durch Auftrag' erfolgt eine automatische Rechnung im "
+"Status Entwurf, wenn die Lieferung vollständig abgeschlossen wurde.\n"
+"  - Bei  'Rechnung durch Lieferung' kann bei Abschluss einer Auslieferung "
+"eine Rechnung  gleich mit erstellt werden."
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -674,11 +666,6 @@ msgstr "Menge"
 msgid "It indicates that an invoice has been paid"
 msgstr "Zeigt an, dass die Rechnung bezahlt wurde"
 
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
@@ -739,8 +726,6 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
 msgstr "Verkäufe nach Monaten"
@@ -776,15 +761,9 @@ msgid "Exception"
 msgstr "Fehlerliste"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
-#, python-format
-msgid ""
-"You cannot make an advance on a sale order                              that "
-"is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Sie können keine Anzahlungsrechnung für einen Verkaufsauftrag erstellen, der "
-"mit der Abrechnungsmethode 'Automatische Rechnung nach Lieferung' erstellt "
-"wurde"
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Teilmengen direkt liefern"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -945,6 +924,12 @@ msgstr ""
 "Incoterm bedeutet 'International commercial terms\"und beschreibt die "
 "Lieferbedingungen."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
@@ -1031,11 +1016,6 @@ msgstr "Preisliste Verkauf"
 msgid "Create Delivery Order"
 msgstr "Erzeugt Lieferauftrag"
 
-#. module: sale
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
-
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
@@ -1065,7 +1045,7 @@ msgstr "Verkäufe je Produkt Kategorie"
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr "Teilmengen direkt liefern"
+msgstr "Lieferung von Teilmenge"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1088,7 +1068,7 @@ msgstr "Wiederherstellung Rechnung"
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr "Abzurechnende Lieferungen"
+msgstr "Rechnungserstellung von Lieferaufträgen"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1105,7 +1085,7 @@ msgstr "Fehlerhafter Modus für test_state"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr "Dispositionsmethode"
+msgstr "Dispositionsverfahren"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -1121,7 +1101,7 @@ msgstr "Kommissionsliste"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from Delivery"
-msgstr "Rechnung durch Auslieferung"
+msgstr "Rechnung durch Lieferung"
 
 #. module: sale
 #: view:sale.order:0
@@ -1137,7 +1117,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr "Beleg für Versand oder Auslieferung"
+msgstr "Beleg für Warenversand oder Auslieferung"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1173,7 +1153,7 @@ msgstr "Umsatzsteuer"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "Abrechnungsbedingungen"
+msgstr "Abrechnungsbedingung"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1221,9 +1201,11 @@ msgstr ""
 "* Es erfolgt ein Wechsel auf den Status 'Bestätigt' bei der "
 "Auftragungsbestätigung .\n"
 "* Der Status 'Fehlermeldung' wird angezeigt, wenn der bezugnehmende Auftrag "
-"nicht korrekt bestätigt werden kann.* Der 'Erledigt' Status wird angezeigt, "
-"wenn der zugehörige Lieferauftrag erledigt wurde.* Der Status 'Abgebrochen' "
-"wird angezeigt, wenn ein Benutzer den Auftrag storniert."
+"nicht korrekt verarbeitet werden kann.\n"
+"* Der 'Erledigt' Status wird angezeigt, wenn der zugehörige Lieferauftrag "
+"erledigt wurde.\n"
+"* Der Status 'Abgebrochen' wird angezeigt, wenn ein Benutzer den Auftrag "
+"storniert hat."
 
 #. module: sale
 #: view:sale.order:0
@@ -1251,11 +1233,6 @@ msgstr "Verkäufe nach Produktkategorien"
 msgid "Shipped Quantities"
 msgstr "Ausgelieferte Menge"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
@@ -1267,9 +1244,14 @@ msgid "Picking List"
 msgstr "Lieferschein"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Disposition vom Lager"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
+msgstr ""
+"Der Verkäufer bestätigt das Angebot und erstellt dadurch einen "
+"Verkaufsauftrag mit dem Status \"In Bearbeitung\" oder \"Manuell In "
+"Bearbeitung \""
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1301,7 +1283,7 @@ msgstr "Gruppiere Rechnungen"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr "Auslieferung & Manuelle Rechnung"
+msgstr "Lieferung & Manuelle Rechnung"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1342,24 +1324,11 @@ msgstr "Steuert die Beschaffungsaufträge von jeder Verkaufsauftragszeile"
 msgid "Create invoices"
 msgstr "Erzeuge Rechnungen"
 
-#. module: sale
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
-"Beschaffung muss in derselben Kategorie sein."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr "Verkaufsauftragszeile Erzeuge Rechnung"
 
-#. module: sale
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
 #. module: sale
 #: help:sale.config.picking_policy,step:0
 msgid ""
@@ -1428,7 +1397,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Related Invoices"
-msgstr "Rechnungen zu Auftrag"
+msgstr "Rechnungsbezug"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
@@ -1471,11 +1440,6 @@ msgstr "sale.installer"
 msgid "Invoice"
 msgstr "Rechnung"
 
-#. module: sale
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
-
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1487,14 +1451,6 @@ msgstr "Kann Verkaufsauftragszeile nicht stornieren"
 msgid "Picking List & Delivery Order"
 msgstr "Lieferauftrag & Auslieferung"
 
-#. module: sale
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
@@ -1503,7 +1459,7 @@ msgstr "Zu erledigen"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr "Lieferausführung"
+msgstr "Auslieferungsbedingung"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
@@ -1532,7 +1488,7 @@ msgstr "Produkt"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr "Abrechnung"
+msgstr "Ausgangsrechnungen"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1575,16 +1531,9 @@ msgstr "Manuell in Bearbeitung"
 msgid "Product UoM"
 msgstr "Produkt ME"
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-#: view:sale.report:0
-msgid "Sales By Salesman"
-msgstr "Verkäufe nach Verkäufer"
-
 #. module: sale
 #: view:sale.order:0
-msgid "Logistics"
+msgid "Logistic"
 msgstr "Logistik"
 
 #. module: sale
@@ -1763,6 +1712,12 @@ msgstr "Geplante Lieferung am"
 msgid "Warning"
 msgstr "Warnung"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
@@ -1789,6 +1744,11 @@ msgstr "Bestätigt"
 msgid "Confirm"
 msgstr "Bestätigen"
 
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1806,7 +1766,7 @@ msgstr "Rechnungszeilen"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr "Auftragspositionen"
+msgstr "Verkaufsauftragpositionen"
 
 #. module: sale
 #: field:sale.order.line,delay:0
@@ -1828,7 +1788,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr "Rechnung durch Auftrag nach Auslieferung"
+msgstr "Rechnung durch Auftrag"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -1842,7 +1802,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "Rechnung durch Auslieferung"
+msgstr "Lieferung der Gesamtmenge"
 
 #. module: sale
 #: view:sale.report:0
@@ -1862,7 +1822,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source document"
-msgstr "Belegreferenz"
+msgstr "Referenzbeleg"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1893,7 +1853,8 @@ msgid ""
 "You have to select a customer in the sale form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
-"Bitte Kunden im Verkaufsauftragsformular vor der Produktauswahl auswählen"
+"Bitte Kunden im Verkaufsauftragsformular auswählen !\n"
+"Sie sollten diese Auswahl vor der Produktauswahl durchführen."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1980,9 +1941,15 @@ msgid "Payment Terms"
 msgstr "Zahlungsbedingungen"
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Teilmengen direkt liefern"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order                              that "
+"is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"Sie können keine Anzahlungsrechnung für einen Verkaufsauftrag erstellen, der "
+"mit der Abrechnungsmethode 'Automatische Rechnung nach Lieferung' erstellt "
+"wurde"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -2044,14 +2011,9 @@ msgid "Date Order"
 msgstr "Auftragsdatum"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sale order becomes 'In "
-"progress' or 'Manual in progress'."
-msgstr ""
-"Der Verkäufer bestätigt das Angebot und erstellt dadurch einen "
-"Verkaufsauftrag mit dem Status \"In Bearbeitung\" oder \"Manuell In "
-"Bearbeitung \""
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Disposition vom Lager"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -2059,21 +2021,11 @@ msgstr ""
 msgid "Sale Shop"
 msgstr "Verkaufsshop"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales By Customer"
-msgstr "Verkauf je Kunde"
-
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
 msgstr "Fertig"
 
-#. module: sale
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
@@ -2085,6 +2037,11 @@ msgstr "Ausgeliefert"
 msgid "Not enough stock !"
 msgstr "Nicht genügend Lagerware!"
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
@@ -2196,7 +2153,7 @@ msgstr "Angebot Nr."
 #: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
-msgstr "Verpackt"
+msgstr "Ausgeliefert"
 
 #. module: sale
 #: view:sale.report:0
@@ -2313,6 +2270,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Packing"
 #~ msgstr "Packliste"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Sales orders"
 #~ msgstr "Verkauf Aufträge"
 
@@ -2414,6 +2374,12 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Advance Payment"
 #~ msgstr "Weiter Bezahlung"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Bestätige Verkaufsauftrag und Erzeuge Rechnung."
 
@@ -2649,6 +2615,14 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Sales by State"
 #~ msgstr "Verkäufe je Staat"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
+#~ "Mengeneinheit"
+
+#~ msgid "Sales By Partner"
+#~ msgstr "Verkauf je Partner"
+
 #~ msgid ""
 #~ "Number of days between the order confirmation the the shipping of the "
 #~ "products to the customer"
@@ -2662,8 +2636,14 @@ msgstr "Rechnung durch Lieferung"
 #~ "   'for this product: \"%s\" (id:%d)"
 #~ msgstr "Für diesen Produkt \"%s\" ist kein Erlöskonto definiert:  (id:%d)"
 
-#~ msgid "Logistic"
-#~ msgstr "Logistik"
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
+
+#~ msgid "Sales By Customer"
+#~ msgstr "Verkauf je Kunde"
 
 #, python-format
 #~ msgid ""
@@ -2672,3 +2652,27 @@ msgstr "Rechnung durch Lieferung"
 #~ msgstr ""
 #~ "Für \"automatische Rechnung nach Lieferung\" kann keine Anzahlung gemacht "
 #~ "werden."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
+#~ "Beschaffung muss in derselben Kategorie sein."
+
+#~ msgid "Sales By Salesman"
+#~ msgstr "Verkäufe nach Verkäufer"
+
+#~ msgid "Logistics"
+#~ msgstr "Logistik"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "Eine Regel sollte mindestens ein Zugriffsrecht aktiviert haben."
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index c686d3804bc..e066a16bbc1 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -6,22 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-29 07:25+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:49+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: sale
 #: help:sale.order,picking_policy:0
 msgid ""
@@ -43,12 +38,6 @@ msgstr "Día"
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-#: view:sale.report:0
-msgid "Sales By Partner"
-msgstr "Ventas por empresa"
-
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
@@ -164,11 +153,6 @@ msgstr "Desc.(%)"
 msgid "Total Price"
 msgstr "Precio total"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
@@ -179,6 +163,13 @@ msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 msgid "Ordered Quantities"
 msgstr "Cantidades ordenadas"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por comercial"
+
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -218,11 +209,6 @@ msgstr ""
 "por líneas. No necesita esta lista si factura basándose en albaranes de "
 "entrega o si factura las ventas integralmente."
 
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
@@ -313,6 +299,11 @@ msgstr "Agosto"
 msgid "EAN: "
 msgstr "EAN: "
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
@@ -537,6 +528,11 @@ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 msgstr ""
 "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
 
+#. module: sale
+#: view:board.board:0
+msgid "Sales by Customer"
+msgstr "Ventas por cliente"
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
@@ -677,11 +673,6 @@ msgstr "Nº de ctdad"
 msgid "It indicates that an invoice has been paid"
 msgstr "Indica que una factura ha sido pagada."
 
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
@@ -742,8 +733,6 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
 msgstr "Ventas por mes"
@@ -779,14 +768,9 @@ msgid "Exception"
 msgstr "Excepción"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
-#, python-format
-msgid ""
-"You cannot make an advance on a sale order                              that "
-"is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No puede realizar un avance de factura de un pedido de venta definido como "
-"'Factura automática después envío'."
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Envío directo"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -935,6 +919,12 @@ msgstr ""
 "Incoterm que significa 'Términos de Comercio Internacional \"implica una "
 "serie de términos de venta que se utilizan en la transacción comercial."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
@@ -1016,11 +1006,6 @@ msgstr "Tarifas de venta"
 msgid "Create Delivery Order"
 msgstr "Crear orden de entrega"
 
-#. module: sale
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
-
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
@@ -1239,11 +1224,6 @@ msgstr "Ventas por categoría de producto"
 msgid "Shipped Quantities"
 msgstr "Cantidades enviadas"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
@@ -1255,9 +1235,13 @@ msgid "Picking List"
 msgstr "Albarán"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte en 'En progreso' o 'Manual en progreso'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1330,24 +1314,11 @@ msgstr "Genera órdenes de abastecimiento para cada línea del pedido de venta"
 msgid "Create invoices"
 msgstr "Crear facturas"
 
-#. module: sale
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr "Venta Línea_pedido Realizar_factura"
 
-#. module: sale
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: sale
 #: help:sale.config.picking_policy,step:0
 msgid ""
@@ -1459,11 +1430,6 @@ msgstr "venta.instalador"
 msgid "Invoice"
 msgstr "Factura"
 
-#. module: sale
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1475,14 +1441,6 @@ msgstr "¡Podría no cancelar la línea de pedido de venta!"
 msgid "Picking List & Delivery Order"
 msgstr "Albarán y Orden de entrega"
 
-#. module: sale
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
@@ -1563,16 +1521,9 @@ msgstr "Manual en proceso"
 msgid "Product UoM"
 msgstr "UdM del producto"
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-#: view:sale.report:0
-msgid "Sales By Salesman"
-msgstr "Ventas por comercial"
-
 #. module: sale
 #: view:sale.order:0
-msgid "Logistics"
+msgid "Logistic"
 msgstr "Logística"
 
 #. module: sale
@@ -1750,6 +1701,12 @@ msgstr "Fecha confirmación"
 msgid "Warning"
 msgstr "Aviso"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
@@ -1776,6 +1733,11 @@ msgstr "Confirmado"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1970,9 +1932,14 @@ msgid "Payment Terms"
 msgstr "Plazos de pago"
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order                              that "
+"is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"No puede realizar un avance de factura de un pedido de venta definido como "
+"'Factura automática después envío'."
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -2034,13 +2001,9 @@ msgid "Date Order"
 msgstr "Fecha pedido"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sale order becomes 'In "
-"progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
-"convierte en 'En progreso' o 'Manual en progreso'."
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -2048,21 +2011,11 @@ msgstr ""
 msgid "Sale Shop"
 msgstr "Tienda de ventas"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales By Customer"
-msgstr "Ventas por cliente"
-
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: sale
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
@@ -2074,6 +2027,11 @@ msgstr "Entregado"
 msgid "Not enough stock !"
 msgstr "¡No hay stock suficiente!"
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
@@ -2299,6 +2257,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Packing"
 #~ msgstr "Empaquetado/Albarán"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
 #~ msgid "Sales orders"
 #~ msgstr "Pedidos de ventas"
 
@@ -2339,6 +2303,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales Process"
 #~ msgstr "Proceso de ventas"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mis ventas en excepción de envío"
 
@@ -2393,6 +2363,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Advance Payment"
 #~ msgstr "Pago anticipado"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Confirmar pedido de venta y crear factura."
 
@@ -2467,6 +2443,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Related Packing"
 #~ msgstr "Albarán relacionado"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Facturar desde el albarán"
 
@@ -2641,6 +2620,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales by State"
 #~ msgstr "Ventas por estado"
 
+#~ msgid "Sales By Partner"
+#~ msgstr "Ventas por empresa"
+
 #~ msgid ""
 #~ "Number of days between the order confirmation the the shipping of the "
 #~ "products to the customer"
@@ -2665,8 +2647,11 @@ msgstr "Facturar desde albaranes"
 #~ "comercial. En función del control de facturación del pedido de venta, la "
 #~ "factura se basa en las cantidades enviadas o en las ordenadas."
 
-#~ msgid "Logistic"
-#~ msgstr "Logística"
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "Sales By Salesman"
+#~ msgstr "Ventas por comercial"
 
 #, python-format
 #~ msgid ""
@@ -2676,5 +2661,26 @@ msgstr "Facturar desde albaranes"
 #~ "No se puede hacer un anticipo de un pedido de venta \\n que esté defino como "
 #~ "'Facturar pedido después del envío'."
 
+#~ msgid "Sales By Customer"
+#~ msgstr "Ventas por cliente"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
 #~ msgid "Configure Sale Order Logistics"
 #~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Logistics"
+#~ msgstr "Logística"
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index ea6e0907b0e..7ecb52f2670 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/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: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:47+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 10:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index a846f299c1e..f9b76e973a5 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-27 13:04+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 20:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: sale
 #: help:sale.order,picking_policy:0
 msgid ""
@@ -42,12 +37,6 @@ msgstr "День"
 msgid "Cancel Order"
 msgstr "Отменить заказа"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-#: view:sale.report:0
-msgid "Sales By Partner"
-msgstr "Продажи по партнеру"
-
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
@@ -162,11 +151,6 @@ msgstr "Дисконт (%)"
 msgid "Total Price"
 msgstr "Итоговая цена"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
@@ -177,6 +161,13 @@ msgstr "Отметьте для группирования счетов по з
 msgid "Ordered Quantities"
 msgstr "Заказанное кол-во"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Продажи по менеджеру"
+
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -212,13 +203,6 @@ msgid ""
 "sales totally."
 msgstr ""
 
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-"категориям."
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
@@ -306,6 +290,11 @@ msgstr "Август"
 msgid "EAN: "
 msgstr "EAN: "
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
@@ -523,6 +512,11 @@ msgstr "Адрес счета:"
 msgid "Cannot delete Sale Order(s) which are already confirmed !"
 msgstr "Нельзя удалить подтвержденный заказ на продажу !"
 
+#. module: sale
+#: view:board.board:0
+msgid "Sales by Customer"
+msgstr "Продажи по заказчику"
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
@@ -662,11 +656,6 @@ msgstr "Кол-во"
 msgid "It indicates that an invoice has been paid"
 msgstr "Показывает, что счет был оплачен"
 
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
@@ -727,8 +716,6 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr "Вы уверены, что хотите создать счет(а) ?"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
 msgstr "Продажи по месяцу"
@@ -746,7 +733,7 @@ msgstr "Закупка проданного материала"
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "Создать итоговый счет"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -764,12 +751,9 @@ msgid "Exception"
 msgstr "Исключительная ситуация"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
-#, python-format
-msgid ""
-"You cannot make an advance on a sale order                              that "
-"is defined as 'Automatic Invoice after delivery'."
-msgstr ""
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Прямая доставка"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -916,6 +900,12 @@ msgstr ""
 "собой стандартные условия договора международной купли-продажи, которые "
 "определены заранее в международно признанном документе."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Продажи по партнеру"
+
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
@@ -997,11 +987,6 @@ msgstr "Каталоги продаж"
 msgid "Create Delivery Order"
 msgstr "Создать заказ на доставку"
 
-#. module: sale
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Правила не поддерживаются для объектов osv_memory !"
-
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
@@ -1218,11 +1203,6 @@ msgstr "Продажи по категориям продукции"
 msgid "Shipped Quantities"
 msgstr "Отправленное количество"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
@@ -1234,9 +1214,13 @@ msgid "Picking List"
 msgstr "Комплектовочный лист"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "из запасов"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
+msgstr ""
+"Менеджер продаж подтверждает предложение. Состояние заказа на продажу "
+"становится \"В процессе\" или \"В процессе вручную\"."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1309,24 +1293,11 @@ msgstr "Управляет заказами на снабжение для ка
 msgid "Create invoices"
 msgstr "Создать счета"
 
-#. module: sale
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Ошибка. ед.изм. по умолчанию и закупочные ед.изм. должны иметь одинаковую "
-"категорию."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
-#. module: sale
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: sale
 #: help:sale.config.picking_policy,step:0
 msgid ""
@@ -1437,11 +1408,6 @@ msgstr "sale.installer"
 msgid "Invoice"
 msgstr "Счет"
 
-#. module: sale
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1453,14 +1419,6 @@ msgstr "Нельзя отменить позицию заказа на прод
 msgid "Picking List & Delivery Order"
 msgstr "Комплектовочный лист & Заказ на доставку"
 
-#. module: sale
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
@@ -1541,16 +1499,9 @@ msgstr "В процессе вручную"
 msgid "Product UoM"
 msgstr "Ед. изм. продукции"
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-#: view:sale.report:0
-msgid "Sales By Salesman"
-msgstr "Продажи по менеджеру продаж"
-
 #. module: sale
 #: view:sale.order:0
-msgid "Logistics"
+msgid "Logistic"
 msgstr "Логистика"
 
 #. module: sale
@@ -1725,6 +1676,12 @@ msgstr "Дата подтверждения"
 msgid "Warning"
 msgstr "Внимание"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Продажи по месяцу"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
@@ -1751,6 +1708,11 @@ msgstr "Подтвержден"
 msgid "Confirm"
 msgstr "Подтвердить"
 
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1942,9 +1904,12 @@ msgid "Payment Terms"
 msgstr "Условия оплаты"
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Прямая доставка"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order                              that "
+"is defined as 'Automatic Invoice after delivery'."
+msgstr ""
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -2006,13 +1971,9 @@ msgid "Date Order"
 msgstr "Дата заказа"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sale order becomes 'In "
-"progress' or 'Manual in progress'."
-msgstr ""
-"Менеджер продаж подтверждает предложение. Состояние заказа на продажу "
-"становится \"В процессе\" или \"В процессе вручную\"."
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "из запасов"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -2020,21 +1981,11 @@ msgstr ""
 msgid "Sale Shop"
 msgstr "Магазин"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales By Customer"
-msgstr "Продажи по заказчику"
-
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
 msgstr "Закрыть"
 
-#. module: sale
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
@@ -2046,6 +1997,11 @@ msgstr "Доставлено"
 msgid "Not enough stock !"
 msgstr "Запасов не достаточно !"
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
@@ -2186,6 +2142,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Net Price"
 #~ msgstr "Цена до налогов"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "My Quotations"
 #~ msgstr "Мои предложения"
 
@@ -2207,6 +2166,12 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Other data"
 #~ msgstr "Прочие данные"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr "Вы действительно хотите создать эти счета?"
 
@@ -2248,6 +2213,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Invoice after delivery"
 #~ msgstr "Счет после доставки"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Доставка клиенту со склада."
 
@@ -2309,6 +2277,11 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Payment accounts"
 #~ msgstr "Бух. счета платежа"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr ""
+#~ "Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
+#~ "категориям."
+
 #~ msgid "Sales orders"
 #~ msgstr "Заказы на продажу"
 
@@ -2324,6 +2297,12 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Procurement for each line"
 #~ msgstr "Снабжение для каждой позиции"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Ошибка. ед.изм. по умолчанию и закупочные ед.изм. должны иметь одинаковую "
+#~ "категорию."
+
 #~ msgid "Sales Process"
 #~ msgstr "Процесс продаж"
 
@@ -2353,6 +2332,9 @@ msgstr "Счет основанный на доставках"
 #~ "Вы не можете сделать аванс по заказу на продажу \\n что определяется как "
 #~ "'Автоматически, счет после доставки'."
 
+#~ msgid "Sales By Partner"
+#~ msgstr "Продажи по партнеру"
+
 #~ msgid ""
 #~ "A sale order generates an invoice, as soon as it is confirmed by the "
 #~ "salesman. Depending on the Invoicing control of the sale order, the invoice "
@@ -2361,3 +2343,18 @@ msgstr "Счет основанный на доставках"
 #~ "Заказ на продажу генерирует счет как только он подтверждается менеджером "
 #~ "продаж. В зависимости от режима управления выставлением счетов по заказам на "
 #~ "продажу, счет основан на доставленном или заказанном количестве."
+
+#~ msgid "Sales By Salesman"
+#~ msgstr "Продажи по менеджеру продаж"
+
+#~ msgid "Sales By Customer"
+#~ msgstr "Продажи по заказчику"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Правила не поддерживаются для объектов osv_memory !"
+
+#~ msgid "Logistics"
+#~ msgstr "Логистика"
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 5fe8f9fcb16..2780a4c61b4 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-27 12:28+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 19:20+0000\n"
+"Last-Translator: Roger Zeng <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
-
 #. module: sale
 #: help:sale.order,picking_policy:0
 msgid ""
@@ -40,12 +35,6 @@ msgstr ""
 msgid "Cancel Order"
 msgstr "取消订单"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-#: view:sale.report:0
-msgid "Sales By Partner"
-msgstr ""
-
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
@@ -153,11 +142,6 @@ msgstr "折扣(%)"
 msgid "Total Price"
 msgstr "价格合计"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
@@ -168,6 +152,13 @@ msgstr ""
 msgid "Ordered Quantities"
 msgstr "已订数量"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
@@ -203,11 +194,6 @@ msgid ""
 "sales totally."
 msgstr ""
 
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误:销售单位必须和计量单位在不同的分类."
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
@@ -228,7 +214,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr "降价 (%)"
+msgstr "折扣(%)"
 
 #. module: sale
 #: view:board.board:0
@@ -241,7 +227,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sale order !"
-msgstr ""
+msgstr "不能取消销售订单！"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -293,6 +279,11 @@ msgstr ""
 msgid "EAN: "
 msgstr ""
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
@@ -505,6 +496,11 @@ msgstr "发票地址:"
 msgid "Cannot delete Sale Order(s) which are already confirmed !"
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+msgid "Sales by Customer"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
@@ -578,7 +574,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr "已送货未开发票订单行"
+msgstr "未开票已送货明细"
 
 #. module: sale
 #: report:sale.order:0
@@ -594,7 +590,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "无效动作！"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -629,11 +625,6 @@ msgstr ""
 msgid "It indicates that an invoice has been paid"
 msgstr ""
 
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
@@ -694,8 +685,6 @@ msgid "Do you really want to create the invoice(s) ?"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
 msgstr ""
@@ -731,12 +720,9 @@ msgid "Exception"
 msgstr "异常"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
-#, python-format
-msgid ""
-"You cannot make an advance on a sale order                              that "
-"is defined as 'Automatic Invoice after delivery'."
-msgstr ""
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "直接送货"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -872,6 +858,12 @@ msgid ""
 "series of sales terms which are used in the commercial transaction"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
@@ -953,11 +945,6 @@ msgstr "销售价格表"
 msgid "Create Delivery Order"
 msgstr ""
 
-#. module: sale
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
@@ -1159,15 +1146,10 @@ msgstr ""
 msgid "Shipped Quantities"
 msgstr "已运数量"
 
-#. module: sale
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr "发票基于销售订单"
+msgstr "基于销售订单开票"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1175,15 +1157,17 @@ msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "来自库存"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
+msgstr ""
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1250,22 +1234,11 @@ msgstr ""
 msgid "Create invoices"
 msgstr "创建发票"
 
-#. module: sale
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
-#. module: sale
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: sale
 #: help:sale.config.picking_policy,step:0
 msgid ""
@@ -1369,11 +1342,6 @@ msgstr ""
 msgid "Invoice"
 msgstr "发票"
 
-#. module: sale
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1385,12 +1353,6 @@ msgstr ""
 msgid "Picking List & Delivery Order"
 msgstr ""
 
-#. module: sale
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
@@ -1471,16 +1433,9 @@ msgstr "手动进展"
 msgid "Product UoM"
 msgstr "产品计量单位"
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-#: view:sale.report:0
-msgid "Sales By Salesman"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
-msgid "Logistics"
+msgid "Logistic"
 msgstr ""
 
 #. module: sale
@@ -1647,6 +1602,12 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
@@ -1673,6 +1634,11 @@ msgstr "已确认"
 msgid "Confirm"
 msgstr "确认"
 
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
@@ -1854,9 +1820,12 @@ msgid "Payment Terms"
 msgstr "付款条件"
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "直接送货"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order                              that "
+"is defined as 'Automatic Invoice after delivery'."
+msgstr ""
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
@@ -1918,11 +1887,9 @@ msgid "Date Order"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sale order becomes 'In "
-"progress' or 'Manual in progress'."
-msgstr ""
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "来自库存"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
@@ -1930,21 +1897,11 @@ msgstr ""
 msgid "Sale Shop"
 msgstr "销售商店"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales By Customer"
-msgstr ""
-
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
 msgstr "关闭"
 
-#. module: sale
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
@@ -1956,6 +1913,11 @@ msgstr ""
 msgid "Not enough stock !"
 msgstr ""
 
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
@@ -2164,6 +2126,9 @@ msgstr "发票基于送货单"
 #~ msgid "Automatic Declaration"
 #~ msgstr "一般信息"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在这动作定义中有无效的模块名"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2250,9 +2215,15 @@ msgstr "发票基于送货单"
 #~ msgid "Packing"
 #~ msgstr "包装"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
 #~ msgid "Related Packing"
 #~ msgstr "相关的包装"
 
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "错误:销售单位必须和计量单位在不同的分类."
+
 #~ msgid "Customer Ref"
 #~ msgstr "客户参考"
 
@@ -2278,6 +2249,10 @@ msgstr "发票基于送货单"
 #~ "order"
 #~ msgstr "这设置步骤用来设定建立销售订单的默认领料/提货方式"
 
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "我销售的运输异常"
 
@@ -2343,6 +2318,10 @@ msgstr "发票基于送货单"
 #~ msgid "Advance Payment"
 #~ msgstr "预付款支付"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "确认销售订单并创建发票"
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 38a66bb3ccb..05a71edb065 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -671,6 +671,8 @@ class sale_order(osv.osv):
     def action_ship_create(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         picking_id = False
+        move_obj = self.pool.get('stock.move')
+        proc_obj = self.pool.get('procurement.order')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for order in self.browse(cr, uid, ids, context={}):
             proc_ids = []
@@ -722,6 +724,7 @@ class sale_order(osv.osv):
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
+                    
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -742,6 +745,16 @@ class sale_order(osv.osv):
                     })
                     proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+                    
+                    if order.state == 'shipping_except':
+                        for pick in order.picking_ids:
+                            for move in pick.move_lines:
+                                if move.state == 'cancel':
+                                    mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+                                    if mov_ids:
+                                        for mov in move_obj.browse(cr, uid, mov_ids):
+                                            move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                                            proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
 
             val = {}
             for proc_id in proc_ids:
@@ -749,9 +762,10 @@ class sale_order(osv.osv):
 
             if picking_id:
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
+            
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
+                val['shipped'] = False
 
                 if (order.order_policy == 'manual'):
                     for line in order.order_line:
@@ -875,7 +889,7 @@ class sale_order_line(osv.osv):
                     \n* The \'Exception\' state is set when the related sale order is set as exception. \
                     \n* The \'Done\' state is set when the sale order line has been picked. \
                     \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
-        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
+        'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
@@ -1053,11 +1067,14 @@ class sale_order_line(osv.osv):
             q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
 #            qty = qty - qty % q + q
             if qty and (q and not (qty % q) == 0):
-                ean = pack.ean
+                ean = pack.ean or _('(n/a)')
                 qty_pack = pack.qty
                 type_ul = pack.ul
-                warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
-                warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
+                warn_msg = _("You selected a quantity of %d Units.\n"
+                            "But it's not compatible with the selected packaging.\n"
+                            "Here is a proposition of quantities according to the packaging:\n\n"
+                            "EAN: %s Quantity: %s Type of ul: %s") % \
+                                (qty, ean, qty_pack, type_ul.name)
                 warning = {
                     'title': _('Picking Information !'),
                     'message': warn_msg
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 39b1996ee88..88f15e00ec0 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -51,3 +51,5 @@
 "access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
 "access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
+"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,1,1,0
+"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 0392d683db2..fd6feb3366f 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:29+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 16:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -22,29 +22,16 @@ msgstr ""
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: sale_crm
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: sale_crm
-#: view:account.invoice.report:0
-#: view:board.board:0
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
 msgstr "Convertir a presupuesto"
 
 #. module: sale_crm
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#, python-format
+msgid "is converted to Quotation."
+msgstr "se ha convertido a presupuesto."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -59,14 +46,9 @@ msgid "Customer has no addresses defined!"
 msgstr "¡El cliente no tiene definidas direcciones!"
 
 #. module: sale_crm
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: sale_crm
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -82,14 +64,10 @@ msgid "Convert to Quote"
 msgstr "Convertir a presupuesto"
 
 #. module: sale_crm
-#: view:crm.make.sale:0
-msgid "_Create"
-msgstr "_Crear"
-
-#. module: sale_crm
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -98,9 +76,9 @@ msgid "Converted to Sales Quotation(id: %s)."
 msgstr "Convertido a presupuesto de venta (id: %s)."
 
 #. module: sale_crm
-#: model:ir.model,name:sale_crm.model_crm_make_sale
-msgid "Make sale"
-msgstr "Realizar venta"
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un presupuesto"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -139,12 +117,6 @@ msgstr "Tienda"
 msgid "My Quotations"
 msgstr "Mis presupuestos"
 
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
-#, python-format
-msgid "is converted to Quotation."
-msgstr "se ha convertido a presupuesto."
-
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
@@ -154,23 +126,18 @@ msgstr "Cerrar oportunidad"
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr "Equipo ventas"
+msgstr "Equipo de ventas"
 
 #. module: sale_crm
-#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
-msgid "Make Quotation"
-msgstr "Realizar un presupuesto"
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sale"
+msgstr "Realizar venta"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: sale_crm
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #~ msgid "All at once"
 #~ msgstr "Todo junto"
 
@@ -186,6 +153,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Create"
 #~ msgstr "Crear"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Opportunity goes into the quotation"
 #~ msgstr "Oportunidad se convierte en presupuesto"
 
@@ -265,3 +235,21 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Sale CRM Stuff"
 #~ msgstr "Herramientas CRM para ventas"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index bac0051e0d1..b5d6a0ee0fc 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -33,7 +33,7 @@
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
                 <field name="date_order" position="after">
-                    <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sales Team" groups="base.group_extended">
+                    <field name="section_id" widget="selection" string="Sales Team" groups="base.group_extended">
                         <filter icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
                                 groups="base.group_extended"
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 055ff26f2d2..037cb7625cc 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -6,81 +6,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale_journal
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: sale_journal
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
-#. module: sale_journal
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Ventas & Compras"
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
-
-#. module: sale_journal
-#: help:res.partner,property_invoice_type:0
-msgid "The type of journal used for sales and picking."
-msgstr "El tipo de diario utilizado para ventas y albaranes."
-
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 msgid "Note"
 msgstr "Nota"
 
 #. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Grouped"
-msgstr "Agrupado"
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "El tipo de diario utilizado para ventas y albaranes."
 
 #. module: sale_journal
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: sale_journal
-#: field:sale.order,invoice_type_id:0
-#: view:sale_journal.invoice.type:0
-#: field:sale_journal.invoice.type,name:0
-#: field:stock.picking,invoice_type_id:0
-msgid "Invoice Type"
-msgstr "Tipo de factura"
-
-#. module: sale_journal
-#: help:sale_journal.invoice.type,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the invoice "
-"type without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
-"eliminarlo."
-
-#. module: sale_journal
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sale Order"
+msgstr "Pedido venta"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -99,45 +49,29 @@ msgstr ""
 "según las necesidades del cliente: cada día, cada miércoles, mensuales, ..."
 
 #. module: sale_journal
-#: field:sale_journal.invoice.type,invoicing_method:0
-msgid "Invoicing method"
-msgstr "Método de facturación"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
 
 #. module: sale_journal
-#: field:sale_journal.invoice.type,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: sale_journal
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
+"eliminarlo."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
 msgid "Notes"
 msgstr "Notas"
 
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_order
-msgid "Sale Order"
-msgstr "Pedido venta"
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Non grouped"
-msgstr "No agrupado"
-
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
 msgstr "Método de facturación"
 
-#. module: sale_journal
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
@@ -146,9 +80,37 @@ msgid "Invoice Types"
 msgstr "Tipos de factura"
 
 #. module: sale_journal
-#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
-msgid "Managing sales and deliveries by journal"
-msgstr "Gestionar ventas y entregas por diario"
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "No agrupado"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Tipo de factura"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
@@ -156,9 +118,14 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: sale_journal
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Gestionar ventas y entregas por diario"
 
 #~ msgid "Confirmed packing"
 #~ msgstr "Albarán confirmado"
@@ -220,6 +187,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Average Price"
 #~ msgstr "Precio medio"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -313,6 +283,12 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Open"
 #~ msgstr "Abierto"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Responsible"
 #~ msgstr "Responsable"
 
@@ -396,3 +372,25 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Packing to Invoice"
 #~ msgstr "Albaranes a facturar"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the invoice "
+#~ "type without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar el tipo de factura sin "
+#~ "eliminarlo."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index 48e1cbd054b..61a90e19bb4 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -6,80 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-30 14:36+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 16:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: sale_journal
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: sale_journal
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
-#. module: sale_journal
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Продажи и закупки"
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_stock_picking
-msgid "Picking List"
-msgstr "Комплектовочный лист"
-
-#. module: sale_journal
-#: help:res.partner,property_invoice_type:0
-msgid "The type of journal used for sales and picking."
-msgstr "Тип журнала для продаж и комплектации."
-
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 msgid "Note"
 msgstr "Примечание"
 
 #. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Grouped"
-msgstr "Сгруппировано"
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "Тип журнала для продаж и комплектации."
 
 #. module: sale_journal
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: sale_journal
-#: field:sale.order,invoice_type_id:0
-#: view:sale_journal.invoice.type:0
-#: field:sale_journal.invoice.type,name:0
-#: field:stock.picking,invoice_type_id:0
-msgid "Invoice Type"
-msgstr "Тип счета"
-
-#. module: sale_journal
-#: help:sale_journal.invoice.type,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the invoice "
-"type without removing it."
-msgstr ""
-"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
-"тип счета без его удаления."
-
-#. module: sale_journal
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -95,45 +45,27 @@ msgid ""
 msgstr ""
 
 #. module: sale_journal
-#: field:sale_journal.invoice.type,invoicing_method:0
-msgid "Invoicing method"
-msgstr "Метод выставления счета"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Продажи и закупки"
 
 #. module: sale_journal
-#: field:sale_journal.invoice.type,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: sale_journal
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
 msgid "Notes"
 msgstr "Примечания"
 
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_order
-msgid "Sale Order"
-msgstr "Заказ на продажу"
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Non grouped"
-msgstr "Не сгруппировано"
-
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
 msgstr "Метод выставления счета"
 
-#. module: sale_journal
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
-
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
@@ -142,9 +74,37 @@ msgid "Invoice Types"
 msgstr "Типы счетов"
 
 #. module: sale_journal
-#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
-msgid "Managing sales and deliveries by journal"
-msgstr "Управление продажами и доставками по журналам"
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "Не сгруппировано"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Сгруппировано"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Метод выставления счета"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Тип счета"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
@@ -152,9 +112,14 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: sale_journal
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Управление продажами и доставками по журналам"
 
 #~ msgid "Monthly sales"
 #~ msgstr "Продажи в месяце"
@@ -195,6 +160,9 @@ msgstr "Размер поля никогда не может быть меньш
 #~ msgid "Average Price"
 #~ msgstr "Средняя цена"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "State"
 #~ msgstr "Состояние"
 
@@ -282,6 +250,12 @@ msgstr "Размер поля никогда не может быть меньш
 #~ msgid "Open"
 #~ msgstr "Открыть"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Responsible"
 #~ msgstr "Ответственный"
 
@@ -318,5 +292,27 @@ msgstr "Размер поля никогда не может быть меньш
 #~ msgid "Packing"
 #~ msgstr "Упаковка"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Open Journal"
 #~ msgstr "Открыть журнал"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the invoice "
+#~ "type without removing it."
+#~ msgstr ""
+#~ "если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть "
+#~ "тип счета без его удаления."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 999da238c81..b3bd1b889e1 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 23:55+0000\n"
+"PO-Revision-Date: 2010-12-05 07:43+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index c5fc22eab5c..04fd695fb8d 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-29 07:57+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:54+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,29 +28,11 @@ msgstr "Categoría"
 msgid "Customer Refund"
 msgstr "Factura de abono de cliente"
 
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
 msgstr "Factura de cliente"
 
-#. module: sale_margin
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "February"
@@ -87,11 +70,6 @@ msgstr "Borrador"
 msgid "Paid"
 msgstr "Pagado"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Error! No puede crear un menú recursivo."
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -160,9 +138,9 @@ msgid "Search Margin"
 msgstr "Buscar margen"
 
 #. module: sale_margin
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: view:report.account.invoice.product:0
+msgid "This Year"
+msgstr "Este año"
 
 #. module: sale_margin
 #: field:report.account.invoice.product,date:0
@@ -216,11 +194,6 @@ msgstr "Precio coste"
 msgid "October"
 msgstr "Octubre"
 
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "This Year"
-msgstr "Este año"
-
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 #: field:report.account.invoice.product,year:0
@@ -257,11 +230,6 @@ msgstr "Importe"
 msgid "Supplier Refund"
 msgstr "Factura de abono de proveedor"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -327,6 +295,9 @@ msgid ""
 "system. You can sort and group your results by specific selection criteria "
 "to quickly find what you are looking for."
 msgstr ""
+"Este informe ofrece una visión general de todas las facturas generadas por "
+"el sistema. Puede ordenar y agrupar los resultados por criterios específicos "
+"de selección para encontrar rápidamente lo que busca."
 
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
@@ -364,10 +335,11 @@ msgstr "Abierta"
 msgid "Invoice Analysis"
 msgstr "Análisis de facturas"
 
-#. module: sale_margin
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "report.account.invoice.partner.product"
 #~ msgstr "informe.contabilidad.factura.empresa.producto"
@@ -381,6 +353,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Create invoices"
 #~ msgstr "Crear facturas"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "All Months"
 #~ msgstr "Todos los meses"
 
@@ -390,6 +365,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "report.account.invoice.partner.product.tree"
 #~ msgstr "informe.contabilidad.factura.empresa.producto.árbol"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
 #~ msgid "Supplier Invoices"
 #~ msgstr "Facturas de proveedor"
 
@@ -446,3 +424,15 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 
 #~ msgid "Invoiced date"
 #~ msgstr "fecha facturada"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Error! No puede crear un menú recursivo."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index b6679f2f110..a0b1c12a6f1 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.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: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-27 08:06+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 13:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -27,19 +27,6 @@ msgstr "Категория"
 msgid "Customer Refund"
 msgstr "Возврат денег клиенту"
 
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,type:0
 msgid "Customer Invoice"
@@ -82,11 +69,6 @@ msgstr "Черновик"
 msgid "Paid"
 msgstr "Оплачено"
 
-#. module: sale_margin
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
-
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_stock_picking
 msgid "Picking List"
@@ -246,11 +228,6 @@ msgstr "Количество"
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
-
 #. module: sale_margin
 #: selection:report.account.invoice.product,month:0
 msgid "March"
@@ -309,6 +286,17 @@ msgstr "Месяц"
 msgid "Canceled"
 msgstr "Отменено"
 
+#. module: sale_margin
+#: model:ir.actions.act_window,help:sale_margin.action_report_account_invoice_report
+msgid ""
+"This report gives you an overview of all the invoices generated by the "
+"system. You can sort and group your results by specific selection criteria "
+"to quickly find what you are looking for."
+msgstr ""
+"Этот отчет предоставляет вам обзор всех созданных системой счетов.  Для "
+"быстрого поиска вы можете сортировать и группировать результаты используя "
+"разные критерии."
+
 #. module: sale_margin
 #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
 msgid "Invoice Report"
@@ -345,12 +333,24 @@ msgstr "Открыть"
 msgid "Invoice Analysis"
 msgstr "Анализ счета"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Create invoices"
 #~ msgstr "Создать счета"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра структуры!"
+
 #~ msgid "All Months"
 #~ msgstr "Все месяцы"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия."
+
 #~ msgid "Supplier Invoices"
 #~ msgstr "Счета поставщиков"
 
@@ -362,3 +362,6 @@ msgstr "Анализ счета"
 
 #~ msgid "Cancel"
 #~ msgstr "Отмена"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 11b32dc32e3..75e322de4ca 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:22+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 22:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
@@ -28,19 +28,6 @@ msgstr "Indica la referencia del cliente desde el pedido de venta."
 msgid "Indicate the name of sale order."
 msgstr "Indica el nombre del pedido de venta."
 
-#. module: sale_mrp
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: sale_mrp
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
@@ -51,16 +38,6 @@ msgstr "Nombre venta"
 msgid "Manufacturing Order"
 msgstr "Orden de fabricación"
 
-#. module: sale_mrp
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: sale_mrp
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
@@ -72,6 +49,24 @@ msgid "Sales and MRP Management"
 msgstr "Gestión de ventas y MRP"
 
 #. module: sale_mrp
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index f47676abbe1..f293fa9d683 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,21 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-27 02:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:09+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-rating-rated"
-msgstr "terp-rating-rated"
-
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
@@ -32,21 +28,23 @@ msgstr "Verfolge Warenversand"
 msgid "Stock ups upload"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Lager bei \"Fester Lagerort\""
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "Lade in neue Verpackung"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE"
-msgstr "STOCK_SAVE"
+msgstr "Lade in neues Paket"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
@@ -58,16 +56,6 @@ msgstr "Aktion"
 msgid "Upstream Traceability"
 msgstr "Verfolgung Upstream"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-account"
-msgstr "terp-account"
-
-#. module: stock
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
@@ -75,9 +63,9 @@ msgid "Last Product Inventories"
 msgstr "Statistik Inventuren"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_ASCENDING"
-msgstr "STOCK_SORT_ASCENDING"
+#: view:stock.move:0
+msgid "Today"
+msgstr "Heute"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
@@ -87,27 +75,7 @@ msgstr "Revisions Nummer"
 #. module: stock
 #: view:stock.move.memory:0
 msgid "Product Moves"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"            product_qty = partial_data.get('product_qty',0.0)\n"
-"            move_product_qty[move.id] = product_qty\n"
-"            product_uom = partial_data.get('product_uom',False)\n"
-"            product_price = partial_data.get('product_price',0.0)\n"
-"            product_currency = partial_data.get('product_currency',False)\n"
-"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-msgstr ""
-"Kann keine zugehörigen Daten auffinden für Lagerbuchung :%s' %(move.id))\n"
-"            product_qty = partial_data.get('product_qty',0.0)\n"
-"            move_product_qty[move.id] = product_qty\n"
-"            product_uom = partial_data.get('product_uom',False)\n"
-"            product_price = partial_data.get('product_price',0.0)\n"
-"            product_currency = partial_data.get('product_currency',False)\n"
-"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+msgstr "Produktlieferungen"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -115,11 +83,16 @@ msgid ""
 "This is the list of all delivery orders that must be prepared, according to "
 "your different sales orders and your logistics rules."
 msgstr ""
+"Dies ist eine Liste aller zu bearbeitenden Lieferaufträge in Abhängigkeit "
+"der jeweiligen Verkaufsaufträge sowie der Einstellungen mit Auswirkungen auf "
+"den Warenfluss."
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
-msgid "Inventory Control"
-msgstr "Inventuraufträge"
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr "Statistik Lagerbuchungen"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -130,11 +103,6 @@ msgstr ""
 "Interne Referenzunummer, sollte diese von der Seriennummer des Herstellers "
 "abweichen."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
@@ -180,6 +148,12 @@ msgstr "Tag"
 msgid "UoM"
 msgstr "ME"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr "Inventuraufträge"
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
@@ -205,18 +179,15 @@ msgstr ""
 "je Produkt überschrieben werden kann."
 
 #. module: stock
-#: help:stock.move,address_id:0
-msgid ""
-"Optional address where goods are to be delivered, specifically used for "
-"allotment"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Missing partial picking data for move #%s"
 msgstr ""
-"Optionale Lieferadresse, die insbesondere für die Auslieferung von "
-"Konsignationen verwendet wird."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Liefere/Erhalte Produkte"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:0
@@ -232,16 +203,14 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
+"Für die ausgewählte Position wurde bereits ein(e) Paket(nummer) zugewiesen, "
+"bitte entfernen Sie es zuerst wenn Sie wirklich eine Änderung ' # für dieses "
+"Produkt: \"%s\" (id: %d) beabsichtigen"
 
 #. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Lagerort Bestandsaufnahme"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-emblem-important"
-msgstr "terp-emblem-important"
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -267,6 +236,7 @@ msgstr "Paket Identifikation"
 
 #. module: stock
 #: view:stock.move:0
+#: field:stock.move,picking_id:0
 #: field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
@@ -276,7 +246,7 @@ msgstr "Referenz"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Products to Process"
-msgstr ""
+msgstr "Produkte zu Lieferauftrag"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -291,6 +261,20 @@ msgid ""
 "products from the Supplier location into the Stock location. Each report can "
 "be performed on physicals, partners or virtual locations."
 msgstr ""
+"Definieren Sie Ihre Lagerorte zur individuellen Abbildung Ihrer "
+"Lagerorganisation. OpenERP ist in der Lage reale Lagerorte (Zentrallager, "
+"Regale, etc.), Lagerorte bei Partnern (Kunden, Lieferanten) und virtuelle "
+"Lagerorte, wie zum Beispiel das Materiallager der Produktion, abzubilden. "
+"Jede Lieferung in OpenERP erzeugt eine Lagerbuchung für ein Produkt von "
+"einem Ort zu einem Anderen. Für das Beispiel einer Produktlieferung von "
+"einem Lieferanten, erzeugt OpenERP eine Lagerbuchung vom Lieferantenlagerort "
+"zum Hauptlager. Jede Bestandsauswertung kann sowohl für reale als auch für "
+"virtuelle Lagerorte erstellt werden."
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -309,6 +293,10 @@ msgid ""
 "inventory or, once you need it, to correct the current stock level of a "
 "product."
 msgstr ""
+"Die periodische Inventur wird genutzt, um die tatsächlich verfügbare Anzahl "
+"Ihrer Produkte pro Lagerort zu erfassen. Sie können hierdurch die einmalige "
+"Jahresinventur durchführen, oder auch jederzeit aktuelle Bestände erfassen "
+"und damit den Buchbestand korrigieren."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -367,7 +355,7 @@ msgstr "Partner"
 #. module: stock
 #: help:stock.move.memory,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "Währung in der die Kosten pro Mengeneinheit angegeben wird"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -382,11 +370,6 @@ msgstr "Keine Rechnungslegung"
 msgid "Production lot"
 msgstr "Fertigungslos"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_FORWARD"
-msgstr "STOCK_MEDIA_FORWARD"
-
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
@@ -424,11 +407,6 @@ msgstr "Bestätigung Lieferung"
 msgid "State"
 msgstr "Status"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-forward"
-msgstr "terp-mail-forward"
-
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
@@ -481,12 +459,7 @@ msgstr "Erwartete Produktabgänge"
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
+msgstr "Erstellen und verwalten Sie Ihre Zentralläger."
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
@@ -510,30 +483,21 @@ msgstr "Warenversandlager"
 msgid "Split into"
 msgstr "Teile in"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Today"
-msgstr "Heute"
-
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
 msgstr "Währung für Durchschnittspreis"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-hr"
-msgstr "terp-hr"
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+"Bei Echtzeitbuchungen werden die Gegenbuchungen alle auf dieses eine Konto "
+"gebucht. Falles dieses noch nicht für einzelne Produkte aufgesetzt wurde, "
+"wird dieses durch die Produkte Kategorie abgebildet."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -541,22 +505,17 @@ msgstr "terp-hr"
 msgid "Location Type"
 msgstr "Lagerort Art"
 
+#. module: stock
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
 msgstr "Liefertyp, Wareneingang oder -ausgang"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_effects-object-colorize"
-msgstr "terp-stock_effects-object-colorize"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
@@ -629,11 +588,9 @@ msgid "Grand Total:"
 msgstr "Gesamtsumme:"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_move_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
-#: view:report.stock.move:0
-msgid "Moves Analysis"
-msgstr "Statistik Lagerbuchungen"
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr "Bestandsverwaltung"
 
 #. module: stock
 #: view:stock.location:0
@@ -653,11 +610,6 @@ msgstr "Lagerort / Produkt"
 msgid "Reception"
 msgstr "Annahme"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
-
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
@@ -710,12 +662,12 @@ msgstr "August"
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 #: view:stock.tracking:0
 msgid "Packs"
-msgstr "Verpackungen"
+msgstr "Pakete"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
@@ -735,11 +687,6 @@ msgid ""
 "or line or through the Delivery Orders menu."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-blue"
-msgstr "terp-folder-blue"
-
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
@@ -755,11 +702,6 @@ msgstr "Beschaffungslager"
 msgid "Production Lots"
 msgstr "Fertigungslose"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "Projekt Administrator"
-
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
@@ -781,16 +723,6 @@ msgstr "Oktober"
 msgid "Inventory Line"
 msgstr "Lagerbestandspos."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal+"
-msgstr "terp-personal+"
-
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
@@ -803,16 +735,6 @@ msgstr "Dies ist das Buchungsjournal für Echtzeitlagerbuchungen"
 msgid "Process Picking"
 msgstr "Verarbeite Lieferauftrag"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-graph"
-msgstr "terp-graph"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -829,15 +751,10 @@ msgstr ""
 "Diese Option wählen, um bestehende Lose aus der Liste zu verwenden, ansonst "
 "Vergabe neuer Lose je Zeile"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dialog-close"
-msgstr "terp-dialog-close"
-
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr "Lagerort (Ziel)"
+msgstr "Ziel"
 
 #. module: stock
 #: view:stock.move:0
@@ -861,26 +778,11 @@ msgstr "wird verbraucht durch"
 msgid "Production lot is used to put a serial number on the production"
 msgstr "Fertigungslos wird verwendet um eine Seriennummer zu vergeben."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
-
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
 msgstr "Wareneingangslager"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal-"
-msgstr "terp-personal-"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
@@ -913,9 +815,9 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Zwischenlager für  Lieferungen zwischen internen Unternehmen"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "Wert errechneter  Bestand"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -942,21 +844,10 @@ msgstr "Abfall/wegwerfen"
 msgid "Contains"
 msgstr "Beinhaltet"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar"
-msgstr "terp-dolar"
-
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr "Verzug bei Warenanlieferung"
-
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Future Qty"
-msgstr "Zukünftige Menge"
+msgstr "Verzögerung bei Wareneingang"
 
 #. module: stock
 #: view:stock.location:0
@@ -985,11 +876,6 @@ msgstr "Geplantes Datum"
 msgid "Pack Search"
 msgstr "Suche Paket"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-ltr"
-msgstr "terp-gtk-jump-to-ltr"
-
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
@@ -1000,17 +886,6 @@ msgstr "Dringend"
 msgid "Journal"
 msgstr "Journal"
 
-#. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Bestandsveränderungskonto"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr "Fehler bei  Zuweisung eines Los !"
-
 #. module: stock
 #: help:stock.picking,location_id:0
 msgid ""
@@ -1039,20 +914,19 @@ msgid "Stock by Location"
 msgstr "Bestand nach Orten"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+"Optionale Lieferadresse, die insbesondere für die Auslieferung von "
+"Konsignationen verwendet wird."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
 msgstr "Monat-1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_symbol-selection"
-msgstr "terp-stock_symbol-selection"
-
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1077,11 +951,6 @@ msgstr "Fiktiver Bestand"
 msgid "View"
 msgstr "Ansicht"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
-
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
@@ -1094,24 +963,15 @@ msgid "Delivery Information"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Inventur wurde abgeschlossen"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stage"
-msgstr "terp-stage"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
-
-#. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Menge per Los"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1120,18 +980,6 @@ msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "Lieferaufträge"
-
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
@@ -1225,43 +1073,17 @@ msgstr ""
 "verbraucht alle Rohstoffe und produziert Zwischen- und Fertigprodukte.\n"
 "                      "
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
-
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDELETE"
-msgstr "STOCK_UNDELETE"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Delivery Order"
 msgstr "Lieferauftrag"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "No invoice were created"
-msgstr "Es wurden keine Rechnungen erzeugt"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
@@ -1283,11 +1105,6 @@ msgstr "Erledigt am"
 msgid "Expected Shipping Date"
 msgstr "Erwartete Auslieferung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver-minus"
-msgstr "terp-accessories-archiver-minus"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
@@ -1306,24 +1123,25 @@ msgstr "Aufteilen Inventurposition"
 msgid "Physical Inventory"
 msgstr "Bestand"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
-
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
-"Das Unternehmen für das diese Lagerortverkettung angewendet wird (kein "
-"Eintrag für das Standard Unternehmen)"
+"Das Unternehmen für das diese Lieferkette angewendet wird (kein Eintrag für "
+"das Standard Unternehmen)"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+"Liefertyp des Lieferscheins für die definierte Lieferkette (nehmen Sie "
+"keinen Eintrag vor, wenn dieser Typ automatisch auf der Basis von Quelle und "
+"Ziel erkannt werden soll)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1331,49 +1149,25 @@ msgid "Lot number"
 msgstr "Fertigungslosnummer"
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr "Mengeneinheit"
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr "Produkt ME"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "Lagerort beim Partner"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"                product_qty = partial_data.get('product_qty',0.0)\n"
-"                move_product_qty[move.id] = product_qty\n"
-"                product_uom = partial_data.get('product_uom',False)\n"
-"                product_price = partial_data.get('product_price',0.0)\n"
-"                product_currency = "
-"partial_data.get('product_currency',False)\n"
-"                prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-"Konnte keine Daten zu diesem Lieferschein auffinden :%s' %(move.id))\n"
-"                product_qty = partial_data.get('product_qty',0.0)\n"
-"                move_product_qty[move.id] = product_qty\n"
-"                product_uom = partial_data.get('product_uom',False)\n"
-"                product_price = partial_data.get('product_price',0.0)\n"
-"                product_currency = "
-"partial_data.get('product_currency',False)\n"
-"                prodlot_id = partial_data.get('prodlot_id"
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
 msgstr "Gesamtmenge"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
@@ -1390,11 +1184,6 @@ msgstr "Kunden in Europa"
 msgid "Delay between original move and chained move in days"
 msgstr "Verzögerung zwischen Originalbuchung und abhängigen Buchungen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
@@ -1453,14 +1242,14 @@ msgid "is in draft state."
 msgstr "ist im Entwurf..."
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr "Bestand aktualisiert"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr "Verkettungstyp"
+msgstr "Lieferkette Typ"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -1473,12 +1262,6 @@ msgstr "Rückvergütung/Rechungslegung zu erledigen"
 msgid "Shop 1"
 msgstr "Shop 1"
 
-#. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
-msgid "Total Value"
-msgstr "Gesamt Wert"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 #: view:stock.fill.inventory:0
@@ -1507,12 +1290,6 @@ msgstr "Kalenderansicht"
 msgid "Additional Info"
 msgstr "Zusätzliche Information"
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
-#: report:stock.inventory.move:0
-msgid "Stock Inventory"
-msgstr "Lagerinventur"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -1574,11 +1351,6 @@ msgstr "Suche Lieferscheine"
 msgid "Company is not specified in Location"
 msgstr "Das Unternehmen ist für den Lagerort nicht definiert"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-report"
-msgstr "terp-report"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:stock.partial.move,type:0
@@ -1590,11 +1362,6 @@ msgstr "Typ"
 msgid "Generic IT Suppliers"
 msgstr "Generic IT Suppliers"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
-
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
@@ -1613,32 +1380,12 @@ msgstr "Position"
 msgid "Address of  customer or supplier."
 msgstr "Kunden- oder Lieferantenadresse"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gdu-smart-failing"
-msgstr "terp-gdu-smart-failing"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Lieferauftrag"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1646,11 +1393,6 @@ msgstr "STOCK_GO_DOWN"
 msgid "Customer Location"
 msgstr "Kundenlagerort"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OK"
-msgstr "STOCK_OK"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -1680,15 +1422,21 @@ msgid "General Informations"
 msgstr "Allgemeine Informationen"
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Keine Lieferkette"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr "Auswertung Rückverfolgung"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
@@ -1756,7 +1504,7 @@ msgstr "Geben Sie bitte eine positive Menge als Abfall ein."
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr "Lieferzeit Verkettung"
+msgstr "Lieferzeit Lieferkette"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
@@ -1764,21 +1512,11 @@ msgstr "Lieferzeit Verkettung"
 msgid "Cannot deliver products which are already delivered !"
 msgstr "Ausgelieferte Produkte können nicht nochmals ausgeliefert werden"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
 msgstr "Rechnungserstellung bei Lieferung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-face-plain"
-msgstr "terp-face-plain"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
@@ -1792,11 +1530,6 @@ msgstr "Lieferantenlagerort"
 msgid "were scrapped"
 msgstr "wurden zu Abfall"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
-
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1808,11 +1541,6 @@ msgstr "Teilweise"
 msgid "September"
 msgstr "September"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
-
 #. module: stock
 #: help:stock.picking,backorder_id:0
 msgid ""
@@ -1849,28 +1577,16 @@ msgstr ""
 "werden sollen."
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"Variation Account is not specified for Product Category: %s' % "
-"(product_obj.categ_id.name)))\n"
-"        move_ids = []\n"
-"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-"Bestandveränderungskonto fehlt für Produktkategorie: %s' % "
-"(product_obj.categ_id.name)))\n"
-"        move_ids = []\n"
-"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gnome-cpu-frequency-applet+"
-msgstr "terp-gnome-cpu-frequency-applet+"
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Lieferaufträge"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1889,51 +1605,21 @@ msgstr "Absage (Verfügbarkeit)"
 msgid "Scheduled date for the processing of this move"
 msgstr "Geplantes Verarbeitungsdatum für diese Buchung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-media-pause"
-msgstr "terp-gtk-media-pause"
-
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Erzeugte Warenbewegung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-scientific"
-msgstr "terp-stock_format-scientific"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
 msgstr "Regal 2"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "Zu Verrechnen"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
-
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
 msgstr "Los Verfolgung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-today"
-msgstr "terp-go-today"
-
 #. module: stock
 #: help:stock.location,posx:0
 #: help:stock.location,posy:0
@@ -1952,6 +1638,11 @@ msgstr "Gegenposition Lagerorte Eigenschaften"
 msgid "Localization"
 msgstr "Standort Lager"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr "Bestand nach Paketnummern"
+
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -1970,11 +1661,6 @@ msgstr "Teile in Lose"
 msgid "Production Lot Numbers"
 msgstr "Produktionslosnummern"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,date:0
@@ -1997,37 +1683,17 @@ msgstr "Datum"
 msgid "Extended Filters..."
 msgstr "Filter auf Datenfelder..."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-administration"
-msgstr "terp-administration"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
-
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
 msgstr "Hauptlager"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
 msgid "Merging is only allowed on draft inventories."
 msgstr "Zusammenfassung nur für Bestandsaufnahmen im Entwurf."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-rtl"
-msgstr "terp-gtk-go-back-rtl"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
@@ -2038,16 +1704,6 @@ msgstr "Pinnwand Lagerwirtschaft"
 msgid "Track moves"
 msgstr "Verfolge Buchungen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-crm"
-msgstr "terp-crm"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
-
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
@@ -2064,16 +1720,6 @@ msgstr "Losnummer"
 msgid "Warehouse Dashboard"
 msgstr "Pinnwand Lager"
 
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-"
-msgstr "terp-mail-"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -2089,9 +1735,10 @@ msgid "Scrap Products"
 msgstr "Abfall Produkte"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr "Ein Lieferschein mit Status %s kann nicht entfernt werden."
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -2109,6 +1756,7 @@ msgid "Return Picking"
 msgstr "Rücklieferschein"
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
@@ -2135,21 +1783,6 @@ msgstr "Lieferadresse :"
 msgid "Provide the quantities of the returned products."
 msgstr "Gebe die Anzahl der Retouren an"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-call-start"
-msgstr "terp-call-start module: stock"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
@@ -2182,11 +1815,6 @@ msgstr ""
 "für den Warenfluss vom Lieferanten (oder Kunden bei Rücksendung) in das "
 "Lager (Wareneingang)."
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Picking"
-msgstr "Nicht vom Lieferschein"
-
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -2200,11 +1828,6 @@ msgid ""
 "by your products and inventory management performance."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
-
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
@@ -2221,9 +1844,9 @@ msgid "Search Inventory"
 msgstr "Suche Inventur"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Auswertung Bestände nach Losen"
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Menge per Los"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2253,16 +1876,6 @@ msgid ""
 "[INT_REF]"
 msgstr "Optionales Prefix für die Seriennummer: PREFIX/SERIAL [INT_REF]"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
-
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2347,12 +1960,7 @@ msgstr "Echtzeit (automatisch)"
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr "Verpackung (Palette, Kiste, Paket...)"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-locked"
-msgstr "terp-locked"
+msgstr "Paket (Palette, Kiste, Paket...)"
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -2368,9 +1976,9 @@ msgid "]"
 msgstr "]"
 
 #. module: stock
-#: field:stock.move.memory,wizard_id:0
-msgid "Wizard"
-msgstr ""
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Lagerort Bestandsaufnahme"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2378,11 +1986,6 @@ msgstr ""
 msgid "Total value"
 msgstr "Gesamt Wert"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal"
-msgstr "terp-personal"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
 msgid ""
@@ -2390,6 +1993,10 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements made on the product."
 msgstr ""
+"Dieses Menü gibt Ihnen die Möglichkeit alle Lieferungen und "
+"Bestandsbuchungen eines bestimmten Produktes nachzuvollziehen. Sie können "
+"hierbei Filter verwenden, um entweder alle bereits erfolgten oder alle "
+"zukünftigen Lieferungen anzuzeigen."
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2397,36 +2004,21 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
-"Lager Journal in das die Lagerbuchung für diese Verkettung gebucht wird, "
-"wenn der Verkettungsort Typ nicht 'Keine' ist (kein Journal wird gebucht "
-"wenn kein Eintrag im Feld Journal vorgenommen wird)."
-
-#. module: stock
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
+"Lager Journal in das die Lagerbuchung für diese Lieferkette gebucht wird, "
+"wenn der Typ nicht 'Keine Lieferkette' ist (kein Journal wird gebucht wenn "
+"kein Eintrag im Feld Journal vorgenommen wird)."
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
 msgid "Incoming Product"
-msgstr "Wareneingang"
+msgstr "Erwartete Produktzugänge"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
 msgstr "Erzeugung"
 
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver"
-msgstr "terp-accessories-archiver"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.move.memory,cost:0
@@ -2435,9 +2027,11 @@ msgid "Cost"
 msgstr "Kosten"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr "Konto Wareneingang"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2445,18 +2039,6 @@ msgstr "STOCK_COPY"
 msgid "Warehouse Management"
 msgstr "Lagerbuchhaltung"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Lagerbewegung"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-#: field:stock.change.standard.price,stock_account_output:0
-msgid "Stock Output Account"
-msgstr "Warenversand Konto"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
@@ -2473,11 +2055,6 @@ msgstr "Produkt "
 msgid "Stock Location Analysis"
 msgstr "Lagerort Bestände"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
@@ -2529,11 +2106,6 @@ msgstr "Eingangslieferscheine"
 msgid "Unit of Measure"
 msgstr "Mengeneinheit"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -2546,14 +2118,9 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
-"Erzwingt die Spezifikation eines Loses für alle Lieferscheine die dieses "
+"Erzwingt die Vergabe eines Fertigungsloses  für alle Lieferungen, die dieses "
 "Produkt beinhalten und durch einen Fertigungsauftrag generiert wurden."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
 #: view:stock.move.track:0
@@ -2570,6 +2137,14 @@ msgid ""
 "your pre-configured logistics rules but you can also record manual stock "
 "operations."
 msgstr ""
+"Die Internen Lieferungen zeigen alle Bestandsbuchungen, die in Ihrem "
+"Zentrallager stattfinden oder stattgefunden haben. Alle Liefervorgänge "
+"können bei Bedarf in Lagerjournalen kategorisiert werden, so das jeder "
+"Lagerarbeiter sein eigenes Journal mit seiner eigenen Liste von "
+"durchzuführenden bzw. bereits erledigten Lieferungen, vorfinden kann. Die "
+"meisten Lieferungen werden von OpenERP automatisch nach den von Ihnen "
+"definierten Regeln für den Warenfluss ausgeführt, alternativ können Sie aber "
+"auch manuelle Lieferungen erfassen."
 
 #. module: stock
 #: view:product.product:0
@@ -2587,17 +2162,6 @@ msgstr "Setze auf Entwurf"
 msgid "Stock Journals"
 msgstr "Lagerjournale"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-ltr"
-msgstr "terp-gtk-go-back-ltr"
-
-#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
-"Eindeutige Seriennummer, wird wiefolgt angezeigt: PREFIX/SERIAL [INT_REF]"
-
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
@@ -2630,31 +2194,21 @@ msgstr "Produkte "
 msgid "Track Incoming Lots"
 msgstr "Verfolge Wareneingang"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-replied"
-msgstr "terp-mail-replied"
-
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
 msgstr "Pinnwand Lagerwirtschaft"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Physical Inventories"
-msgstr "Physikalische Lagerorte"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr "Zukünftige Menge"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr "Bestandsveränderungskonto"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2692,11 +2246,6 @@ msgstr "Sie können lediglich Warenbewegungen im Entwurf (Status) löschen."
 msgid "Products"
 msgstr "Produkte"
 
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Keine Lieferkette"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
@@ -2734,29 +2283,19 @@ msgstr ""
 "definiert:: \"%s\" (id: %d)"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerbewegung"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Verzögerung(Tage)"
 
 #. module: stock
 #: field:stock.move.memory,move_id:0
 msgid "Move"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
+msgstr "Lieferauftrag"
 
 #. module: stock
 #: help:stock.picking,min_date:0
@@ -2769,17 +2308,17 @@ msgstr "Geplantes Verarbeitungsdatum für die Lieferung"
 msgid "P&L Qty"
 msgstr "Anzahl"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-green"
-msgstr "terp-folder-green"
-
 #. module: stock
 #: view:stock.production.lot:0
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
 msgstr "Revisionen"
 
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
 #. module: stock
 #: help:product.product,valuation:0
 msgid ""
@@ -2803,6 +2342,9 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"Die Statistik für den Lagerbestand ermöglicht Ihnen eine Prüfung und Analyse "
+"von Beständen. Filtern, sortieren und guppieren Sie nach individuellen "
+"Kriterien, um Ihre Analyse exakt auf Ihren Bedarf auszurichten."
 
 #. module: stock
 #: help:report.stock.move,location_id:0
@@ -2811,7 +2353,7 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
-"Definiert einen Lagerort bei Produktion an einem festen Standort. Dieses "
+"Definiert einen Lagerort bei Produktion an einem fixen Fertigungsort. Dieses "
 "kann auch ein Partnerlagerort sein, für den Fall dass Ihre "
 "Fertigungsvorgänge fremd vergeben wurden."
 
@@ -2849,13 +2391,11 @@ msgstr "Lagerbestand"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
 msgid "Picking List"
 msgstr "Lieferschein"
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
+#: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
@@ -2900,19 +2440,6 @@ msgstr "Resultat Lagerortaustausch"
 msgid "Fixed Location"
 msgstr "Fester Lagerort"
 
-#. module: stock
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_align_left_24"
-msgstr "terp-stock_align_left_24"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
 msgid ""
@@ -2920,26 +2447,9 @@ msgid ""
 "After having selected a lot, you can get the up-stream or down-stream "
 "traceability of the products contained in lot."
 msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-orange"
-msgstr "terp-folder-orange"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver+"
-msgstr "terp-accessories-archiver+"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
+"Diese Liste zeigt Ihnen alle Fertigungslose. Wenn Sie ein Los ausgewählt "
+"haben, können Sie dann die zugehörigen Lieferungen sowohl upstream als auch "
+"downstream zurück- bzw. nachverfolgen."
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -2951,11 +2461,6 @@ msgstr "Juli"
 msgid "Consumable"
 msgstr "Verbrauchsgut"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
 msgid ""
@@ -2965,11 +2470,6 @@ msgid ""
 "controlled at least once a year."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
@@ -2985,22 +2485,12 @@ msgstr "Bestandsvorschau"
 msgid "Stock Journal"
 msgstr "Lager Journal"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "Beschaffung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-yellow"
-msgstr "terp-folder-yellow"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
@@ -3050,11 +2540,6 @@ msgstr "Zeige Lagerorte der Produkte"
 msgid "Internal Picking list"
 msgstr "Interne Lieferauftragsliste"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
@@ -3071,14 +2556,9 @@ msgstr "Datum der Vollständigkeit"
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
-"Durch Deaktivierung können Sie eine Lieferung verbergen, ohne diesen Eintrag "
+"Durch Deaktivierung können Sie ein Paket verbergen, ohne diesen Eintrag "
 "komplett und vollständig zu löschen."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar_ok!"
-msgstr "terp-dolar_ok!"
-
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
@@ -3122,11 +2602,6 @@ msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-year"
-msgstr "terp-go-year"
-
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
@@ -3137,6 +2612,12 @@ msgstr "Bestand"
 msgid "Fill Inventory"
 msgstr "Auffüllen Bestände"
 
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid ""
@@ -3156,30 +2637,25 @@ msgid "Revision Date"
 msgstr "Korrekturdatum"
 
 #. module: stock
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
+msgid "Lot"
+msgstr "Fertigungslos"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
 msgstr "Produktionslosnummer"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-rtl"
-msgstr "terp-gtk-jump-to-rtl"
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "Menge (UOS)"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3195,21 +2671,6 @@ msgstr "Kontakt Adresse"
 msgid "Back Order"
 msgstr "Auftragsrückstand"
 
-#. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial Number"
-msgstr "Seriennummer"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
-
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
@@ -3222,11 +2683,6 @@ msgstr "Aktiv"
 msgid "Inventory Management"
 msgstr "Lagerbuchhaltung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-idea"
-msgstr "terp-idea"
-
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
@@ -3271,11 +2727,6 @@ msgid ""
 msgstr ""
 "Bei Aktivierung, werden auch die Produkte von Sublagerorten mit einbezogen."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
-
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
@@ -3320,11 +2771,6 @@ msgstr "Revisions Name"
 msgid "Warehouse"
 msgstr "Lagerverwaltung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
-
 #. module: stock
 #: view:stock.location.product:0
 msgid ""
@@ -3332,7 +2778,7 @@ msgid ""
 "filter all resources of the day for the 'From' date and 23:59:59 for the "
 "'To' date)"
 msgstr ""
-"Leer lassen, um die aktuelle Bestandsituation abzuzeigen. Verändere HH:MM:SS "
+"Leer lassen, um die aktuelle Bestandsituation anzuzeigen. Verändere HH:MM:SS "
 "zu 00:00:00 im Feld 'von', sowie  23:59:59 für das 'Bis' Datum, um alle "
 "Ressourcen des Tages anzuzeigen."
 
@@ -3341,11 +2787,6 @@ msgstr ""
 msgid "Accounting Stock Properties"
 msgstr "Lager Eigenschaften FiBu"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NO"
-msgstr "STOCK_NO"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
@@ -3370,20 +2811,15 @@ msgstr "Erledigt"
 msgid "Change Standard Price"
 msgstr "Ändere Standardpreis"
 
-#. module: stock
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
 msgstr "Virtuelle Lagerorte"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Zu Verrechnen"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
@@ -3404,21 +2840,11 @@ msgstr ""
 msgid "Not urgent"
 msgstr "Nicht dringend"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-default"
-msgstr "terp-stock_format-default"
-
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
 msgstr "Zu erledigen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
@@ -3430,16 +2856,6 @@ msgstr "Zentrallager"
 msgid "Responsible"
 msgstr "Verantwortlich"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-check"
-msgstr "terp-check"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-camera_test"
-msgstr "terp-camera_test"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -3447,11 +2863,6 @@ msgstr "terp-camera_test"
 msgid "Inventory Analysis"
 msgstr "Statistik Lagerbestand"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
-
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
@@ -3489,11 +2900,6 @@ msgstr "Lager"
 msgid "Product"
 msgstr "Produkt"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -3536,13 +2942,10 @@ msgid "Consume Products"
 msgstr "Verbrauche Produkte"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: code:addons/stock/stock.py:0
 #, python-format
-msgid "Product UOM"
-msgstr "Produkt ME"
+msgid "Insufficient Stock in Lot !"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3571,19 +2974,15 @@ msgid "Suppliers"
 msgstr "Lieferanten"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Gesamt Wert"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-tools"
-msgstr "terp-tools"
+#: field:stock.move.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3591,11 +2990,6 @@ msgstr "terp-tools"
 msgid "Products by Location"
 msgstr "Bestand an Stichtag"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
-
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
@@ -3606,25 +3000,15 @@ msgstr "Inklusive untergeordnete Daten"
 msgid "Shelf 1"
 msgstr "Regal 1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-sale"
-msgstr "terp-sale"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
 msgstr "Auftrag"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
-
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "Lieferschein Referenz"
+msgstr "Paket Referenz"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3633,25 +3017,16 @@ msgstr "Lieferschein Referenz"
 msgid "Source Location"
 msgstr "Quelle"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-stop"
-msgstr "terp-gtk-stop"
-
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Buchungen"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Mengeneinheit"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3679,7 +3054,7 @@ msgstr "Fertigungslose"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr "Neuere Verpackungen"
+msgstr "Neues Paket"
 
 #. module: stock
 #: view:stock.move:0
@@ -3734,11 +3109,6 @@ msgstr "Gesamte Wareneingangsmenge"
 msgid "Out Qty"
 msgstr "Abgang"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
-
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
@@ -3754,7 +3124,7 @@ msgstr "Meldung!"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr "Lade in dieses Verpackung"
+msgstr "Lade in dieses Paket"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3786,16 +3156,6 @@ msgstr "Icon"
 msgid "UserError"
 msgstr "BenutzerFehler"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-week"
-msgstr "terp-go-week"
-
 #. module: stock
 #: view:stock.inventory.line.split:0
 #: view:stock.move.consume:0
@@ -3814,18 +3174,12 @@ msgstr "Kunden ausserhalb Europas"
 #. module: stock
 #: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_splitinto.py:0
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
 msgid "Error!"
 msgstr "Fehler!"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
-#, python-format
-msgid "Stock Inventory is done"
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -3892,23 +3246,19 @@ msgstr ""
 "Legt fest, ob dieser Lagerort mit einem anderen Lagerort verkettet wird, "
 "d.h. jedes eingehende Produkt für diesen Lagerort\n"
 "sollte als nächstes zum verketteten Lagerort weitergeliefert werden. Der zu "
-"verkettende Lagerort wird über den Verkettungstyp festgelegt.:\n"
-"* Keine Verkettung: Es erfolgt keine Weiterlieferung von Beständen\n"
-"* Kundenlagerort: Das verkettete Lager wird dem Feld 'Kundenlagerort' beim "
-"dem Partner entnommen, der im Lieferschein für den Empfang der Lieferung "
-"dieses Lagerortes aus dem aktuell angezeigten Kontext angegeben wird.\n"
+"verkettende Lagerort wird über Lieferkette Typ festgelegt.:\n"
+"* Keine Lieferkette: Es erfolgt keine weitere Lieferung \n"
+"* Kundenlagerort: Das verkettete Lager wird dem Feld 'Kundenlagerort' beim  "
+"Partner entnommen, der im Lieferschein für den Empfang der Lieferung dieses "
+"Lagerortes aus dem aktuell angezeigten Kontext angegeben wird.\n"
 "* Fester Lagerort: Der verkettete Lagerort wird dem folgenden Feld "
-"entnommen: Verk.  Fester Lageort."
+"entnommen: Lagerort bei  Fester Lagerort."
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
-
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr "Warnung"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3917,11 +3267,10 @@ msgid ""
 "click on a location in order to get the list of the products and their stock "
 "level in this particular location and all its children."
 msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
+"Sie sehen hier die Struktur Ihrer Zentralläger mit den dortigen Lagerorten. "
+"Sie können auf einen Lagerort klicken, um eine Liste der dort gelagerten "
+"Produkte sowie deren Lagerbestand auf diesem Lagerort mitsamt "
+"untergeordneter Lagerorte zu betrachten."
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3935,27 +3284,13 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Bestand aktualisiert"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
-msgid "Lot"
-msgstr "Fertigungslos"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
@@ -3966,22 +3301,12 @@ msgstr "Bestätigen"
 msgid "Icon show in  hierarchical tree view"
 msgstr "Icon in hierachischer Ansicht der Lagerorte"
 
-#. module: stock
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Betriebe erzeugen."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr "Bestände zusammenführen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-home"
-msgstr "terp-go-home"
-
 #. module: stock
 #: field:product.product,location_id:0
 #: view:stock.location:0
@@ -4039,7 +3364,7 @@ msgstr " für diese "
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr "Menge, die in aktueller Verpackung belassen wird"
+msgstr "Menge, die in aktuellem Paket belassen wird"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -4047,11 +3372,6 @@ msgstr "Menge, die in aktueller Verpackung belassen wird"
 msgid "Create invoice"
 msgstr "Erzeuge Rechnung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
 msgid ""
@@ -4059,6 +3379,9 @@ msgid ""
 "get the up-stream or down-stream traceability of the products contained in "
 "the pack."
 msgstr ""
+"Sie sehen hier eine Liste aller Pakete. Wählen Sie eins aus, um die "
+"Produktlieferungen dieses Pakets zurück- bzw. nachzuverfolgen "
+"(zurückverfolgen = Upstream, nachverfolgen = Downstream)."
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -4098,6 +3421,8 @@ msgstr "Journal Lieferkette"
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
+"Nicht genügend Einheiten dieses Produktes verfügbar, kann keine Produkte "
+"reservieren."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -4110,11 +3435,6 @@ msgstr "Kundenlagerort"
 msgid "is cancelled."
 msgstr "ist storniert"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-document-new"
-msgstr "terp-document-new"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
 msgid ""
@@ -4124,6 +3444,11 @@ msgid ""
 "can confirm all products received using the buttons on the right of each "
 "line."
 msgstr ""
+"Hier finden Sie eine Liste aller Produkte, auf deren Anlieferung Sie laut "
+"Ihrer Bestellungen noch warten. Wenn Sie eine Lieferung erhalten, können Sie "
+"hier nach Lieferanten oder Bestellnummmer filtern. Anschließend können Sie "
+"den Erhalt der eingetroffenen Produkte einfach bestätigen, in dem Sie "
+"innerhalb der Positionszeile die Buttons auf der rechten Seite nutzen."
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -4142,17 +3467,6 @@ msgstr "Verarbeite Dokument"
 msgid "Future Deliveries"
 msgstr "Zukünftige Lieferungen"
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
-msgstr ""
-"Bei Echtzeitbuchungen werden die Gegenbuchungen alle auf dieses eine Konto "
-"gebucht. Falles dieses noch nicht für einzelne Produkte aufgesetzt wurde, "
-"wird dieses durch die Produkte Kategorie abgebildet."
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
@@ -4207,12 +3521,6 @@ msgstr "Automatisch Genehmigen"
 msgid "Product Template"
 msgstr "Produktvorlage"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "Invoices"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
@@ -4224,14 +3532,19 @@ msgid "Automatic Move"
 msgstr "Automatische Bewegung"
 
 #. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
-msgstr "Wert errechneter  Bestand"
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail_delete"
-msgstr "terp-mail_delete"
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -4243,21 +3556,11 @@ msgstr ""
 "Benutzer während eines Liefervorgang (wenn Durchschnittspreise verwendet "
 "werden)."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-month"
-msgstr "terp-go-month"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
 msgstr "Produktbuchungen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
-
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
@@ -4268,11 +3571,6 @@ msgstr "Abgerechnet"
 msgid "Destination Address"
 msgstr "Lieferanschrift:"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
-
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
@@ -4313,9 +3611,10 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Lagerinventur"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -4326,12 +3625,12 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Wenn ein Lieferschein erstellt wird, ist er zunächst im 'Entwurf' Zustand.\n"
-"* Danach wurde der Satus auf 'Bestätigt' geändert.\n"
-"* Wenn die Packliste erledigt wurde, ändert sich der Status  ebenfalls: "
+"Wenn ein Lieferauftrag erstellt wird, ist er zunächst im 'Entwurf' Zustand.\n"
+"* Danach wird der Status auf 'Bestätigt' geändert.\n"
+"* Wenn der Lieferauftrag erledigt wurde, ändert sich der Status auf: "
 "'Erledigt'\n"
-"* Der Status ist \"Warte\" ,wenn die Lieferung zuerst auf eine Buchung "
-"warten muss."
+"* Der Status ist \"Im Wartezustand\" ,wenn die Lieferung zuerst auf eine "
+"andere Lieferung warten muss."
 
 #. module: stock
 #: view:board.board:0
@@ -4343,16 +3642,6 @@ msgstr ""
 msgid "Existing Lot"
 msgstr "Bestehendes Los"
 
-#. module: stock
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -4373,12 +3662,6 @@ msgstr ""
 "Für das aktuelle Produkt, wird dieser Lagerort anstelle des Standard "
 "Lagerorts als Quelle für Bestandsbuchungen durch die Disposition verwendet."
 
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
-#, python-format
-msgid "Warning"
-msgstr "Warnung"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -4400,11 +3683,6 @@ msgstr "Setze auf Null"
 msgid "Direct Delivery"
 msgstr "Direktbelieferung"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
@@ -4458,7 +3736,7 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
-"Erzwingt eine Charge für alle Bestandsbuchungen dieses Produktes von diesem "
+"Erzwingt ein Fertigungslos für alle Lieferungen dieses Produktes von einem "
 "Lieferantenlagerort."
 
 #. module: stock
@@ -4466,11 +3744,6 @@ msgstr ""
 msgid "Future Stock Moves"
 msgstr "zukünftige Lieferaufträge"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-select-all"
-msgstr "terp-gtk-select-all"
-
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
@@ -4503,6 +3776,7 @@ msgstr "XML Datei"
 #: field:stock.move.memory,prodlot_id:0
 #: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
 #, python-format
 msgid "Production Lot"
 msgstr "Fertigungslos"
@@ -4521,11 +3795,6 @@ msgstr "Lieferverfolgung"
 msgid "To invoice"
 msgstr "Zu Berechnen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-message-new"
-msgstr "terp-mail-message-new"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
@@ -4543,16 +3812,6 @@ msgstr "Grundinformation"
 msgid "Prefix"
 msgstr "Prefix"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr "STOCK_DISCONNECT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-product"
-msgstr "terp-product"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
@@ -4574,11 +3833,6 @@ msgstr "Lieferauftragspositionen"
 msgid "Dest. Location"
 msgstr "Zielort"
 
-#. module: stock
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
@@ -4597,6 +3851,11 @@ msgstr "Anzahl"
 msgid "stock.move.memory"
 msgstr ""
 
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
@@ -4621,9 +3880,9 @@ msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
-"Es ist sind aktuell keine Retoure möglich (nur Positionen die bereits "
-"erledigt sind oder noch nicht vollständig retourniert wurden können auch "
-"rückgesendet werden) !"
+"Es ist aktuell keine Retoure möglich (nur Positionen die bereits erledigt "
+"sind oder noch nicht vollständig retourniert wurden können auch rückgesendet "
+"werden) !"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -4647,11 +3906,6 @@ msgstr "Beschreibung"
 msgid "May"
 msgstr "Mai"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -4666,7 +3920,8 @@ msgid ""
 "product, the one from the product category is used."
 msgstr ""
 "Bei Bestandsbuchungen in Echtzeit, werden alle Gegenbuchungen für "
-"Warenversandlieferscheine auf dieses Konto gebucht."
+"Warenversandlieferscheine auf dieses Konto gebucht. Falls kein Konto bei "
+"einem Produkt hinterlegt wurde, wird das Konto der Kategorie verwendet."
 
 #. module: stock
 #: view:stock.tracking:0
@@ -4686,11 +3941,11 @@ msgid "Produced Qty"
 msgstr "Prod. Anzahl"
 
 #. module: stock
-#: field:product.category,property_stock_account_input_categ:0
-#: field:product.template,property_stock_account_input:0
-#: field:stock.change.standard.price,stock_account_input:0
-msgid "Stock Input Account"
-msgstr "Konto Wareneingang"
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr "Warenversand Konto"
 
 #. module: stock
 #: view:stock.move:0
@@ -4756,43 +4011,11 @@ msgstr "Warenversand"
 msgid "Warning !"
 msgstr "Warnung"
 
-#. module: stock
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr ""
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
 msgstr "Warenversand"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You cannot remove the picking which is in %s state !"
-msgstr "Ein Lieferschein mit Status %s kann nicht entfernt werden."
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr "terp-mrp"
-
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid ""
-"Shipping Type of the Picking List that will contain the chained move (leave "
-"empty to automatically detect the type based on the source and destination "
-"locations)."
-msgstr ""
-"Liefertyp des Lieferscheins, der die Bestandsbuchung für eine Verkettung "
-"beinhaltet (nehmen Sie keinen Eintrag vor, wenn dieser Typ automatisch auf "
-"der Basis von Quelle und Ziel erkannt werden soll)."
-
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
@@ -4806,17 +4029,7 @@ msgstr "Produktkosten"
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr "Optional: Nächste Warenbewegung bei Verkettung"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
+msgstr "Optional: Weiterer Lieferauftrag bei Lieferkette"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -4837,15 +4050,30 @@ msgstr "Teillieferung"
 #~ msgid "LIFO"
 #~ msgstr "LiFo"
 
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
 #~ msgid "Sub Products"
 #~ msgstr "Subprodukte"
 
+#~ msgid "terp-account"
+#~ msgstr "terp-account"
+
 #~ msgid "Stock Management"
 #~ msgstr "Lager"
 
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
 #~ msgid "Revision"
 #~ msgstr "Revision"
 
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
 #~ msgid "Return packing"
 #~ msgstr "Retoure"
 
@@ -4864,21 +4092,51 @@ msgstr "Teillieferung"
 #~ msgid "Move History"
 #~ msgstr "Warenbewegung Historie"
 
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
 #~ msgid "Make Parcel"
 #~ msgstr "Erzeuge Paket"
 
 #~ msgid "Packing result"
 #~ msgstr "Packauftrag Ergebnis"
 
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
 #~ msgid "Products Sent"
 #~ msgstr "Produkte Ausliefern"
 
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
 #~ msgid "Serial"
 #~ msgstr "Serie"
 
 #~ msgid "Customer Refund"
 #~ msgstr "Kundengutschrift"
 
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
 #~ msgid "Stock location"
 #~ msgstr "Lagerort"
 
@@ -4888,6 +4146,9 @@ msgstr "Teillieferung"
 #~ msgid "Status"
 #~ msgstr "Status"
 
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
 #~ msgid "Move Lines"
 #~ msgstr "Buchungszeilen"
 
@@ -4897,9 +4158,21 @@ msgstr "Teillieferung"
 #~ msgid "Track line"
 #~ msgstr "Serienposition"
 
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
 #~ msgid "Stock Level 1"
 #~ msgstr "Lager Level 1"
 
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
 #~ msgid "Stock Properties"
 #~ msgstr "Lager Eigenschaften"
 
@@ -4918,6 +4191,9 @@ msgstr "Teillieferung"
 #~ msgid "Force to use a Production Lot during production order"
 #~ msgstr "Erzwinge Fertigungsserie bei Fertigungsauftrag"
 
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
 #~ msgid ""
 #~ "For the current product (template), this stock location will be used, "
 #~ "instead of the default one, as the source location for stock moves generated "
@@ -4932,6 +4208,9 @@ msgstr "Teillieferung"
 #~ "Dieses Konto wird verwendet als Bewertung für den Warenversand (Buchung "
 #~ "Versand und Auslieferung)."
 
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
 #~ msgid ""
 #~ "This journal will be used for the accounting move generated by stock move"
 #~ msgstr ""
@@ -4944,21 +4223,57 @@ msgstr "Teillieferung"
 #~ msgid "Track Incomming Lots"
 #~ msgstr "Verfolge Warenzugänge"
 
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "Letztes Inventurdatum"
 
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
 #~ msgid "New Reception Packing"
 #~ msgstr "Wareneingangslieferschein"
 
 #~ msgid "Tracking Lot"
 #~ msgstr "Los Verfolgung"
 
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
 #~ msgid "Tracking/Serial"
 #~ msgstr "Warenrückverfolgung"
 
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
 #~ msgid "Tracking Number"
 #~ msgstr "Seriennummer"
 
+#~ msgid "terp-stock"
+#~ msgstr "terp-stock"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Keine zugewiesenen Produkte"
 
@@ -4968,9 +4283,27 @@ msgstr "Teillieferung"
 #~ msgid "Available Packing"
 #~ msgstr "verfügbare Lieferungen"
 
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
 #~ msgid "Location Content (With children)"
 #~ msgstr "Inhalt des Lagers - (mit untergeordneten)"
 
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
 #~ msgid "New Internal Packing"
 #~ msgstr "Neuer interner Packauftrag"
 
@@ -4986,16 +4319,37 @@ msgstr "Teillieferung"
 #~ msgid "All Stock Moves"
 #~ msgstr "Warenbewegungen"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
 #~ msgid "This account will be used to value the input stock"
 #~ msgstr ""
 #~ "Dieses Konto wird verwendet, um den Wareneingang zu bewerten (Buchung)."
 
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
 #~ msgid "Date Created"
 #~ msgstr "Erstellt am"
 
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
 #~ msgid "Allocation Method"
 #~ msgstr "Verteilungsverfahren"
 
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
 #~ msgid "The packing has been successfully made !"
 #~ msgstr "Der Packauftrag wurde abgeschlossen !"
 
@@ -5005,9 +4359,24 @@ msgstr "Teillieferung"
 #~ msgid "Periodical Inventory"
 #~ msgstr "Bestandsaufnahme"
 
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Entwurf Bestandsaufnahme"
 
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
 #~ msgid "Stock Tracking Lots"
 #~ msgstr "Warenrückverfolgung"
 
@@ -5017,6 +4386,9 @@ msgstr "Teillieferung"
 #~ msgid "Available Moves"
 #~ msgstr "Verfügbare Waren"
 
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
 #~ msgid "Open Products"
 #~ msgstr "Öffne Produkt"
 
@@ -5026,24 +4398,57 @@ msgstr "Teillieferung"
 #~ msgid "Packing List"
 #~ msgstr "Lieferungen Liste"
 
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
 #~ msgid "Supplier Refund"
 #~ msgstr "Lieferanten Gutschrift"
 
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
 #~ msgid "Not from Packing"
 #~ msgstr "Keine Rechnung aus Wareneingang"
 
 #~ msgid "Internal Ref"
 #~ msgstr "Interne Referenz"
 
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
 #~ msgid "Validate"
 #~ msgstr "Validieren"
 
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
 #~ msgid "Move lines"
 #~ msgstr "Warenbewegung Positionen"
 
 #~ msgid "Partial packing"
 #~ msgstr "Teil Packauftrag"
 
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
 #~ msgid "Fill From Unreceived Products"
 #~ msgstr "Auffüllen mit noch nicht erhaltenen Produkten"
 
@@ -5062,6 +4467,9 @@ msgstr "Teillieferung"
 #~ msgid "Invoice Status"
 #~ msgstr "Status Rechnung"
 
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
 #~ msgid "Future Stock Forecast"
 #~ msgstr "Bestandsprognose"
 
@@ -5094,21 +4502,51 @@ msgstr "Teillieferung"
 #~ "* Verfolgbarkeit (rückwärts, vorwärts, Produktionslose, Serien Nummern,..)\n"
 #~ "    "
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Planned Date"
 #~ msgstr "Datum Planung"
 
 #~ msgid "Outgoing Products"
 #~ msgstr "Warenversand"
 
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER"
+
 #~ msgid "Lots by location"
 #~ msgstr "Bestand nach Lagerorten"
 
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
 #~ msgid "Created Date"
 #~ msgstr "Datum erstellt"
 
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
 #~ msgid "Tracking Lots"
 #~ msgstr "Fertigungsserie"
 
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
+
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
 #~ msgid "Create invoices"
 #~ msgstr "Erzeuge Rechnungen"
 
@@ -5118,18 +4556,48 @@ msgstr "Teillieferung"
 #~ msgid "Packing to Process"
 #~ msgstr "Lieferungen zu Bearbeiten"
 
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
 #~ msgid "Make packing"
 #~ msgstr "Erzeuge Packauftrag"
 
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
 #~ msgid "Nearest"
 #~ msgstr "Nächster"
 
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
 #~ msgid "Workshop"
 #~ msgstr "Werksverkauf"
 
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
 #~ msgid "Tiny sprl"
 #~ msgstr "Tiny sprl"
 
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
 #~ msgid "Force to use a Production Lot during deliveries"
 #~ msgstr "Erzwinge Verwendung eines Fertigungsloses während der Auslieferung"
 
@@ -5142,15 +4610,39 @@ msgstr "Teillieferung"
 #~ msgid "Auto-Packing"
 #~ msgstr "Automatische Erstellung Packauftrag"
 
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
 #~ msgid "Location Overview"
 #~ msgstr "Bestandsliste"
 
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
 #~ msgid "Split move line"
 #~ msgstr "Aufteilen Warenbewegung"
 
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
 #~ msgid "Chained Delay (days)"
 #~ msgstr "Verzögerung in Tagen"
 
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
 #~ msgid ""
 #~ "This is used only if you selected a chained location type.\n"
 #~ "The 'Automatic Move' value will create a stock move after the current one "
@@ -5181,12 +4673,24 @@ msgstr "Teillieferung"
 #~ msgid "Max. Planned Date"
 #~ msgstr "Max. Datum"
 
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
 #~ msgid "Delivery Orders"
 #~ msgstr "Warenauslieferung"
 
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
 #~ msgid "Stock Locations Structure"
 #~ msgstr "Lagerorte Struktur"
 
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
 #~ msgid ""
 #~ "This account will be used, instead of the default one, to value output stock"
 #~ msgstr ""
@@ -5196,9 +4700,24 @@ msgstr "Teillieferung"
 #~ msgid "Moves Tracked"
 #~ msgstr "Buchungen verfolgt"
 
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
+#~ msgid "terp-project"
+#~ msgstr "Projekt Administrator"
+
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
 #~ msgid "Canceled"
 #~ msgstr "Abgebrochen"
 
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
 #~ msgid ""
 #~ "For the current product (template), this stock location will be used, "
 #~ "instead of the default one, as the source location for stock moves generated "
@@ -5211,6 +4730,9 @@ msgstr "Teillieferung"
 #~ msgid "Add"
 #~ msgstr "Hinzuf."
 
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
 #~ msgid "Confirmed Packing Waiting Availability"
 #~ msgstr "bestätigte Lieferungen - nicht verfügbar"
 
@@ -5223,6 +4745,9 @@ msgstr "Teillieferung"
 #~ msgid "Do you want to set stocks to zero ?"
 #~ msgstr "Wollen Sie den Lagerbestand auf 0 setzen?"
 
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
 #~ msgid "Split in Two"
 #~ msgstr "Aufteilen"
 
@@ -5244,6 +4769,9 @@ msgstr "Teillieferung"
 #~ msgid "Supplier Invoice"
 #~ msgstr "Eingangsrechnungen"
 
+#~ msgid "terp-product"
+#~ msgstr "terp-product"
+
 #~ msgid "Close"
 #~ msgstr "Fertig"
 
@@ -5259,18 +4787,27 @@ msgstr "Teillieferung"
 #~ msgid "Low Level"
 #~ msgstr "Basisdaten"
 
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
 #~ msgid "Delivery"
 #~ msgstr "Lieferung"
 
 #~ msgid "Locations' Values"
 #~ msgstr "Werte Lagerorte"
 
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
 #~ msgid "Inventory line"
 #~ msgstr "Betreff"
 
 #~ msgid "Others info"
 #~ msgstr "Weitere Information"
 
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
 #~ msgid "Move State"
 #~ msgstr "Status Warenbewegung"
 
@@ -5339,9 +4876,106 @@ msgstr "Teillieferung"
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr "Diese Losnummer wird für die logistische Einheit/Pallette vergeben"
 
+#~ msgid "terp-rating-rated"
+#~ msgstr "terp-rating-rated"
+
+#~ msgid "terp-mail-forward"
+#~ msgstr "terp-mail-forward"
+
+#~ msgid "terp-stock_effects-object-colorize"
+#~ msgstr "terp-stock_effects-object-colorize"
+
+#~ msgid "terp-folder-blue"
+#~ msgstr "terp-folder-blue"
+
+#~ msgid "terp-personal+"
+#~ msgstr "terp-personal+"
+
+#~ msgid "terp-dialog-close"
+#~ msgstr "terp-dialog-close"
+
+#~ msgid "terp-personal-"
+#~ msgstr "terp-personal-"
+
+#~ msgid "terp-dolar"
+#~ msgstr "terp-dolar"
+
+#~ msgid "terp-gtk-jump-to-ltr"
+#~ msgstr "terp-gtk-jump-to-ltr"
+
+#~ msgid "terp-stock_symbol-selection"
+#~ msgstr "terp-stock_symbol-selection"
+
+#~ msgid "terp-stage"
+#~ msgstr "terp-stage"
+
+#~ msgid "terp-accessories-archiver-minus"
+#~ msgstr "terp-accessories-archiver-minus"
+
+#~ msgid "terp-gdu-smart-failing"
+#~ msgstr "terp-gdu-smart-failing"
+
+#~ msgid "terp-emblem-important"
+#~ msgstr "terp-emblem-important"
+
+#~ msgid "terp-face-plain"
+#~ msgstr "terp-face-plain"
+
+#~ msgid "terp-gnome-cpu-frequency-applet+"
+#~ msgstr "terp-gnome-cpu-frequency-applet+"
+
+#~ msgid "terp-gtk-media-pause"
+#~ msgstr "terp-gtk-media-pause"
+
+#~ msgid "terp-stock_format-scientific"
+#~ msgstr "terp-stock_format-scientific"
+
+#~ msgid "terp-go-today"
+#~ msgstr "terp-go-today"
+
+#~ msgid "terp-gtk-go-back-rtl"
+#~ msgstr "terp-gtk-go-back-rtl"
+
+#~ msgid "terp-mail-"
+#~ msgstr "terp-mail-"
+
+#~ msgid "terp-call-start"
+#~ msgstr "terp-call-start module: stock"
+
+#~ msgid "terp-locked"
+#~ msgstr "terp-locked"
+
+#~ msgid "terp-personal"
+#~ msgstr "terp-personal"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Regeln werden für osv.memory Objekte nicht unterstützt!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fehler! Sie können keine rekursiven Betriebe erzeugen."
+
 #~ msgid "Extended options..."
 #~ msgstr "Erweiterte Optionen.."
 
+#, python-format
+#~ msgid "No invoice were created"
+#~ msgstr "Es wurden keine Rechnungen erzeugt"
+
+#, python-format
+#~ msgid ""
+#~ "Variation Account is not specified for Product Category: %s' % "
+#~ "(product_obj.categ_id.name)))\n"
+#~ "        move_ids = []\n"
+#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
+#~ msgstr ""
+#~ "Bestandveränderungskonto fehlt für Produktkategorie: %s' % "
+#~ "(product_obj.categ_id.name)))\n"
+#~ "        move_ids = []\n"
+#~ "        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock input account defined ' \\n                                "
@@ -5353,10 +4987,86 @@ msgstr "Teillieferung"
 #~ msgid "Inventory (with child locations)"
 #~ msgstr "Inventur (mit untergeordneten Lagerorten)"
 
+#~ msgid "terp-accessories-archiver"
+#~ msgstr "terp-accessories-archiver"
+
+#~ msgid "terp-gtk-go-back-ltr"
+#~ msgstr "terp-gtk-go-back-ltr"
+
+#~ msgid "terp-mail-replied"
+#~ msgstr "terp-mail-replied"
+
+#~ msgid "terp-folder-green"
+#~ msgstr "terp-folder-green"
+
+#~ msgid "terp-stock_align_left_24"
+#~ msgstr "terp-stock_align_left_24"
+
+#~ msgid "terp-folder-orange"
+#~ msgstr "terp-folder-orange"
+
+#~ msgid "terp-accessories-archiver+"
+#~ msgstr "terp-accessories-archiver+"
+
+#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+#~ msgstr ""
+#~ "Eindeutige Seriennummer, wird wiefolgt angezeigt: PREFIX/SERIAL [INT_REF]"
+
+#~ msgid "terp-folder-yellow"
+#~ msgstr "terp-folder-yellow"
+
+#~ msgid "terp-dolar_ok!"
+#~ msgstr "terp-dolar_ok!"
+
+#~ msgid "terp-go-year"
+#~ msgstr "terp-go-year"
+
+#~ msgid "terp-gtk-jump-to-rtl"
+#~ msgstr "terp-gtk-jump-to-rtl"
+
+#~ msgid "Serial Number"
+#~ msgstr "Seriennummer"
+
 #, python-format
 #~ msgid "New picking invoices"
 #~ msgstr "Neue Lieferscheinbuchungen"
 
+#~ msgid "terp-idea"
+#~ msgstr "terp-idea"
+
+#~ msgid "terp-stock_format-default"
+#~ msgstr "terp-stock_format-default"
+
+#~ msgid "terp-check"
+#~ msgstr "terp-check"
+
+#~ msgid "terp-camera_test"
+#~ msgstr "terp-camera_test"
+
+#~ msgid "terp-gtk-stop"
+#~ msgstr "terp-gtk-stop"
+
+#~ msgid "terp-go-week"
+#~ msgstr "terp-go-week"
+
+#~ msgid "terp-go-home"
+#~ msgstr "terp-go-home"
+
+#~ msgid "terp-document-new"
+#~ msgstr "terp-document-new"
+
+#~ msgid "terp-mail_delete"
+#~ msgstr "terp-mail_delete"
+
+#~ msgid "terp-go-month"
+#~ msgstr "terp-go-month"
+
+#~ msgid "terp-gtk-select-all"
+#~ msgstr "terp-gtk-select-all"
+
+#~ msgid "terp-mail-message-new"
+#~ msgstr "terp-mail-message-new"
+
 #, python-format
 #~ msgid ""
 #~ "There is no journal defined '\\n                                'on the "
@@ -5365,6 +5075,27 @@ msgstr "Teillieferung"
 #~ "Journaldefinition fehlt '\\n                                'für die "
 #~ "Produktkategorie: \"%s\" (id: %d)"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#, python-format
+#~ msgid ""
+#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
+#~ "            move_product_qty[move.id] = product_qty\n"
+#~ "            product_uom = partial_data.get('product_uom',False)\n"
+#~ "            product_price = partial_data.get('product_price',0.0)\n"
+#~ "            product_currency = partial_data.get('product_currency',False)\n"
+#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+#~ msgstr ""
+#~ "Kann keine zugehörigen Daten auffinden für Lagerbuchung :%s' %(move.id))\n"
+#~ "            product_qty = partial_data.get('product_qty',0.0)\n"
+#~ "            move_product_qty[move.id] = product_qty\n"
+#~ "            product_uom = partial_data.get('product_uom',False)\n"
+#~ "            product_price = partial_data.get('product_price',0.0)\n"
+#~ "            product_currency = partial_data.get('product_currency',False)\n"
+#~ "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+
 #~ msgid "Outgoing Products delay"
 #~ msgstr "Verzug bei Warenversand"
 
@@ -5376,6 +5107,30 @@ msgstr "Teillieferung"
 #~ "Dee Summe der geteilten Mengen ist größer als die zutelende Menge' \\n       "
 #~ "                             'für Produkt: \"%s\" (id: %d)"
 
+#, python-format
+#~ msgid "Bad Lot Assignation !"
+#~ msgstr "Fehler bei  Zuweisung eines Los !"
+
+#, python-format
+#~ msgid ""
+#~ "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
+#~ "                move_product_qty[move.id] = product_qty\n"
+#~ "                product_uom = partial_data.get('product_uom',False)\n"
+#~ "                product_price = partial_data.get('product_price',0.0)\n"
+#~ "                product_currency = "
+#~ "partial_data.get('product_currency',False)\n"
+#~ "                prodlot_id = partial_data.get('prodlot_id"
+#~ msgstr ""
+#~ "Konnte keine Daten zu diesem Lieferschein auffinden :%s' %(move.id))\n"
+#~ "                product_qty = partial_data.get('product_qty',0.0)\n"
+#~ "                move_product_qty[move.id] = product_qty\n"
+#~ "                product_uom = partial_data.get('product_uom',False)\n"
+#~ "                product_price = partial_data.get('product_price',0.0)\n"
+#~ "                product_currency = "
+#~ "partial_data.get('product_currency',False)\n"
+#~ "                prodlot_id = partial_data.get('prodlot_id"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined ' \\n                               "
@@ -5384,6 +5139,9 @@ msgstr "Teillieferung"
 #~ "Es ist kein Konto für das Ausgangslager definiert ' \\n                      "
 #~ "                      'für dieses Produkt: \"%s\" (id: %d)"
 
+#~ msgid "Not from Picking"
+#~ msgstr "Nicht vom Lieferschein"
+
 #, python-format
 #~ msgid ""
 #~ "The current move line is already assigned to a pack, please remove it first "
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 47013a4b65d..469dce0d2ba 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -6,21 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-29 07:13+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:06+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-rating-rated"
-msgstr "terp-rating-rated"
-
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
@@ -31,22 +27,26 @@ msgstr "Lotes de seguimiento de salida"
 msgid "Stock ups upload"
 msgstr "Stock ups carga"
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+"No se ha especificado la cuenta de variación para la categoría de producto: "
+"%s"
+
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Ubicación encadenada si fija"
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
 msgstr "Poner en un paquete nuevo"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE"
-msgstr "STOCK_SAVE"
-
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
@@ -57,16 +57,6 @@ msgstr "Acción"
 msgid "Upstream Traceability"
 msgstr "Trazabilidad hacia arriba"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-account"
-msgstr "terp-account"
-
-#. module: stock
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de la acción."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
@@ -74,9 +64,9 @@ msgid "Last Product Inventories"
 msgstr "Último inventario de productos"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_ASCENDING"
-msgstr "STOCK_SORT_ASCENDING"
+#: view:stock.move:0
+msgid "Today"
+msgstr "Hoy"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
@@ -88,19 +78,6 @@ msgstr "Número revisión"
 msgid "Product Moves"
 msgstr "Movimientos productos"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"            product_qty = partial_data.get('product_qty',0.0)\n"
-"            move_product_qty[move.id] = product_qty\n"
-"            product_uom = partial_data.get('product_uom',False)\n"
-"            product_price = partial_data.get('product_price',0.0)\n"
-"            product_currency = partial_data.get('product_currency',False)\n"
-"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
 msgid ""
@@ -111,9 +88,11 @@ msgstr ""
 "de acuerdo con sus distintos pedidos de ventas y sus reglas logísticas."
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
-msgid "Inventory Control"
-msgstr "Control inventario"
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr "Análisis movimientos"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -124,11 +103,6 @@ msgstr ""
 "Número interno de referencia en caso de que sea diferente del número de "
 "serie del fabricante."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
@@ -174,6 +148,12 @@ msgstr "Día"
 msgid "UoM"
 msgstr "UdM"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr "Inventarios físicos"
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
@@ -200,13 +180,10 @@ msgstr ""
 "de esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: help:stock.move,address_id:0
-msgid ""
-"Optional address where goods are to be delivered, specifically used for "
-"allotment"
-msgstr ""
-"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
-"específicamente para lotes."
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr "Faltan datos del albarán parcial para el movimiento #%s"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
@@ -232,14 +209,9 @@ msgstr ""
 "(id: %d)"
 
 #. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Ubicación de inventario"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-emblem-important"
-msgstr "terp-emblem-important"
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -265,6 +237,7 @@ msgstr "Identificación paquete"
 
 #. module: stock
 #: view:stock.move:0
+#: field:stock.move,picking_id:0
 #: field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
@@ -299,6 +272,11 @@ msgstr ""
 "productos de la ubicación Proveedor a la ubicación Stock. Cada informe "
 "informe puede realizarse sobre ubicaciones físicas, externas o virtuales."
 
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
 msgid ""
@@ -392,11 +370,6 @@ msgstr "No facturación"
 msgid "Production lot"
 msgstr "Lote de producción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_FORWARD"
-msgstr "STOCK_MEDIA_FORWARD"
-
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
@@ -434,11 +407,6 @@ msgstr "Confirmar el inventario"
 msgid "State"
 msgstr "Estado"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-forward"
-msgstr "terp-mail-forward"
-
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
@@ -493,11 +461,6 @@ msgid ""
 "Create and manage your warehouses and assign them a location from here"
 msgstr "Crea y gestiona sus almacenes y les asigna una ubicación desde aquí"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
-
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
@@ -520,30 +483,22 @@ msgstr "Ubicación de salida"
 msgid "Split into"
 msgstr "Dividir en"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Today"
-msgstr "Hoy"
-
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
 msgstr "Moneda para precio promedio"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-hr"
-msgstr "terp-hr"
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
+"asientos del diario para todos los movimientos de stock de entrada será "
+"creada en esta cuenta. Si no se indica en el producto, se utilizará la "
+"definida en la categoría del producto."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -551,22 +506,17 @@ msgstr "terp-hr"
 msgid "Location Type"
 msgstr "Tipo de ubicación"
 
+#. module: stock
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
+
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
 msgstr "Indica tipo de envío, mercancías de entrada o de salida."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_effects-object-colorize"
-msgstr "terp-stock_effects-object-colorize"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
@@ -639,11 +589,9 @@ msgid "Grand Total:"
 msgstr "Total:"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_move_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
-#: view:report.stock.move:0
-msgid "Moves Analysis"
-msgstr "Análisis movimientos"
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr "Control inventario"
 
 #. module: stock
 #: view:stock.location:0
@@ -663,11 +611,6 @@ msgstr "Ubicación / Producto"
 msgid "Reception"
 msgstr "Recepción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
-
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
@@ -723,9 +666,9 @@ msgid "Packs"
 msgstr "Paquetes"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #. module: stock
 #: view:res.partner:0
@@ -748,11 +691,6 @@ msgstr ""
 "enviar a sus clientes. Puede porcesar los envíos directamente desde esta "
 "lista, línea por línea, o a través del menú órdenes de envío."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-blue"
-msgstr "terp-folder-blue"
-
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
@@ -768,11 +706,6 @@ msgstr "Ubicación de abastecimiento"
 msgid "Production Lots"
 msgstr "Lotes de producción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "terp-project"
-
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
@@ -794,16 +727,6 @@ msgstr "Octubre"
 msgid "Inventory Line"
 msgstr "Línea inventario"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal+"
-msgstr "terp-personal+"
-
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
@@ -819,16 +742,6 @@ msgstr ""
 msgid "Process Picking"
 msgstr "Procesar albarán"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-graph"
-msgstr "terp-graph"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -845,11 +758,6 @@ msgstr ""
 "Marque esta opción para seleccionar lotes existentes en la lista inferior, "
 "de lo contrario debe introducir otros de nuevos línea por la línea."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dialog-close"
-msgstr "terp-dialog-close"
-
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
@@ -878,26 +786,11 @@ msgid "Production lot is used to put a serial number on the production"
 msgstr ""
 "Lote de producción se utiliza para poner un número de serie a la producción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
-
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
 msgstr "Ubicación de entrada"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal-"
-msgstr "terp-personal-"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
@@ -930,9 +823,9 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Ubicación de tránsito para transferencias inter-compañías"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "Valor stock virtual"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -959,22 +852,11 @@ msgstr "Desecho"
 msgid "Contains"
 msgstr "Contiene"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar"
-msgstr "terp-dolar"
-
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
 msgstr "Retraso albaranes entrada"
 
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Future Qty"
-msgstr "Ctdad futura"
-
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
@@ -1002,11 +884,6 @@ msgstr "Fecha prevista"
 msgid "Pack Search"
 msgstr "Buscar paquete"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-ltr"
-msgstr "terp-gtk-jump-to-ltr"
-
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
@@ -1017,17 +894,6 @@ msgstr "Urgente"
 msgid "Journal"
 msgstr "Diario"
 
-#. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr "¡Asignación de lote errónea!"
-
 #. module: stock
 #: help:stock.picking,location_id:0
 msgid ""
@@ -1055,20 +921,19 @@ msgid "Stock by Location"
 msgstr "Existencias por ubicacion"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
+"específicamente para lotes."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
 msgstr "Mes-1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_symbol-selection"
-msgstr "terp-stock_symbol-selection"
-
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1092,11 +957,6 @@ msgstr "Stock virtual"
 msgid "View"
 msgstr "Vista"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
-
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
@@ -1109,24 +969,15 @@ msgid "Delivery Information"
 msgstr "Información de envío"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Inventario de stock realizado"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stage"
-msgstr "terp-stage"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
-
-#. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Cantidad por lote"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1137,18 +988,6 @@ msgstr ""
 "No se ha definido una cuenta de salida de stock para este producto: \"%s\" "
 "(id: %d)"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
@@ -1247,43 +1086,17 @@ msgstr ""
 "terminados.\n"
 "                      "
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
-
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDELETE"
-msgstr "STOCK_UNDELETE"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Delivery Order"
 msgstr "Orden de entrega"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "No invoice were created"
-msgstr "No se han creado facturas"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
@@ -1305,11 +1118,6 @@ msgstr "Fecha realizado"
 msgid "Expected Shipping Date"
 msgstr "Fecha de envío prevista"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver-minus"
-msgstr "terp-accessories-archiver-minus"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
@@ -1328,11 +1136,6 @@ msgstr "Dividir líneas de inventario"
 msgid "Physical Inventory"
 msgstr "Inventario físico"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
-
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
@@ -1344,9 +1147,15 @@ msgstr ""
 "determinar la compañía)."
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
+"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
+"origen y destino)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1354,41 +1163,25 @@ msgid "Lot number"
 msgstr "Número de lote"
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr "Unidad de medida"
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr "UdM del producto"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "Ubicaciones de empresas"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"                product_qty = partial_data.get('product_qty',0.0)\n"
-"                move_product_qty[move.id] = product_qty\n"
-"                product_uom = partial_data.get('product_uom',False)\n"
-"                product_price = partial_data.get('product_price',0.0)\n"
-"                product_currency = "
-"partial_data.get('product_currency',False)\n"
-"                prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
 msgstr "Cantidad total"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
@@ -1405,11 +1198,6 @@ msgstr "Clientes europeos"
 msgid "Delay between original move and chained move in days"
 msgstr "Retraso entre movimiento original y movimiento encadenado en días."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
@@ -1469,9 +1257,9 @@ msgid "is in draft state."
 msgstr "está en estado borrador."
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr "Stock ups final"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -1489,12 +1277,6 @@ msgstr "Para ser abonado/facturado"
 msgid "Shop 1"
 msgstr "Tienda 1"
 
-#. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
-msgid "Total Value"
-msgstr "Valor total"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 #: view:stock.fill.inventory:0
@@ -1523,12 +1305,6 @@ msgstr "Vista calendario"
 msgid "Additional Info"
 msgstr "Información adicional"
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
-#: report:stock.inventory.move:0
-msgid "Stock Inventory"
-msgstr "Inventario stock"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -1590,11 +1366,6 @@ msgstr "Buscar albarán stock"
 msgid "Company is not specified in Location"
 msgstr "No se ha especificado una compañía en la ubicación"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-report"
-msgstr "terp-report"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:stock.partial.move,type:0
@@ -1606,11 +1377,6 @@ msgstr "Tipo"
 msgid "Generic IT Suppliers"
 msgstr "Proveedores TI genéricos"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
-
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
@@ -1629,32 +1395,12 @@ msgstr "Id línea de inventario"
 msgid "Address of  customer or supplier."
 msgstr "Dirección del cliente o proveedor."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gdu-smart-failing"
-msgstr "terp-gdu-smart-failing"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Albarán"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1662,11 +1408,6 @@ msgstr "STOCK_GO_DOWN"
 msgid "Customer Location"
 msgstr "Ubicación del cliente"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OK"
-msgstr "STOCK_OK"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -1696,15 +1437,21 @@ msgid "General Informations"
 msgstr "Información general"
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ninguno"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr "Trazabilidad hacia abajo"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No Invoices were created"
+msgstr "No se han creado facturas"
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
@@ -1780,21 +1527,11 @@ msgstr "Tiempo inicial encadenado"
 msgid "Cannot deliver products which are already delivered !"
 msgstr "¡No se pueden enviar productos que ya están enviados!"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
 msgstr "Stock factura en el envío"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-face-plain"
-msgstr "terp-face-plain"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
@@ -1808,11 +1545,6 @@ msgstr "Ubicación del proveedor"
 msgid "were scrapped"
 msgstr "estaban desechados"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
-
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1824,11 +1556,6 @@ msgstr "Parcial"
 msgid "September"
 msgstr "Septiembre"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
-
 #. module: stock
 #: help:stock.picking,backorder_id:0
 msgid ""
@@ -1864,24 +1591,16 @@ msgstr ""
 "Seleccione varios inventarios físicos para fusionar en la vista lista."
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"Variation Account is not specified for Product Category: %s' % "
-"(product_obj.categ_id.name)))\n"
-"        move_ids = []\n"
-"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gnome-cpu-frequency-applet+"
-msgstr "terp-gnome-cpu-frequency-applet+"
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1900,51 +1619,21 @@ msgstr "Cancelar disponibilidad"
 msgid "Scheduled date for the processing of this move"
 msgstr "Fecha planificada para el procesado de este movimiento"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-media-pause"
-msgstr "terp-gtk-media-pause"
-
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Movimientos creados"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-scientific"
-msgstr "terp-stock_format-scientific"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
 msgstr "Estante 2"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "Para facturar"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
-
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
 msgstr "Lote seguimiento"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-today"
-msgstr "terp-go-today"
-
 #. module: stock
 #: help:stock.location,posx:0
 #: help:stock.location,posy:0
@@ -1963,6 +1652,11 @@ msgstr "Propiedades de las ubicaciones parte recíproca"
 msgid "Localization"
 msgstr "Ubicación"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr "Informe de stock por lotes de seguimiento"
+
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -1981,11 +1675,6 @@ msgstr "Dividir en lotes"
 msgid "Production Lot Numbers"
 msgstr "Números lote de producción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,date:0
@@ -2008,37 +1697,17 @@ msgstr "Fecha"
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-administration"
-msgstr "terp-administration"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
-
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
 msgstr "Ubicación stock"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
 msgid "Merging is only allowed on draft inventories."
 msgstr "La fusión sólo es permitida en inventarios borrador."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-rtl"
-msgstr "terp-gtk-go-back-rtl"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
@@ -2049,16 +1718,6 @@ msgstr "Tablero"
 msgid "Track moves"
 msgstr "Movimientos seguimiento"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-crm"
-msgstr "terp-crm"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
-
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
@@ -2075,16 +1734,6 @@ msgstr "Número lotes"
 msgid "Warehouse Dashboard"
 msgstr "Tablero almacén"
 
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-"
-msgstr "terp-mail-"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -2100,9 +1749,10 @@ msgid "Scrap Products"
 msgstr "Productos de desecho"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr "¡No puede eliminar el albarán que está en estado %s!"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -2120,6 +1770,7 @@ msgid "Return Picking"
 msgstr "Devolver albarán"
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
@@ -2146,21 +1797,6 @@ msgstr "Dirección de envío:"
 msgid "Provide the quantities of the returned products."
 msgstr "Indique las cantidades de los productos devueltos."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-call-start"
-msgstr "terp-call-start"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
@@ -2193,11 +1829,6 @@ msgstr ""
 "defecto, como la ubicación de origen para recibir mercancías desde esta "
 "empresa"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Picking"
-msgstr "No desde albarán"
-
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -2215,11 +1846,6 @@ msgstr ""
 "analizar las diferentes rutas tomadas por sus productos y el rendimiento de "
 "su inventario."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
-
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
@@ -2236,9 +1862,9 @@ msgid "Search Inventory"
 msgstr "Buscar inventario"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Informe de stock por lotes de seguimiento"
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Cantidad por lote"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2270,16 +1896,6 @@ msgstr ""
 "Prefijo opcional a añadir cuando se muestre el número de serie: "
 "PREFIJO/SERIE [REF_INT]"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
-
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2356,11 +1972,6 @@ msgstr "Tiempo real (automatizado)"
 msgid "Logistical shipping unit: pallet, box, pack ..."
 msgstr "Unidad de envío logística: Palet, caja, paquete, ..."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-locked"
-msgstr "terp-locked"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "_Apply"
@@ -2375,9 +1986,9 @@ msgid "]"
 msgstr "]"
 
 #. module: stock
-#: field:stock.move.memory,wizard_id:0
-msgid "Wizard"
-msgstr "Asistente"
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Ubicación de inventario"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2385,11 +1996,6 @@ msgstr "Asistente"
 msgid "Total value"
 msgstr "Valor total"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal"
-msgstr "terp-personal"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
 msgid ""
@@ -2411,11 +2017,6 @@ msgstr ""
 "tipo de encadenamiento no es transparente (no se utiliza ningún diario si se "
 "deja vacío)."
 
-#. module: stock
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
-
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
@@ -2427,16 +2028,6 @@ msgstr "Albarán de entrada"
 msgid "Creation"
 msgstr "Creación"
 
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr "¡El nombre del diario debe ser único por compañía!"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver"
-msgstr "terp-accessories-archiver"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.move.memory,cost:0
@@ -2445,9 +2036,11 @@ msgid "Cost"
 msgstr "Coste"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr "Cuenta entrada stock"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2455,18 +2048,6 @@ msgstr "STOCK_COPY"
 msgid "Warehouse Management"
 msgstr "Gestión de almacenes"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-#: field:stock.change.standard.price,stock_account_output:0
-msgid "Stock Output Account"
-msgstr "Cuenta salida stock"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
@@ -2483,11 +2064,6 @@ msgstr "Producto "
 msgid "Stock Location Analysis"
 msgstr "Análisis ubicación stock"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
@@ -2539,11 +2115,6 @@ msgstr "Albarán de entrada"
 msgid "Unit of Measure"
 msgstr "Unidad de medida"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -2559,11 +2130,6 @@ msgstr ""
 "Fuerza a especificar un lote de producción para todos los movimientos que "
 "contienen este producto y generados por una orden de fabricación."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
 #: view:stock.move.track:0
@@ -2604,16 +2170,6 @@ msgstr "Cambiar a borrador"
 msgid "Stock Journals"
 msgstr "Diarios de stock"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-ltr"
-msgstr "terp-gtk-go-back-ltr"
-
-#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "Número de serie único, será mostrado como: PREFIJO/SERIE [REF_INT]"
-
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
@@ -2648,31 +2204,21 @@ msgstr "Productos "
 msgid "Track Incoming Lots"
 msgstr "Lotes de seguimiento de entrada"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-replied"
-msgstr "terp-mail-replied"
-
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
 msgstr "Tablero almacén"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Physical Inventories"
-msgstr "Inventarios físicos"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr "Ctdad futura"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr "Cuenta variación stock"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2710,11 +2256,6 @@ msgstr "Sólo puede eliminar movimientos borrador."
 msgid "Products"
 msgstr "Productos"
 
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ninguno"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
@@ -2752,14 +2293,9 @@ msgstr ""
 "categoría: \"%s\" (id: %d)"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2771,11 +2307,6 @@ msgstr "Retraso (días)"
 msgid "Move"
 msgstr "Movimiento"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
-
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
@@ -2787,17 +2318,17 @@ msgstr "Fecha prevista para procesar el albarán."
 msgid "P&L Qty"
 msgstr "Ctdad P&L"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-green"
-msgstr "terp-folder-green"
-
 #. module: stock
 #: view:stock.production.lot:0
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
 msgstr "Revisiones"
 
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr "Esta operación cancelará el envío. ¿Desea continuar?"
+
 #. module: stock
 #: help:product.product,valuation:0
 msgid ""
@@ -2869,13 +2400,11 @@ msgstr "Inventario"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
 msgid "Picking List"
 msgstr "Albarán"
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
+#: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
@@ -2920,19 +2449,6 @@ msgstr "Resultado reemplazo stock"
 msgid "Fixed Location"
 msgstr "Ubicaciones fijas"
 
-#. module: stock
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_align_left_24"
-msgstr "terp-stock_align_left_24"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
 msgid ""
@@ -2944,26 +2460,6 @@ msgstr ""
 "creado. Después de seleccionar un lote, puede obtener la trazabilidad "
 "(ascendente o descendente) de los productos de dicho lote."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-orange"
-msgstr "terp-folder-orange"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver+"
-msgstr "terp-accessories-archiver+"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
@@ -2974,11 +2470,6 @@ msgstr "Julio"
 msgid "Consumable"
 msgstr "Consumible"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
 msgid ""
@@ -2992,11 +2483,6 @@ msgstr ""
 "frecuentemente, necesita este informe para asegurar que el stock de cada "
 "producto ha sido controlado al menos una vez al año."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
@@ -3012,22 +2498,12 @@ msgstr "Previsión nivel de stock"
 msgid "Stock Journal"
 msgstr "Diario de inventario"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "Abastecimiento"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-yellow"
-msgstr "terp-folder-yellow"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
@@ -3077,11 +2553,6 @@ msgstr "Ver stock de productos"
 msgid "Internal Picking list"
 msgstr "Albarán interno"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
@@ -3100,11 +2571,6 @@ msgid ""
 msgstr ""
 "Si el campo activo se desmarca, permite ocultar un paquete sin eliminarlo."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar_ok!"
-msgstr "terp-dolar_ok!"
-
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
@@ -3150,11 +2616,6 @@ msgstr ""
 "No se ha definido una cuenta de entrada de stock para este producto: \"%s\" "
 "(id: %d)"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-year"
-msgstr "terp-go-year"
-
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
@@ -3165,6 +2626,14 @@ msgstr "Stock real"
 msgid "Fill Inventory"
 msgstr "Rellenar inventario"
 
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
+
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid ""
@@ -3184,30 +2653,25 @@ msgid "Revision Date"
 msgstr "Fecha de revisión"
 
 #. module: stock
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
+msgid "Lot"
+msgstr "Lote"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
 msgstr "Número lote de producción"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-rtl"
-msgstr "terp-gtk-jump-to-rtl"
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "Cantidad (UdV)"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3223,21 +2687,6 @@ msgstr "Dirección de contacto :"
 msgid "Back Order"
 msgstr "Pedido pendiente"
 
-#. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial Number"
-msgstr "Número de serie"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
-
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
@@ -3250,11 +2699,6 @@ msgstr "Activo"
 msgid "Inventory Management"
 msgstr "Almacenes y logística"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-idea"
-msgstr "terp-idea"
-
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
@@ -3300,11 +2744,6 @@ msgstr ""
 "Si se marca, los productos que figuran en las ubicaciones hijas de la "
 "ubicación seleccionada se incluirán también."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
-
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
@@ -3349,11 +2788,6 @@ msgstr "Nombre de revisión"
 msgid "Warehouse"
 msgstr "Almacén"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
-
 #. module: stock
 #: view:stock.location.product:0
 msgid ""
@@ -3370,11 +2804,6 @@ msgstr ""
 msgid "Accounting Stock Properties"
 msgstr "Propiedades contables del stock"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NO"
-msgstr "STOCK_NO"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
@@ -3399,20 +2828,15 @@ msgstr "Realizado"
 msgid "Change Standard Price"
 msgstr "Cambiar precio estándar"
 
-#. module: stock
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
 msgstr "Ubicaciones virtuales"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Para facturar"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
@@ -3432,21 +2856,11 @@ msgstr ""
 msgid "Not urgent"
 msgstr "No urgente"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-default"
-msgstr "terp-stock_format-default"
-
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
 msgstr "Para hacer"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
@@ -3458,16 +2872,6 @@ msgstr "Almacenes"
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-check"
-msgstr "terp-check"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-camera_test"
-msgstr "terp-camera_test"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -3475,11 +2879,6 @@ msgstr "terp-camera_test"
 msgid "Inventory Analysis"
 msgstr "Análisis inventario"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
-
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
@@ -3517,11 +2916,6 @@ msgstr "Stock"
 msgid "Product"
 msgstr "Producto"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -3563,13 +2957,10 @@ msgid "Consume Products"
 msgstr "Consumir productos"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: code:addons/stock/stock.py:0
 #, python-format
-msgid "Product UOM"
-msgstr "UdM del producto"
+msgid "Insufficient Stock in Lot !"
+msgstr "¡Stock insuficiente en el lote!"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3598,19 +2989,15 @@ msgid "Suppliers"
 msgstr "Proveedores"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Valor total"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-tools"
-msgstr "terp-tools"
+#: field:stock.move.memory,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3618,11 +3005,6 @@ msgstr "terp-tools"
 msgid "Products by Location"
 msgstr "Productos por ubicación"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
-
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
@@ -3633,21 +3015,11 @@ msgstr "Incluir hijos"
 msgid "Shelf 1"
 msgstr "Estante 1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-sale"
-msgstr "terp-sale"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
 msgstr "Orden"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
-
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
@@ -3660,25 +3032,16 @@ msgstr "Referencia paquete"
 msgid "Source Location"
 msgstr "Ubicación origen"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-stop"
-msgstr "terp-gtk-stop"
-
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Asientos contables"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Unidad de medida"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3762,11 +3125,6 @@ msgstr "Cantidad de entrada total"
 msgid "Out Qty"
 msgstr "Ctdad salida"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
-
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
@@ -3818,16 +3176,6 @@ msgstr "Icono"
 msgid "UserError"
 msgstr "Error de usuario"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-week"
-msgstr "terp-go-week"
-
 #. module: stock
 #: view:stock.inventory.line.split:0
 #: view:stock.move.consume:0
@@ -3846,18 +3194,12 @@ msgstr "Clientes no europeos"
 #. module: stock
 #: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_splitinto.py:0
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
-#, python-format
-msgid "Stock Inventory is done"
-msgstr "Inventario de stock realizado"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -3921,14 +3263,10 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
-
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr "¡El código del diario debe ser único por compañía!"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3941,11 +3279,6 @@ msgstr ""
 "hacer clic en una ubicación para obtener la lista de productos y su nivel de "
 "stock para esta ubicación en particular y todos sus hijos."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
-
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -3958,27 +3291,13 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Stock ups final"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
-msgid "Lot"
-msgstr "Lote"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
@@ -3989,22 +3308,12 @@ msgstr "Confirmar"
 msgid "Icon show in  hierarchical tree view"
 msgstr "Icono mostrado en la vista de árbol jerárquica."
 
-#. module: stock
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr "Fusionar inventarios"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-home"
-msgstr "terp-go-home"
-
 #. module: stock
 #: field:product.product,location_id:0
 #: view:stock.location:0
@@ -4072,11 +3381,6 @@ msgstr "Cantidad a dejar en el paquete actual"
 msgid "Create invoice"
 msgstr "Crear factura"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
 msgid ""
@@ -4136,11 +3440,6 @@ msgstr "Clientes"
 msgid "is cancelled."
 msgstr "está cancelado."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-document-new"
-msgstr "terp-document-new"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
 msgid ""
@@ -4173,18 +3472,6 @@ msgstr "Procesar documento"
 msgid "Future Deliveries"
 msgstr "Entregas futuras"
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
-msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada será "
-"creada en esta cuenta. Si no se indica en el producto, se utilizará la "
-"definida en la categoría del producto."
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
@@ -4243,12 +3530,6 @@ msgstr "Auto validar"
 msgid "Product Template"
 msgstr "Plantilla producto"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "Invoices"
-msgstr "Facturas"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
@@ -4260,14 +3541,19 @@ msgid "Automatic Move"
 msgstr "Movimiento automático"
 
 #. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
-msgstr "Valor stock virtual"
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr "Lote de producción único, se mostrará como: PREFIJO/SERIE [REF_INT]"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail_delete"
-msgstr "terp-mail_delete"
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr "Devolver productos"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr "Validar inventario"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -4279,21 +3565,11 @@ msgstr ""
 "durante una confirmación de albarán (cuando se utiliza el método de precio "
 "medio de coste)."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-month"
-msgstr "terp-go-month"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
 msgstr "Movimientos de productos"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
-
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
@@ -4304,11 +3580,6 @@ msgstr "Facturado"
 msgid "Destination Address"
 msgstr "Dirección destino"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
-
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
@@ -4349,9 +3620,10 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Inventario stock"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -4373,16 +3645,6 @@ msgstr "Retraso productos de salida"
 msgid "Existing Lot"
 msgstr "Lote existente"
 
-#. module: stock
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr "¡El nombre del grupo debe ser único!"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -4404,12 +3666,6 @@ msgstr ""
 "de la por defecto, como la ubicación de origen para los movimientos de stock "
 "generados por los abastecimientos."
 
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
-#, python-format
-msgid "Warning"
-msgstr "Advertencia"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -4431,11 +3687,6 @@ msgstr "Inicializar a cero"
 msgid "Direct Delivery"
 msgstr "Entrega directa"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
@@ -4496,11 +3747,6 @@ msgstr ""
 msgid "Future Stock Moves"
 msgstr "Movimientos de stock futuros"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-select-all"
-msgstr "terp-gtk-select-all"
-
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
@@ -4533,6 +3779,7 @@ msgstr "Fichero XML"
 #: field:stock.move.memory,prodlot_id:0
 #: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
 #, python-format
 msgid "Production Lot"
 msgstr "Lote de producción"
@@ -4551,11 +3798,6 @@ msgstr "Trazabilidad"
 msgid "To invoice"
 msgstr "Para facturar"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-message-new"
-msgstr "terp-mail-message-new"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
@@ -4573,16 +3815,6 @@ msgstr "Información general"
 msgid "Prefix"
 msgstr "Prefijo"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr "STOCK_DISCONNECT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-product"
-msgstr "terp-product"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
@@ -4606,11 +3838,6 @@ msgstr "Movimientos"
 msgid "Dest. Location"
 msgstr "Ubicación destino"
 
-#. module: stock
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
-
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
@@ -4630,6 +3857,11 @@ msgstr "cantidad."
 msgid "stock.move.memory"
 msgstr "stock.movimiento.memoria"
 
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
@@ -4679,11 +3911,6 @@ msgstr "Descripción"
 msgid "May"
 msgstr "Mayo"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -4720,11 +3947,11 @@ msgid "Produced Qty"
 msgstr "Ctdad producida"
 
 #. module: stock
-#: field:product.category,property_stock_account_input_categ:0
-#: field:product.template,property_stock_account_input:0
-#: field:stock.change.standard.price,stock_account_input:0
-msgid "Stock Input Account"
-msgstr "Cuenta entrada stock"
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr "Cuenta salida stock"
 
 #. module: stock
 #: view:stock.move:0
@@ -4790,43 +4017,11 @@ msgstr "Envíos de salida"
 msgid "Warning !"
 msgstr "¡Aviso!"
 
-#. module: stock
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr "¡Sólo se puede definir un valor para cada uso dado!"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
 msgstr "Salida"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You cannot remove the picking which is in %s state !"
-msgstr "¡No puede eliminar el albarán que está en estado %s!"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr "terp-mrp"
-
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid ""
-"Shipping Type of the Picking List that will contain the chained move (leave "
-"empty to automatically detect the type based on the source and destination "
-"locations)."
-msgstr ""
-"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
-"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
-"origen y destino)."
-
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
@@ -4842,16 +4037,6 @@ msgstr "Precio coste:"
 msgid "Optional: next stock move when chaining them"
 msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
@@ -4871,12 +4056,42 @@ msgstr "Movimiento parcial"
 #~ msgid "Sub Products"
 #~ msgstr "Sub productos"
 
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
 
+#~ msgid "terp-account"
+#~ msgstr "terp-account"
+
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
 #~ msgid "Revision"
 #~ msgstr "Revisión"
 
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
 #~ msgid "Return packing"
 #~ msgstr "Devolución de paquete"
 
@@ -4895,12 +4110,33 @@ msgstr "Movimiento parcial"
 #~ msgid "Make Parcel"
 #~ msgstr "Hacer envíos parciales"
 
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
 #~ msgid "Products Sent"
 #~ msgstr "Productos enviados"
 
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
 #~ msgid "Serial"
 #~ msgstr "Nº serie"
 
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
 #~ msgid "Stock location"
 #~ msgstr "Ubicación de existencias"
 
@@ -4916,9 +4152,18 @@ msgstr "Movimiento parcial"
 #~ msgid "Track line"
 #~ msgstr "Línea de seguimiento"
 
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
 #~ msgid "Stock Level 1"
 #~ msgstr "Nivel de Existencias 1"
 
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
 #~ msgid "Stock Properties"
 #~ msgstr "Propiedades de stock"
 
@@ -4935,6 +4180,9 @@ msgstr "Movimiento parcial"
 #~ msgstr ""
 #~ "Fuerza a utilizar un lote de producción durante la orden de producción"
 
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
 #~ msgid ""
 #~ "For the current product (template), this stock location will be used, "
 #~ "instead of the default one, as the source location for stock moves generated "
@@ -4947,6 +4195,9 @@ msgstr "Movimiento parcial"
 #~ msgid "This account will be used to value the output stock"
 #~ msgstr "Esta cuenta será utilizada para calcular las salidas de existencias"
 
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
 #~ msgid ""
 #~ "This journal will be used for the accounting move generated by stock move"
 #~ msgstr ""
@@ -4959,15 +4210,45 @@ msgstr "Movimiento parcial"
 #~ msgid "Track Incomming Lots"
 #~ msgstr "Lotes seguimiento de entrada"
 
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "Última fecha de inventario"
 
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
 #~ msgid "Tracking Lot"
 #~ msgstr "Lote de seguimiento"
 
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
 #~ msgid "Tracking/Serial"
 #~ msgstr "Seguimiento/Número de serie"
 
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
 #~ msgid ""
 #~ "Tracking lot is the code that will be put on the logistical unit/pallet"
 #~ msgstr ""
@@ -4977,12 +4258,36 @@ msgstr "Movimiento parcial"
 #~ msgid "Tracking Number"
 #~ msgstr "Número seguimiento"
 
+#~ msgid "terp-stock"
+#~ msgstr "terp-stock"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
 #~ msgid "Non Assigned Products:"
 #~ msgstr "Productos no asignados:"
 
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
 #~ msgid "Location Content (With children)"
 #~ msgstr "Contenido ubicación (con hijos)"
 
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
 #~ msgid "New Internal Packing"
 #~ msgstr "Nuevo albarán interno"
 
@@ -4998,24 +4303,60 @@ msgstr "Movimiento parcial"
 #~ msgid "All Stock Moves"
 #~ msgstr "Todos los movimientos de stock"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
 #~ msgid "This account will be used to value the input stock"
 #~ msgstr "Esta cuenta será utilizada para calcular el stock de entrada"
 
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
 #~ msgid "Date Created"
 #~ msgstr "Fecha creación"
 
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
 #~ msgid "Allocation Method"
 #~ msgstr "Método asignación"
 
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
 #~ msgid "Dest. Address"
 #~ msgstr "Dirección destinatario"
 
 #~ msgid "Periodical Inventory"
 #~ msgstr "Inventario periódico"
 
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "Inventarios periódicos borrador"
 
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
 #~ msgid "Stock Tracking Lots"
 #~ msgstr "Lotes seguimiento de stock"
 
@@ -5025,6 +4366,9 @@ msgstr "Movimiento parcial"
 #~ msgid "Available Moves"
 #~ msgstr "Movimientos disponibles"
 
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
 #~ msgid "Open Products"
 #~ msgstr "Abrir productos"
 
@@ -5034,18 +4378,51 @@ msgstr "Movimiento parcial"
 #~ msgid "Packing List"
 #~ msgstr "Albarán"
 
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
 #~ msgid "Not from Packing"
 #~ msgstr "No a partir de albarán"
 
 #~ msgid "Internal Ref"
 #~ msgstr "Ref. interna"
 
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
 #~ msgid "Validate"
 #~ msgstr "Validar"
 
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
 #~ msgid "Move lines"
 #~ msgstr "Líneas de movimientos"
 
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
 #~ msgid "Fill From Unreceived Products"
 #~ msgstr "Rellenar a partir de productos no recibidos"
 
@@ -5064,39 +4441,102 @@ msgstr "Movimiento parcial"
 #~ msgid "Invoice Status"
 #~ msgstr "Estado de facturación"
 
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
 #~ msgid "Future Stock Forecast"
 #~ msgstr "Previsión de futuro stock"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "Planned Date"
 #~ msgstr "Fecha prevista"
 
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER"
+
 #~ msgid "Lots by location"
 #~ msgstr "Lotes por ubicación"
 
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
 #~ msgid "Created Date"
 #~ msgstr "Fecha creación"
 
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
 #~ msgid "Tracking Lots"
 #~ msgstr "Lotes seguimiento"
 
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
+
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
 #~ msgid "Create invoices"
 #~ msgstr "Crear facturas"
 
 #~ msgid "Set Stock to Zero"
 #~ msgstr "Fijar stock a cero"
 
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
 #~ msgid "Make packing"
 #~ msgstr "Realizar albarán"
 
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
 #~ msgid "Nearest"
 #~ msgstr "El más cercano"
 
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
 #~ msgid "Workshop"
 #~ msgstr "Tienda"
 
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
 #~ msgid "Tiny sprl"
 #~ msgstr "Tiny sprl"
 
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
 #~ msgid "Force to use a Production Lot during deliveries"
 #~ msgstr "Fuerza a utilizar un lote de producción durante las entregas"
 
@@ -5109,18 +4549,42 @@ msgstr "Movimiento parcial"
 #~ msgid "Auto-Packing"
 #~ msgstr "Auto-Empaquetado"
 
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
 #~ msgid "Location Overview"
 #~ msgstr "Vista general ubicaciones"
 
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
 #~ msgid "Split move line"
 #~ msgstr "Partir línea de movimiento"
 
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
 #~ msgid "Chained Delay (days)"
 #~ msgstr "Retraso encadenado (días)"
 
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
 #~ msgid "Track Outging Lots"
 #~ msgstr "Lotes seguimiento de salida"
 
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
 #~ msgid "Tracking"
 #~ msgstr "Seguimiento"
 
@@ -5136,12 +4600,24 @@ msgstr "Movimiento parcial"
 #~ msgid "Max. Planned Date"
 #~ msgstr "Fecha prevista máx."
 
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
 #~ msgid "Delivery Orders"
 #~ msgstr "Órdenes de entrega"
 
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
 #~ msgid "Stock Locations Structure"
 #~ msgstr "Estructura ubicaciones stock"
 
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
 #~ msgid ""
 #~ "This account will be used, instead of the default one, to value output stock"
 #~ msgstr ""
@@ -5154,12 +4630,27 @@ msgstr "Movimiento parcial"
 #~ msgid "Moves Tracked"
 #~ msgstr "Seguimiento movimientos"
 
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
+#~ msgid "terp-project"
+#~ msgstr "terp-project"
+
 #~ msgid "Stock by Lots"
 #~ msgstr "Stock por lotes"
 
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
 #~ msgid "Canceled"
 #~ msgstr "Cancelado"
 
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
 #~ msgid ""
 #~ "For the current product (template), this stock location will be used, "
 #~ "instead of the default one, as the source location for stock moves generated "
@@ -5172,6 +4663,9 @@ msgstr "Movimiento parcial"
 #~ msgid "Add"
 #~ msgstr "Añadir"
 
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
 #~ msgid "Set Stock to 0"
 #~ msgstr "Fijar stock a 0"
 
@@ -5181,6 +4675,9 @@ msgstr "Movimiento parcial"
 #~ msgid "Do you want to set stocks to zero ?"
 #~ msgstr "¿Desea fijar stocks a cero?"
 
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
 #~ msgid "Track Production Lots"
 #~ msgstr "Lotes seguimiento de producción"
 
@@ -5205,6 +4702,9 @@ msgstr "Movimiento parcial"
 #~ msgid "Supplier Invoice"
 #~ msgstr "Factura de proveedor"
 
+#~ msgid "terp-product"
+#~ msgstr "terp-product"
+
 #~ msgid "Close"
 #~ msgstr "Cerrar"
 
@@ -5217,18 +4717,27 @@ msgstr "Movimiento parcial"
 #~ msgid "Low Level"
 #~ msgstr "Nivel inferior"
 
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
 #~ msgid "Delivery"
 #~ msgstr "Entrega"
 
 #~ msgid "Locations' Values"
 #~ msgstr "Valores ubicaciones"
 
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
 #~ msgid "Inventory line"
 #~ msgstr "Línea de inventario"
 
 #~ msgid "Others info"
 #~ msgstr "Otras info."
 
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
 #~ msgid "Move State"
 #~ msgstr "Estado de movimientos"
 
@@ -5331,6 +4840,9 @@ msgstr "Movimiento parcial"
 #~ msgid "New Reception Packing"
 #~ msgstr "Nuevo albarán de entrada"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
 #~ msgid "Customer Refund"
 #~ msgstr "Factura rectificativa (abono) de cliente"
 
@@ -5348,9 +4860,36 @@ msgstr "Movimiento parcial"
 #~ "No se ha definido un diario '\\n                                'en la "
 #~ "categoría de producto: \"%s\" (id: %d)"
 
+#~ msgid "terp-rating-rated"
+#~ msgstr "terp-rating-rated"
+
 #~ msgid "Outgoing Products delay"
 #~ msgstr "Retraso albaranes de salida"
 
+#~ msgid "terp-mail-forward"
+#~ msgstr "terp-mail-forward"
+
+#~ msgid "terp-stock_effects-object-colorize"
+#~ msgstr "terp-stock_effects-object-colorize"
+
+#~ msgid "terp-folder-blue"
+#~ msgstr "terp-folder-blue"
+
+#~ msgid "terp-personal+"
+#~ msgstr "terp-personal+"
+
+#~ msgid "terp-dialog-close"
+#~ msgstr "terp-dialog-close"
+
+#~ msgid "terp-personal-"
+#~ msgstr "terp-personal-"
+
+#~ msgid "terp-gtk-jump-to-ltr"
+#~ msgstr "terp-gtk-jump-to-ltr"
+
+#~ msgid "terp-dolar"
+#~ msgstr "terp-dolar"
+
 #, python-format
 #~ msgid ""
 #~ "Total quantity after split exceeds the quantity to split ' \\n               "
@@ -5359,6 +4898,23 @@ msgstr "Movimiento parcial"
 #~ "Cantidad total después de dividir exceda la cantidad a dividir ' \\n         "
 #~ "                           'para este producto: \"%s\" (id: %d)"
 
+#~ msgid "terp-stock_symbol-selection"
+#~ msgstr "terp-stock_symbol-selection"
+
+#, python-format
+#~ msgid "Bad Lot Assignation !"
+#~ msgstr "¡Asignación de lote errónea!"
+
+#~ msgid "terp-stage"
+#~ msgstr "terp-stage"
+
+#, python-format
+#~ msgid "No invoice were created"
+#~ msgstr "No se han creado facturas"
+
+#~ msgid "terp-accessories-archiver-minus"
+#~ msgstr "terp-accessories-archiver-minus"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined ' \\n                               "
@@ -5367,6 +4923,18 @@ msgstr "Movimiento parcial"
 #~ "No se ha definido una cuenta de salida de stock ' \\n                        "
 #~ "                    'para este producto: \"%s\" (id: %d)"
 
+#~ msgid "terp-gdu-smart-failing"
+#~ msgstr "terp-gdu-smart-failing"
+
+#~ msgid "terp-emblem-important"
+#~ msgstr "terp-emblem-important"
+
+#~ msgid "terp-face-plain"
+#~ msgstr "terp-face-plain"
+
+#~ msgid "terp-go-today"
+#~ msgstr "terp-go-today"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock input account defined ' \\n                                "
@@ -5375,9 +4943,69 @@ msgstr "Movimiento parcial"
 #~ "No se ha definido una cuenta de entrada de stock '\\n                        "
 #~ "        'para este producto: \"%s\" (id: %d)"
 
+#~ msgid "terp-gnome-cpu-frequency-applet+"
+#~ msgstr "terp-gnome-cpu-frequency-applet+"
+
+#~ msgid "terp-gtk-media-pause"
+#~ msgstr "terp-gtk-media-pause"
+
+#~ msgid "terp-stock_format-scientific"
+#~ msgstr "terp-stock_format-scientific"
+
+#~ msgid "terp-gtk-go-back-rtl"
+#~ msgstr "terp-gtk-go-back-rtl"
+
+#~ msgid "terp-mail-"
+#~ msgstr "terp-mail-"
+
+#~ msgid "terp-call-start"
+#~ msgstr "terp-call-start"
+
 #~ msgid "Inventory (with child locations)"
 #~ msgstr "Inventario (con ubicaciones hijas)"
 
+#~ msgid "Not from Picking"
+#~ msgstr "No desde albarán"
+
+#~ msgid "terp-personal"
+#~ msgstr "terp-personal"
+
+#~ msgid "terp-locked"
+#~ msgstr "terp-locked"
+
+#~ msgid "terp-accessories-archiver"
+#~ msgstr "terp-accessories-archiver"
+
+#~ msgid "terp-gtk-go-back-ltr"
+#~ msgstr "terp-gtk-go-back-ltr"
+
+#~ msgid "terp-mail-replied"
+#~ msgstr "terp-mail-replied"
+
+#~ msgid "terp-folder-green"
+#~ msgstr "terp-folder-green"
+
+#~ msgid "terp-folder-orange"
+#~ msgstr "terp-folder-orange"
+
+#~ msgid "terp-folder-yellow"
+#~ msgstr "terp-folder-yellow"
+
+#~ msgid "terp-stock_align_left_24"
+#~ msgstr "terp-stock_align_left_24"
+
+#~ msgid "terp-accessories-archiver+"
+#~ msgstr "terp-accessories-archiver+"
+
+#~ msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+#~ msgstr "Número de serie único, será mostrado como: PREFIJO/SERIE [REF_INT]"
+
+#~ msgid "terp-dolar_ok!"
+#~ msgstr "terp-dolar_ok!"
+
+#~ msgid "terp-go-year"
+#~ msgstr "terp-go-year"
+
 #, python-format
 #~ msgid ""
 #~ "The current move line is already assigned to a pack, please remove it first "
@@ -5388,13 +5016,92 @@ msgstr "Movimiento parcial"
 #~ "primero si realmente quiere cambiarla ' \\n            #                     "
 #~ "   'para este producto: \"%s\" (id: %d)"
 
+#~ msgid "Serial Number"
+#~ msgstr "Número de serie"
+
 #, python-format
 #~ msgid "New picking invoices"
 #~ msgstr "Nuevas facturas de albarán"
 
+#~ msgid "terp-idea"
+#~ msgstr "terp-idea"
+
+#~ msgid "terp-gtk-jump-to-rtl"
+#~ msgstr "terp-gtk-jump-to-rtl"
+
+#~ msgid "terp-stock_format-default"
+#~ msgstr "terp-stock_format-default"
+
+#~ msgid "terp-check"
+#~ msgstr "terp-check"
+
+#~ msgid "terp-camera_test"
+#~ msgstr "terp-camera_test"
+
+#~ msgid "terp-gtk-stop"
+#~ msgstr "terp-gtk-stop"
+
+#~ msgid "terp-go-week"
+#~ msgstr "terp-go-week"
+
+#~ msgid "terp-go-home"
+#~ msgstr "terp-go-home"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
+#~ msgid "terp-mail_delete"
+#~ msgstr "terp-mail_delete"
+
+#~ msgid "terp-document-new"
+#~ msgstr "terp-document-new"
+
+#~ msgid "terp-go-month"
+#~ msgstr "terp-go-month"
+
 #, python-format
 #~ msgid "Not Available. Moves are not confirmed."
 #~ msgstr "No disponible. Movimientos no están confirmados."
 
+#~ msgid "terp-gtk-select-all"
+#~ msgstr "terp-gtk-select-all"
+
+#~ msgid "terp-mail-message-new"
+#~ msgstr "terp-mail-message-new"
+
 #~ msgid "Extended options..."
 #~ msgstr "Opciones extendidas..."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Rule must have at least one checked access right !"
+#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
+
+#~ msgid "The name of the group must be unique !"
+#~ msgstr "¡El nombre del grupo debe ser único!"
+
+#, python-format
+#~ msgid "Invoices"
+#~ msgstr "Facturas"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Only one value can be defined for each given usage!"
+#~ msgstr "¡Sólo se puede definir un valor para cada uso dado!"
+
+#~ msgid "The name of the journal must be unique per company !"
+#~ msgstr "¡El nombre del diario debe ser único por compañía!"
+
+#~ msgid "The code of the journal must be unique per company !"
+#~ msgstr "¡El código del diario debe ser único por compañía!"
+
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 6dce973aaac..4a21ac7be25 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:50+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-12-05 10:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index e6f51ebf8f6..e8a5ee22a4c 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-19 08:57+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 19:59+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-20 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-rating-rated"
-msgstr "terp-rating-rated"
-
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
@@ -31,22 +26,24 @@ msgstr "Отслеживать исходящие партии"
 msgid "Stock ups upload"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Сцепленное место хранения, если определено"
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
 msgstr "Поместить в новый пакет"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE"
-msgstr "STOCK_SAVE"
-
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
@@ -57,16 +54,6 @@ msgstr "Действие"
 msgid "Upstream Traceability"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-account"
-msgstr "terp-account"
-
-#. module: stock
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
@@ -74,9 +61,9 @@ msgid "Last Product Inventories"
 msgstr "Последние инвентаризации ТМЦ"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_ASCENDING"
-msgstr "STOCK_SORT_ASCENDING"
+#: view:stock.move:0
+msgid "Today"
+msgstr "Сегодня"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
@@ -86,20 +73,7 @@ msgstr "Номер Ревизии"
 #. module: stock
 #: view:stock.move.memory:0
 msgid "Product Moves"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"            product_qty = partial_data.get('product_qty',0.0)\n"
-"            move_product_qty[move.id] = product_qty\n"
-"            product_uom = partial_data.get('product_uom',False)\n"
-"            product_price = partial_data.get('product_price',0.0)\n"
-"            product_currency = partial_data.get('product_currency',False)\n"
-"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
-msgstr ""
+msgstr "Перемещения ТМЦ"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -109,9 +83,11 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
-msgid "Inventory Control"
-msgstr "Управление ТМЦ"
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr "Анализ перемещений"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -121,11 +97,6 @@ msgid ""
 msgstr ""
 "Внутренний номер, если он отличается от серийного номера производителя"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
@@ -171,6 +142,12 @@ msgstr "День"
 msgid "UoM"
 msgstr "Ед. изм."
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr "Физические инвентаризации"
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
@@ -197,17 +174,15 @@ msgstr ""
 "непосредственно для каждой ТМЦ."
 
 #. module: stock
-#: help:stock.move,address_id:0
-msgid ""
-"Optional address where goods are to be delivered, specifically used for "
-"allotment"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Missing partial picking data for move #%s"
 msgstr ""
-"Дополнительный адрес доставки товара, используется специально для выделения"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Отгрузка/Получение ТМЦ"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:0
@@ -225,14 +200,9 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Место инвентаризации"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-emblem-important"
-msgstr "terp-emblem-important"
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr "Неприменимо"
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -254,10 +224,11 @@ msgstr "Настройки"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Идентификация упаковки"
 
 #. module: stock
 #: view:stock.move:0
+#: field:stock.move,picking_id:0
 #: field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
@@ -267,7 +238,7 @@ msgstr "Ссылка"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Products to Process"
-msgstr ""
+msgstr "ТМЦ к обработке"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -283,6 +254,11 @@ msgid ""
 "be performed on physicals, partners or virtual locations."
 msgstr ""
 
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Ошибка! Нельзя создать рекурсивные категории."
+
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
 msgid ""
@@ -300,6 +276,10 @@ msgid ""
 "inventory or, once you need it, to correct the current stock level of a "
 "product."
 msgstr ""
+"Периодические инвентаризации используются для подсчета количеств ТМЦ в месте "
+"хранения. Инвентаризации производятся раз в год, когда производится общая "
+"инвентаризация, или когда вам надо, для корректировки количеств ТМЦ на "
+"складе."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -370,11 +350,6 @@ msgstr "Нет счета"
 msgid "Production lot"
 msgstr "Партия изделий"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_FORWARD"
-msgstr "STOCK_MEDIA_FORWARD"
-
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
@@ -383,7 +358,7 @@ msgstr "Код ИНКОТЕРМС"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Перемещения для этой упаковки"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -412,11 +387,6 @@ msgstr "Подтвердить инвентаризацию"
 msgid "State"
 msgstr "Состояние"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-forward"
-msgstr "terp-mail-forward"
-
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
@@ -471,11 +441,6 @@ msgid ""
 "Create and manage your warehouses and assign them a location from here"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
-
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
@@ -498,30 +463,21 @@ msgstr "Место выхода"
 msgid "Split into"
 msgstr "Разделить на"
 
-#. module: stock
-#: view:stock.move:0
-msgid "Today"
-msgstr "Сегодня"
-
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
 msgstr "Валюта для средней цены"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-hr"
-msgstr "terp-hr"
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
+"для всех входящих перемещений ТМЦ будут помещены на этот счет. Если он не "
+"установлен для ТМЦ, то будет использован из категории ТМЦ."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -529,22 +485,19 @@ msgstr "terp-hr"
 msgid "Location Type"
 msgstr "Тип места хранения"
 
+#. module: stock
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Ошибка: Единицы продажи и единицы измерения должны принадлежать к разным "
+"категориям."
+
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
 msgstr "Тип доставки определяет приход или расход."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_effects-object-colorize"
-msgstr "terp-stock_effects-object-colorize"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
@@ -617,11 +570,9 @@ msgid "Grand Total:"
 msgstr "Общий итог"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_move_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
-#: view:report.stock.move:0
-msgid "Moves Analysis"
-msgstr "Анализ перемещений"
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr "Управление ТМЦ"
 
 #. module: stock
 #: view:stock.location:0
@@ -641,11 +592,6 @@ msgstr "Место / Продукция"
 msgid "Reception"
 msgstr "Прием"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
-
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
@@ -701,9 +647,9 @@ msgid "Packs"
 msgstr "Пакет"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
 
 #. module: stock
 #: view:res.partner:0
@@ -723,11 +669,6 @@ msgid ""
 "or line or through the Delivery Orders menu."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-blue"
-msgstr "terp-folder-blue"
-
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
@@ -743,11 +684,6 @@ msgstr "Место хранения снабжения"
 msgid "Production Lots"
 msgstr "Партии изделий"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "terp-project"
-
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
@@ -769,16 +705,6 @@ msgstr "Октябрь"
 msgid "Inventory Line"
 msgstr "Позиция инвентаризации"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal+"
-msgstr "terp-personal+"
-
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
@@ -793,16 +719,6 @@ msgstr ""
 msgid "Process Picking"
 msgstr "Процесс комплектования"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-graph"
-msgstr "terp-graph"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -817,11 +733,6 @@ msgid ""
 "should enter new ones line by line."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dialog-close"
-msgstr "terp-dialog-close"
-
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
@@ -849,26 +760,11 @@ msgstr "потребляется с"
 msgid "Production lot is used to put a serial number on the production"
 msgstr "Партии изделий используются для присвоения серийных номеров"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
-
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
 msgstr "Место входа"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal-"
-msgstr "terp-personal-"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
@@ -901,9 +797,9 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr "Место транзита для перемещений между компаниями"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -930,22 +826,11 @@ msgstr "Брак"
 msgid "Contains"
 msgstr "Содержит"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar"
-msgstr "terp-dolar"
-
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
 msgstr "Задержка входящей продукции"
 
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Future Qty"
-msgstr "Будущее Кол-во"
-
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
@@ -971,12 +856,7 @@ msgstr "Запланированная дата"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-ltr"
-msgstr "terp-gtk-jump-to-ltr"
+msgstr "Искать упаковку"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -988,17 +868,6 @@ msgstr "Срочно"
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr ""
-
 #. module: stock
 #: help:stock.picking,location_id:0
 msgid ""
@@ -1026,20 +895,18 @@ msgid "Stock by Location"
 msgstr "Запасы по местам хранения"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+"Дополнительный адрес доставки товара, используется специально для выделения"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
 msgstr "Месяц-1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_symbol-selection"
-msgstr "terp-stock_symbol-selection"
-
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -1064,11 +931,6 @@ msgstr "Виртуальные запасы"
 msgid "View"
 msgstr "Вид"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
-
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
@@ -1078,27 +940,18 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Delivery Information"
-msgstr ""
+msgstr "Информация о доставке"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr "Инвентаризация произведена"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stage"
-msgstr "terp-stage"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
-
-#. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Кол-во в партии"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ошибка: Неправильный штрих-код"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1107,18 +960,6 @@ msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "Движение запасов"
-
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
@@ -1148,6 +989,20 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Дата: %(date)s\n"
+"\n"
+"Уважаемый / уважаемая %(partner_name)s,\n"
+"\n"
+"Пожалуйста, просмотрите в приложении напоминание о всех не оплаченных вами "
+"счетах.\n"
+"Всего на сумму: %(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Спасибо,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -1177,43 +1032,17 @@ msgid ""
 "                      "
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
-
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
 msgstr "Автор"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDELETE"
-msgstr "STOCK_UNDELETE"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Delivery Order"
 msgstr "Заказ на доставку"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "No invoice were created"
-msgstr "Счет не был создан"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
@@ -1235,11 +1064,6 @@ msgstr "Дата исполнения"
 msgid "Expected Shipping Date"
 msgstr "Ожидаемая дата отгрузки"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver-minus"
-msgstr "terp-accessories-archiver-minus"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
@@ -1258,11 +1082,6 @@ msgstr "Разделить позиции инвентаризации"
 msgid "Physical Inventory"
 msgstr "Физическая инвентаризация"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
-
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
@@ -1271,9 +1090,12 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1281,41 +1103,25 @@ msgid "Lot number"
 msgstr "Номер партии"
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr "Единицы измерения"
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr "Ед.изм. продукции"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "Мета хранения партнера"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"                product_qty = partial_data.get('product_qty',0.0)\n"
-"                move_product_qty[move.id] = product_qty\n"
-"                product_uom = partial_data.get('product_uom',False)\n"
-"                product_price = partial_data.get('product_price',0.0)\n"
-"                product_currency = "
-"partial_data.get('product_currency',False)\n"
-"                prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
 msgstr "Общее количество"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
@@ -1333,11 +1139,6 @@ msgid "Delay between original move and chained move in days"
 msgstr ""
 "Задержка между первоначальным перемещением и сцепленным перемещением, в днях"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
@@ -1388,9 +1189,9 @@ msgid "is in draft state."
 msgstr "в состоянии \"Черновик\""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -1408,12 +1209,6 @@ msgstr ""
 msgid "Shop 1"
 msgstr "Магазин 1"
 
-#. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
-msgid "Total Value"
-msgstr "Общая стоимость"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 #: view:stock.fill.inventory:0
@@ -1442,12 +1237,6 @@ msgstr "Вид календаря"
 msgid "Additional Info"
 msgstr "Доп. инфо"
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
-#: report:stock.inventory.move:0
-msgid "Stock Inventory"
-msgstr "Складской учет"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -1507,11 +1296,6 @@ msgstr "Искать комплектацию запасов"
 msgid "Company is not specified in Location"
 msgstr "Компания не определена в месте хранения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-report"
-msgstr "terp-report"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:stock.partial.move,type:0
@@ -1523,11 +1307,6 @@ msgstr "Тип"
 msgid "Generic IT Suppliers"
 msgstr "Общие поставщики ИТ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
-
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
@@ -1546,32 +1325,12 @@ msgstr "Id позиции инвентаризации"
 msgid "Address of  customer or supplier."
 msgstr "Адрес заказчика или поставщика"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gdu-smart-failing"
-msgstr "terp-gdu-smart-failing"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Упаковка"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1579,11 +1338,6 @@ msgstr "STOCK_GO_DOWN"
 msgid "Customer Location"
 msgstr "Место хранения заказчика"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OK"
-msgstr "STOCK_OK"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -1594,13 +1348,13 @@ msgstr "Неверное действие !"
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Receive Information"
-msgstr ""
+msgstr "Информация о приходе"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Обзор инвентаризации места хранения"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
@@ -1613,15 +1367,21 @@ msgid "General Informations"
 msgstr "Обзая информация"
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ничего"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No Invoices were created"
+msgstr "Счетов создано не было"
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
@@ -1631,7 +1391,7 @@ msgstr "OpenERP S.A."
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Receive"
-msgstr ""
+msgstr "Приход"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1686,21 +1446,11 @@ msgstr ""
 msgid "Cannot deliver products which are already delivered !"
 msgstr "Невозможно доставить продукцию, которая уже доставлена !"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-face-plain"
-msgstr "terp-face-plain"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
@@ -1714,11 +1464,6 @@ msgstr "Место хранения поставщика"
 msgid "were scrapped"
 msgstr "были забракованы"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
-
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1730,11 +1475,6 @@ msgstr "Частично"
 msgid "September"
 msgstr "Сентябрь"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
-
 #. module: stock
 #: help:stock.picking,backorder_id:0
 msgid ""
@@ -1767,24 +1507,16 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"Variation Account is not specified for Product Category: %s' % "
-"(product_obj.categ_id.name)))\n"
-"        move_ids = []\n"
-"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gnome-cpu-frequency-applet+"
-msgstr "terp-gnome-cpu-frequency-applet+"
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "Движение запасов"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1803,51 +1535,21 @@ msgstr "Отменить доступность"
 msgid "Scheduled date for the processing of this move"
 msgstr "Запланированная дата обработки этого перемещения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-media-pause"
-msgstr "terp-gtk-media-pause"
-
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Созданные перемещения товаров"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-scientific"
-msgstr "terp-stock_format-scientific"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
 msgstr "Полка 2"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "Счет будет выставлен"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
-
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
 msgstr "Отслеживаемая партия"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-today"
-msgstr "terp-go-today"
-
 #. module: stock
 #: help:stock.location,posx:0
 #: help:stock.location,posy:0
@@ -1866,6 +1568,11 @@ msgstr "Свойства корреспондирующих мест хране
 msgid "Localization"
 msgstr "Локализация"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr "Отчет о ТМЦ по отслеживаемым партиям"
+
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -1884,11 +1591,6 @@ msgstr "Разделение в партиях"
 msgid "Production Lot Numbers"
 msgstr "Номера партий продукции"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,date:0
@@ -1911,37 +1613,17 @@ msgstr "Дата"
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-administration"
-msgstr "terp-administration"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
-
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
 msgstr "Место хранения ТМЦ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
 msgid "Merging is only allowed on draft inventories."
 msgstr "Объединение возможно только в черновиках инвентаризаций"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-rtl"
-msgstr "terp-gtk-go-back-rtl"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
@@ -1952,16 +1634,6 @@ msgstr "Инф. панель"
 msgid "Track moves"
 msgstr "Отслеживать перемещения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-crm"
-msgstr "terp-crm"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
-
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
@@ -1978,16 +1650,6 @@ msgstr "Номер партий"
 msgid "Warehouse Dashboard"
 msgstr "Инф. панель склада"
 
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-"
-msgstr "terp-mail-"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -2003,9 +1665,10 @@ msgid "Scrap Products"
 msgstr "Бракованная продукция"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr "Вы не можете удалить комплектование в состоянии: %s !"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -2023,6 +1686,7 @@ msgid "Return Picking"
 msgstr ""
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
@@ -2049,21 +1713,6 @@ msgstr "Адрес доставки:"
 msgid "Provide the quantities of the returned products."
 msgstr "Предоставьте количество возвращенной продукции"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-call-start"
-msgstr "terp-call-start module: stock"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
@@ -2096,11 +1745,6 @@ msgstr ""
 "умолчанию), как источник места хранения для продукции полученной вами от "
 "текущего партнера"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Picking"
-msgstr "Не из комплектования"
-
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -2114,11 +1758,6 @@ msgid ""
 "by your products and inventory management performance."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
-
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
@@ -2135,9 +1774,9 @@ msgid "Search Inventory"
 msgstr "Искать инвентаризацию"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Отчет о ТМЦ по отслеживаемым партиям"
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "Кол-во в партии"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2169,16 +1808,6 @@ msgstr ""
 "Необязательный префикс для вывода этого серийного номера: PREFIX/SERIAL "
 "[INT_REF]"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
-
-#. module: stock
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2255,11 +1884,6 @@ msgstr "В реальном времени (автоматически)"
 msgid "Logistical shipping unit: pallet, box, pack ..."
 msgstr "Логистическая единица: поддон, ящик, упаковка..."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-locked"
-msgstr "terp-locked"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "_Apply"
@@ -2274,9 +1898,9 @@ msgid "]"
 msgstr "]"
 
 #. module: stock
-#: field:stock.move.memory,wizard_id:0
-msgid "Wizard"
-msgstr ""
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Место инвентаризации"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2284,11 +1908,6 @@ msgstr ""
 msgid "Total value"
 msgstr "Общая стоимость"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal"
-msgstr "terp-personal"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
 msgid ""
@@ -2304,11 +1923,6 @@ msgid ""
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
 
-#. module: stock
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr "Правила не поддерживаются для объектов osv_memory !"
-
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
@@ -2320,16 +1934,6 @@ msgstr "Входящие ТМЦ"
 msgid "Creation"
 msgstr "Создание"
 
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver"
-msgstr "terp-accessories-archiver"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.move.memory,cost:0
@@ -2338,9 +1942,11 @@ msgid "Cost"
 msgstr "Стоимость"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2348,18 +1954,6 @@ msgstr "STOCK_COPY"
 msgid "Warehouse Management"
 msgstr "Управление складами"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Движение запасов"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-#: field:stock.change.standard.price,stock_account_output:0
-msgid "Stock Output Account"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
@@ -2376,11 +1970,6 @@ msgstr "ТМЦ "
 msgid "Stock Location Analysis"
 msgstr "Анализ места хранения ТМЦ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
@@ -2432,11 +2021,6 @@ msgstr "Входящий комплектовочный лист"
 msgid "Unit of Measure"
 msgstr "Единицы измерения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -2450,11 +2034,6 @@ msgid ""
 "generated by a Manufacturing Order"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
 #: view:stock.move.track:0
@@ -2488,16 +2067,6 @@ msgstr "Установить в \"Черновик\""
 msgid "Stock Journals"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-ltr"
-msgstr "terp-gtk-go-back-ltr"
-
-#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
@@ -2530,32 +2099,22 @@ msgstr "Продукция "
 msgid "Track Incoming Lots"
 msgstr "Отслеживать входящие партии"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-replied"
-msgstr "terp-mail-replied"
-
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
+msgstr "Панель склада"
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr "Будущее Кол-во"
+
+#. module: stock
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Physical Inventories"
-msgstr "Физические инвентаризации"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
-
 #. module: stock
 #: field:stock.move,note:0
 #: view:stock.picking:0
@@ -2592,11 +2151,6 @@ msgstr "Вы можете удалить только черновик пере
 msgid "Products"
 msgstr "Продукция"
 
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ничего"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
@@ -2632,29 +2186,19 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Движение запасов"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Задержка(дней)"
 
 #. module: stock
 #: field:stock.move.memory,move_id:0
 msgid "Move"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
+msgstr "Перемещение"
 
 #. module: stock
 #: help:stock.picking,min_date:0
@@ -2667,17 +2211,17 @@ msgstr "Ожидаемая дата обработки комплектован
 msgid "P&L Qty"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-green"
-msgstr "terp-folder-green"
-
 #. module: stock
 #: view:stock.production.lot:0
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
 msgstr "Ревизии"
 
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr "Эта операция отменит отгрузку. Хотите продолжить?"
+
 #. module: stock
 #: help:product.product,valuation:0
 msgid ""
@@ -2740,13 +2284,11 @@ msgstr "Инвентаризация"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
 msgid "Picking List"
 msgstr "Комплектовочный лист"
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
+#: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
@@ -2791,19 +2333,6 @@ msgstr ""
 msgid "Fixed Location"
 msgstr "Определенное место хранения"
 
-#. module: stock
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_align_left_24"
-msgstr "terp-stock_align_left_24"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
 msgid ""
@@ -2812,26 +2341,6 @@ msgid ""
 "traceability of the products contained in lot."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-orange"
-msgstr "terp-folder-orange"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver+"
-msgstr "terp-accessories-archiver+"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
@@ -2842,11 +2351,6 @@ msgstr "Июль"
 msgid "Consumable"
 msgstr "Потребляемое"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER module: stock"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
 msgid ""
@@ -2856,11 +2360,6 @@ msgid ""
 "controlled at least once a year."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
@@ -2876,22 +2375,12 @@ msgstr ""
 msgid "Stock Journal"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "Снабжение"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-yellow"
-msgstr "terp-folder-yellow"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
@@ -2941,11 +2430,6 @@ msgstr "Просмотр товаров на складах"
 msgid "Internal Picking list"
 msgstr "Внутренний комплектовочный лист"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
@@ -2963,11 +2447,6 @@ msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar_ok!"
-msgstr "terp-dolar_ok!"
-
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
@@ -3011,11 +2490,6 @@ msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-year"
-msgstr "terp-go-year"
-
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
@@ -3026,6 +2500,14 @@ msgstr "Доступные запасы"
 msgid "Fill Inventory"
 msgstr "Полная инвентаризация"
 
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Ошибка. ед.изм. по умолчанию и закупочные ед.изм. должны иметь одинаковую "
+"категорию."
+
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid ""
@@ -3045,30 +2527,25 @@ msgid "Revision Date"
 msgstr ""
 
 #. module: stock
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Ошибка ! Нельзя создать зацикленные меню."
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
+msgid "Lot"
+msgstr "Партия"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
 msgstr "Номер партии изделий"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-rtl"
-msgstr "terp-gtk-jump-to-rtl"
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "Количество(единицы продажи)"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -3084,21 +2561,6 @@ msgstr "Адрес контакта :"
 msgid "Back Order"
 msgstr ""
 
-#. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial Number"
-msgstr "Серийный номер"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
-
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
@@ -3111,11 +2573,6 @@ msgstr "Активен"
 msgid "Inventory Management"
 msgstr "Управление запасами"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-idea"
-msgstr "terp-idea"
-
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
@@ -3158,11 +2615,6 @@ msgstr ""
 "Если отмечено, ТМЦ находящиеся в подчиненных местах хранения будут также "
 "включены."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
-
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
@@ -3207,11 +2659,6 @@ msgstr "Наименование ревизии"
 msgid "Warehouse"
 msgstr "Склад"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
-
 #. module: stock
 #: view:stock.location.product:0
 msgid ""
@@ -3225,11 +2672,6 @@ msgstr ""
 msgid "Accounting Stock Properties"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NO"
-msgstr "STOCK_NO"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
@@ -3254,20 +2696,15 @@ msgstr "Выполнено"
 msgid "Change Standard Price"
 msgstr "Изменение стандартной цены"
 
-#. module: stock
-#: sql_constraint:ir.rule:0
-msgid "Rule must have at least one checked access right !"
-msgstr ""
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
 msgstr "Виртуальные места хранения"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Счет будет выставлен"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
@@ -3288,21 +2725,11 @@ msgstr ""
 msgid "Not urgent"
 msgstr "Не срочно"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-default"
-msgstr "terp-stock_format-default"
-
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
 msgstr "Сделать"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
@@ -3314,16 +2741,6 @@ msgstr "Склады"
 msgid "Responsible"
 msgstr "Ответственный"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-check"
-msgstr "terp-check"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-camera_test"
-msgstr "terp-camera_test"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -3331,11 +2748,6 @@ msgstr "terp-camera_test"
 msgid "Inventory Analysis"
 msgstr "Анализ ТМЦ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
-
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
@@ -3373,16 +2785,11 @@ msgstr "Запасы"
 msgid "Product"
 msgstr "Продукция"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "Invoicing"
-msgstr ""
+msgstr "Выставление счета"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3399,7 +2806,7 @@ msgstr "Вы перемещаете %.2f ТМЦ, но только %.2f дост
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Вторая ед. изм."
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -3418,13 +2825,10 @@ msgid "Consume Products"
 msgstr "Потребляемые ТМЦ"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: code:addons/stock/stock.py:0
 #, python-format
-msgid "Product UOM"
-msgstr "Ед.изм. продукции"
+msgid "Insufficient Stock in Lot !"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3453,19 +2857,15 @@ msgid "Suppliers"
 msgstr "Поставщики"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr "Общая стоимость"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-tools"
-msgstr "terp-tools"
+#: field:stock.move.memory,wizard_id:0
+msgid "Wizard"
+msgstr "Мастер"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3473,11 +2873,6 @@ msgstr "terp-tools"
 msgid "Products by Location"
 msgstr "ТМЦ по местам хранения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
-
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
@@ -3488,21 +2883,11 @@ msgstr ""
 msgid "Shelf 1"
 msgstr "Полка 1"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-sale"
-msgstr "terp-sale"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
 msgstr "Заказ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
-
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
@@ -3515,30 +2900,21 @@ msgstr ""
 msgid "Source Location"
 msgstr "Место хранения источника"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-stop"
-msgstr "terp-gtk-stop"
-
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Бухгалтерские проводки"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr "Единицы измерения"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Всего"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -3561,12 +2937,12 @@ msgstr "Партии"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr ""
+msgstr "Новая упаковка"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Назначение"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3592,7 +2968,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "В счет"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -3616,15 +2992,10 @@ msgstr "Всего входящее количество"
 msgid "Out Qty"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
-
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Перемещения для этой партии изделий"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
@@ -3636,7 +3007,7 @@ msgstr "Сообщение !"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Поместить в текущую упаковку"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3666,17 +3037,7 @@ msgstr "Значок"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "UserError"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-week"
-msgstr "terp-go-week"
+msgstr "Ошибка пользователя"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -3696,6 +3057,7 @@ msgstr "Неевропейские заказчики"
 #. module: stock
 #: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
 msgid "Error!"
@@ -3762,14 +3124,10 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
-
-#. module: stock
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr "Внимание"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3779,11 +3137,6 @@ msgid ""
 "level in this particular location and all its children."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
-
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -3796,27 +3149,13 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Подтверждено"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr ""
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
-msgid "Lot"
-msgstr "Партия"
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
@@ -3827,22 +3166,12 @@ msgstr "Подтвердить"
 msgid "Icon show in  hierarchical tree view"
 msgstr ""
 
-#. module: stock
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Ошибка ! Нельзя создать зацикленные компании."
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-home"
-msgstr "terp-go-home"
-
 #. module: stock
 #: field:product.product,location_id:0
 #: view:stock.location:0
@@ -3910,11 +3239,6 @@ msgstr ""
 msgid "Create invoice"
 msgstr "Создать счет"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
 msgid ""
@@ -3966,11 +3290,6 @@ msgstr "Клиенты"
 msgid "is cancelled."
 msgstr "отменяется."
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-document-new"
-msgstr "terp-document-new"
-
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
 msgid ""
@@ -3998,17 +3317,6 @@ msgstr "Обработка документа"
 msgid "Future Deliveries"
 msgstr "Будущие доставки"
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
-msgstr ""
-"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
-"для всех входящих перемещений ТМЦ будут помещены на этот счет. Если он не "
-"установлен для ТМЦ, то будет использован из категории ТМЦ."
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
@@ -4018,7 +3326,7 @@ msgstr "Доп. информация"
 #: view:stock.move:0
 #: field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Упаковка"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
@@ -4063,12 +3371,6 @@ msgstr "Автопроверка"
 msgid "Product Template"
 msgstr "Шаблон ТМЦ"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "Invoices"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
@@ -4080,14 +3382,19 @@ msgid "Automatic Move"
 msgstr "Автоматическое перемещение"
 
 #. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail_delete"
-msgstr "terp-mail_delete"
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -4096,21 +3403,11 @@ msgid ""
 "picking confirmation (when average price costing method is used)"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-month"
-msgstr "terp-go-month"
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
 msgstr "Перемещения ТМЦ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
-
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
@@ -4121,11 +3418,6 @@ msgstr "Выставлен счет"
 msgid "Destination Address"
 msgstr "Адрес назначения"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
-
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
@@ -4144,7 +3436,7 @@ msgstr "Магазин 2"
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создать рекурсивно связанных участников."
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -4166,9 +3458,10 @@ msgid "Draft"
 msgstr "Черновик"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "Складской учет"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -4190,16 +3483,6 @@ msgstr ""
 msgid "Existing Lot"
 msgstr "Существующая партия"
 
-#. module: stock
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -4221,12 +3504,6 @@ msgstr ""
 "умолчанию), как источник для перемещения запасов, генерируемых в процессе "
 "снабжения"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
-#, python-format
-msgid "Warning"
-msgstr "Внимание"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -4248,11 +3525,6 @@ msgstr "Обнулить"
 msgid "Direct Delivery"
 msgstr "Прямая доставка"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
@@ -4312,11 +3584,6 @@ msgstr ""
 msgid "Future Stock Moves"
 msgstr "Будущие перемещения ТМЦ"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-select-all"
-msgstr "terp-gtk-select-all"
-
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
@@ -4349,6 +3616,7 @@ msgstr "Файл XML"
 #: field:stock.move.memory,prodlot_id:0
 #: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
 #, python-format
 msgid "Production Lot"
 msgstr "Партия изделий"
@@ -4367,11 +3635,6 @@ msgstr "Учет движения"
 msgid "To invoice"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-message-new"
-msgstr "terp-mail-message-new"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
@@ -4389,16 +3652,6 @@ msgstr "Общая информация"
 msgid "Prefix"
 msgstr "Префикс"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr "STOCK_DISCONNECT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-product"
-msgstr "terp-product"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
@@ -4420,11 +3673,6 @@ msgstr "Перемещения тоаров"
 msgid "Dest. Location"
 msgstr "Место назначения"
 
-#. module: stock
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
@@ -4440,7 +3688,12 @@ msgstr "количество."
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_memory
 msgid "stock.move.memory"
-msgstr ""
+msgstr "stock.move.memory"
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
 
 #. module: stock
 #: view:stock.move:0
@@ -4475,7 +3728,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr ""
+msgstr "Реально"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -4489,11 +3742,6 @@ msgstr "Описание"
 msgid "May"
 msgstr "Май"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -4529,10 +3777,10 @@ msgid "Produced Qty"
 msgstr "Произведенное кол-во"
 
 #. module: stock
-#: field:product.category,property_stock_account_input_categ:0
-#: field:product.template,property_stock_account_input:0
-#: field:stock.change.standard.price,stock_account_input:0
-msgid "Stock Input Account"
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
 msgstr ""
 
 #. module: stock
@@ -4599,44 +3847,15 @@ msgstr ""
 msgid "Warning !"
 msgstr "Внимание !"
 
-#. module: stock
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
-msgstr ""
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
 msgstr "Выход"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You cannot remove the picking which is in %s state !"
-msgstr "Вы не можете удалить комплектование в состоянии: %s !"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr "terp-mrp"
-
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid ""
-"Shipping Type of the Picking List that will contain the chained move (leave "
-"empty to automatically detect the type based on the source and destination "
-"locations)."
-msgstr ""
-
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
-msgstr ""
+msgstr "Оставить в одной партии"
 
 #. module: stock
 #: view:product.product:0
@@ -4648,16 +3867,6 @@ msgstr "Цена закупки:"
 msgid "Optional: next stock move when chaining them"
 msgstr "Опционально: следующее перемещение ТМЦ, при перемещении по цепочке"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
@@ -4710,6 +3919,9 @@ msgstr "Частичное перемещение"
 #~ msgid "Date create"
 #~ msgstr "Дата создания"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
 #~ msgid "This account will be used to value the input stock"
 #~ msgstr "Данный счет будет использован для оценки входящих запасов"
 
@@ -4734,6 +3946,12 @@ msgstr "Частичное перемещение"
 #~ msgid "Invoice Status"
 #~ msgstr "Статус счета"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Lots by location"
 #~ msgstr "Партии по местоположениям"
 
@@ -4849,6 +4067,9 @@ msgstr "Частичное перемещение"
 #~ msgid "Total :"
 #~ msgstr "Итого:"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Недопустимое имя модели в определении действия"
+
 #~ msgid "Force to use a Production Lot during receptions"
 #~ msgstr "Принудительно назначать серийный номер партии при приёмке"
 
@@ -4888,9 +4109,93 @@ msgstr "Частичное перемещение"
 #~ "product category: \"%s\" (id: %d)"
 #~ msgstr "Журнал не определен '\\n 'для категории продукции: \"%s\" (id: %d)"
 
+#~ msgid "terp-rating-rated"
+#~ msgstr "terp-rating-rated"
+
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
+#~ msgid "terp-account"
+#~ msgstr "terp-account"
+
 #~ msgid "Outgoing Products delay"
 #~ msgstr "Задержка исходящей продукции"
 
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
+#~ msgid "terp-mail-forward"
+#~ msgstr "terp-mail-forward"
+
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
+#~ msgid "terp-stock_effects-object-colorize"
+#~ msgstr "terp-stock_effects-object-colorize"
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
+#~ msgid "terp-folder-blue"
+#~ msgstr "terp-folder-blue"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
+#~ msgid "terp-project"
+#~ msgstr "terp-project"
+
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
+#~ msgid "terp-personal+"
+#~ msgstr "terp-personal+"
+
+#~ msgid "terp-dialog-close"
+#~ msgstr "terp-dialog-close"
+
+#~ msgid "terp-personal-"
+#~ msgstr "terp-personal-"
+
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "terp-dolar"
+#~ msgstr "terp-dolar"
+
+#~ msgid "terp-gtk-jump-to-ltr"
+#~ msgstr "terp-gtk-jump-to-ltr"
+
 #, python-format
 #~ msgid ""
 #~ "Total quantity after split exceeds the quantity to split ' \\n               "
@@ -4899,6 +4204,58 @@ msgstr "Частичное перемещение"
 #~ "Общее количество после разделения превышает разделяемое количество ' \\n "
 #~ "'для этой продукции: \"%s\" (id: %d)"
 
+#~ msgid "terp-stock_symbol-selection"
+#~ msgstr "terp-stock_symbol-selection"
+
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "terp-stage"
+#~ msgstr "terp-stage"
+
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#, python-format
+#~ msgid "No invoice were created"
+#~ msgstr "Счет не был создан"
+
+#~ msgid "terp-accessories-archiver-minus"
+#~ msgstr "terp-accessories-archiver-minus"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock output account defined ' \\n                               "
@@ -4907,6 +4264,69 @@ msgstr "Частичное перемещение"
 #~ "Не определен счет для исходящих запасов' \\n 'для этой продукции: \"%s\" "
 #~ "(id: %d)"
 
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
+#~ msgid "terp-emblem-important"
+#~ msgstr "terp-emblem-important"
+
+#~ msgid "terp-gdu-smart-failing"
+#~ msgstr "terp-gdu-smart-failing"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
+#~ msgid "terp-face-plain"
+#~ msgstr "terp-face-plain"
+
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "terp-gnome-cpu-frequency-applet+"
+#~ msgstr "terp-gnome-cpu-frequency-applet+"
+
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "terp-gtk-media-pause"
+#~ msgstr "terp-gtk-media-pause"
+
+#~ msgid "terp-stock_format-scientific"
+#~ msgstr "terp-stock_format-scientific"
+
+#~ msgid "terp-go-today"
+#~ msgstr "terp-go-today"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
 #, python-format
 #~ msgid ""
 #~ "There is no stock input account defined ' \\n                                "
@@ -4914,15 +4334,291 @@ msgstr "Частичное перемещение"
 #~ msgstr ""
 #~ "Не определен счет входящих запасов ' \\n 'для этой продукции: \"%s\" (id: %d)"
 
+#~ msgid "terp-gtk-go-back-rtl"
+#~ msgstr "terp-gtk-go-back-rtl"
+
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
+#~ msgid "terp-mail-"
+#~ msgstr "terp-mail-"
+
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "terp-call-start"
+#~ msgstr "terp-call-start module: stock"
+
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
+#~ msgid "terp-personal"
+#~ msgstr "terp-personal"
+
+#~ msgid "terp-locked"
+#~ msgstr "terp-locked"
+
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
+#~ msgid "Not from Picking"
+#~ msgstr "Не из комплектования"
+
 #~ msgid "Inventory (with child locations)"
 #~ msgstr "Инвентаризация (с подчиненными местами хранения)"
 
 #~ msgid "Location Overview"
 #~ msgstr "Обзор мест хранения"
 
+#~ msgid "Rules are not supported for osv_memory objects !"
+#~ msgstr "Правила не поддерживаются для объектов osv_memory !"
+
+#~ msgid "terp-gtk-go-back-ltr"
+#~ msgstr "terp-gtk-go-back-ltr"
+
+#~ msgid "terp-mail-replied"
+#~ msgstr "terp-mail-replied"
+
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
+#~ msgid "terp-stock"
+#~ msgstr "terp-stock"
+
+#~ msgid "terp-folder-green"
+#~ msgstr "terp-folder-green"
+
+#~ msgid "terp-folder-orange"
+#~ msgstr "terp-folder-orange"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "terp-stock_align_left_24"
+#~ msgstr "terp-stock_align_left_24"
+
+#~ msgid "terp-accessories-archiver+"
+#~ msgstr "terp-accessories-archiver+"
+
+#~ msgid "terp-folder-yellow"
+#~ msgstr "terp-folder-yellow"
+
+#~ msgid "terp-dolar_ok!"
+#~ msgstr "terp-dolar_ok!"
+
+#~ msgid "terp-go-year"
+#~ msgstr "terp-go-year"
+
+#~ msgid "Serial Number"
+#~ msgstr "Серийный номер"
+
+#~ msgid "terp-gtk-jump-to-rtl"
+#~ msgstr "terp-gtk-jump-to-rtl"
+
+#~ msgid "terp-idea"
+#~ msgstr "terp-idea"
+
+#~ msgid "terp-stock_format-default"
+#~ msgstr "terp-stock_format-default"
+
+#~ msgid "terp-check"
+#~ msgstr "terp-check"
+
+#~ msgid "terp-camera_test"
+#~ msgstr "terp-camera_test"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "terp-gtk-stop"
+#~ msgstr "terp-gtk-stop"
+
+#~ msgid "terp-document-new"
+#~ msgstr "terp-document-new"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "terp-go-month"
+#~ msgstr "terp-go-month"
+
+#~ msgid "terp-mail_delete"
+#~ msgstr "terp-mail_delete"
+
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
 #, python-format
 #~ msgid "Not Available. Moves are not confirmed."
 #~ msgstr "Недоступно. Перемещения не подтверждены."
 
+#~ msgid "terp-gtk-select-all"
+#~ msgstr "terp-gtk-select-all"
+
 #~ msgid "Extended options..."
 #~ msgstr "Расширенные опции..."
+
+#~ msgid "terp-product"
+#~ msgstr "terp-product"
+
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
+#~ msgid "terp-mail-message-new"
+#~ msgstr "terp-mail-message-new"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "terp-go-week"
+#~ msgstr "terp-go-week"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные компании."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
+#~ msgid "terp-go-home"
+#~ msgstr "terp-go-home"
+
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "terp-accessories-archiver"
+#~ msgstr "terp-accessories-archiver"
+
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER module: stock"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 2dc37da1e11..fba264d76de 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -6,21 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 13:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 07:38+0000\n"
+"Last-Translator: Black Jack <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-rating-rated"
-msgstr ""
-
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
@@ -31,44 +26,33 @@ msgstr ""
 msgid "Stock ups upload"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "固定连锁库位"
 
 #. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE"
-msgstr "STOCK_SAVE"
-
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr ""
+msgstr "动作"
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"There is no journal defined '\\n                                'on the "
-"product category: \"%s\" (id: %d)"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-account"
-msgstr "terp-account"
-
-#. module: stock
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr "向上追溯"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -77,36 +61,32 @@ msgid "Last Product Inventories"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_ASCENDING"
-msgstr "STOCK_SORT_ASCENDING"
+#: view:stock.move:0
+msgid "Today"
+msgstr "今天"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
+msgstr "版本号"
+
+#. module: stock
+#: view:stock.move.memory:0
+msgid "Product Moves"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_FORWARD"
-msgstr "STOCK_MEDIA_FORWARD"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
+#: model:ir.actions.act_window,help:stock.action_picking_tree
 msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"            product_qty = partial_data.get('product_qty',0.0)\n"
-"            move_product_qty[move.id] = product_qty\n"
-"            product_uom = partial_data.get('product_uom',False)\n"
-"            product_price = partial_data.get('product_price',0.0)\n"
-"            product_currency = partial_data.get('product_currency',False)\n"
-"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+"This is the list of all delivery orders that must be prepared, according to "
+"your different sales orders and your logistics rules."
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
-msgid "Inventory Control"
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
 msgstr ""
 
 #. module: stock
@@ -117,23 +97,11 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 msgid "Picking list"
 msgstr ""
 
 #. module: stock
-#: view:board.board:0
-msgid "Outgoing Products delay"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
@@ -144,6 +112,7 @@ msgstr ""
 #: report:stock.inventory.move:0
 #: field:stock.move,product_qty:0
 #: field:stock.move.consume,product_qty:0
+#: field:stock.move.memory,quantity:0
 #: field:stock.move.scrap,product_qty:0
 #: field:stock.move.split,qty:0
 #: field:stock.move.split.lines,quantity:0
@@ -172,6 +141,12 @@ msgstr ""
 msgid "UoM"
 msgstr "计量单位"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 #: view:report.stock.move:0
@@ -194,10 +169,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: help:stock.move,address_id:0
-msgid ""
-"Optional address where goods are to be delivered, specifically used for "
-"allotment"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_move
+msgid "Deliver/Receive Products"
 msgstr ""
 
 #. module: stock
@@ -207,9 +186,18 @@ msgid "You cannot delete any record!"
 msgstr "您不能删除任何记录！"
 
 #. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "库存库位"
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it '             #                        'for "
+"this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -235,11 +223,37 @@ msgstr ""
 
 #. module: stock
 #: view:stock.move:0
+#: field:stock.move,picking_id:0
 #: field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
 msgstr "关联单号"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"Define your locations in order to reflect to your warehouse structure and "
+"organization. OpenERP is able to manage physical locations (warehouses, "
+"shelves, bin, etc), partners location (customers, suppliers) and virtual "
+"locations which are the counter-part of the stock operations like the "
+"manufacturing orders consummations, the inventories, etc. Every stock "
+"operation in OpenERP moves the products from one location to another one. "
+"For instance, if you receive products from a supplier, OpenERP will move "
+"products from the Supplier location into the Stock location. Each report can "
+"be performed on physicals, partners or virtual locations."
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
 msgid ""
@@ -248,13 +262,17 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines
-msgid "Split lines"
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"The Periodical Inventories are used when you count your number of products "
+"available per location. You can use it, once a year, when you do the general "
+"inventory or, once you need it, to correct the current stock level of a "
+"product."
 msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Upstream Traceability"
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
 msgstr ""
 
 #. module: stock
@@ -298,6 +316,11 @@ msgstr ""
 msgid "Partner"
 msgstr "业务伙伴"
 
+#. module: stock
+#: help:stock.move.memory,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
+
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -348,11 +371,6 @@ msgstr "盘点确认"
 msgid "State"
 msgstr "状态"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-forward"
-msgstr ""
-
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
@@ -402,9 +420,10 @@ msgid "Outgoing Product"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
+#: model:ir.actions.act_window,help:stock.action_warehouse_form
+msgid ""
+"Create and manage your warehouses and assign them a location from here"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
@@ -428,30 +447,18 @@ msgstr "出库库位"
 msgid "Split into"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Today"
-msgstr ""
-
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-hr"
-msgstr "terp-hr"
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -459,22 +466,17 @@ msgstr "terp-hr"
 msgid "Location Type"
 msgstr "库位类型"
 
+#. module: stock
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
 #. module: stock
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_effects-object-colorize"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
-
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
@@ -545,10 +547,8 @@ msgid "Grand Total:"
 msgstr "总计:"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_move_report
-#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
-#: view:report.stock.move:0
-msgid "Moves Analysis"
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
 msgstr ""
 
 #. module: stock
@@ -569,11 +569,6 @@ msgstr ""
 msgid "Reception"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
-
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
@@ -627,9 +622,9 @@ msgid "Packs"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
@@ -642,8 +637,11 @@ msgid "June"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-blue"
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"The 'Deliver Products' menu lists all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list, line by "
+"or line or through the Delivery Orders menu."
 msgstr ""
 
 #. module: stock
@@ -661,11 +659,6 @@ msgstr "产品需求库位"
 msgid "Production Lots"
 msgstr "生产批次"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "terp-project"
-
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
@@ -687,16 +680,6 @@ msgstr ""
 msgid "Inventory Line"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal+"
-msgstr ""
-
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
@@ -709,16 +692,6 @@ msgstr ""
 msgid "Process Picking"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-graph"
-msgstr "terp-graph"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -733,11 +706,6 @@ msgid ""
 "should enter new ones line by line."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dialog-close"
-msgstr ""
-
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
@@ -765,26 +733,11 @@ msgstr ""
 msgid "Production lot is used to put a serial number on the production"
 msgstr "生产批次是生产的一个序列号"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
-
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
 msgstr "输入库位"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal-"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
@@ -817,17 +770,9 @@ msgid "Transit Location for Inter-Companies Transfers"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
-#, python-format
-msgid ""
-"Total quantity after split exceeds the quantity to split ' \\n               "
-"                     'for this product: \"%s\" (id: %d)"
-msgstr ""
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "虚拟库存值"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -854,22 +799,11 @@ msgstr ""
 msgid "Contains"
 msgstr "包含"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar"
-msgstr ""
-
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Future Qty"
-msgstr ""
-
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
@@ -897,11 +831,6 @@ msgstr "预定日期"
 msgid "Pack Search"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-ltr"
-msgstr ""
-
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
@@ -912,17 +841,6 @@ msgstr "紧急"
 msgid "Journal"
 msgstr ""
 
-#. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr ""
-
 #. module: stock
 #: help:stock.picking,location_id:0
 msgid ""
@@ -947,20 +865,17 @@ msgid "Stock by Location"
 msgstr "库存库位"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_symbol-selection"
-msgstr ""
-
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
@@ -968,11 +883,9 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
-#: help:stock.location,posz:0
-msgid "Optional localization details, for information purpose only"
-msgstr ""
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr "分拣单列表"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -985,47 +898,34 @@ msgstr "账面库存"
 msgid "View"
 msgstr "视图"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
-
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
 msgstr "左父项"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stage"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Delivery Information"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "每批次数量"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-#: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "库存调拨"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1085,43 +985,17 @@ msgid ""
 "                      "
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
-
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
 msgstr "作者"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDELETE"
-msgstr "STOCK_UNDELETE"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Delivery Order"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "No invoice were created"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
@@ -1143,11 +1017,6 @@ msgstr "完成日期"
 msgid "Expected Shipping Date"
 msgstr "预计运送日期"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver-minus"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
@@ -1166,11 +1035,6 @@ msgstr ""
 msgid "Physical Inventory"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
-
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
@@ -1179,45 +1043,38 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr "产品计量单位"
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "业务伙伴库位"
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid ""
-"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-"                product_qty = partial_data.get('product_qty',0.0)\n"
-"                move_product_qty[move.id] = product_qty\n"
-"                product_uom = partial_data.get('product_uom',False)\n"
-"                product_price = partial_data.get('product_price',0.0)\n"
-"                product_currency = "
-"partial_data.get('product_currency',False)\n"
-"                prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
@@ -1234,11 +1091,6 @@ msgstr "欧洲客户"
 msgid "Delay between original move and chained move in days"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
@@ -1286,18 +1138,10 @@ msgid "is in draft state."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"There is no stock output account defined ' \\n                               "
-"             'for this product: \"%s\" (id: %d)"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
-
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
@@ -1314,12 +1158,6 @@ msgstr ""
 msgid "Shop 1"
 msgstr ""
 
-#. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
-msgid "Total Value"
-msgstr ""
-
 #. module: stock
 #: view:stock.change.standard.price:0
 #: view:stock.fill.inventory:0
@@ -1349,15 +1187,11 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: report:stock.inventory.move:0
-msgid "Stock Inventory"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Operation forbidden"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
-
 #. module: stock
 #: field:stock.location.product,from_date:0
 msgid "From"
@@ -1411,11 +1245,6 @@ msgstr ""
 msgid "Company is not specified in Location"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-report"
-msgstr "terp-report"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:stock.partial.move,type:0
@@ -1427,11 +1256,6 @@ msgstr "类型"
 msgid "Generic IT Suppliers"
 msgstr "一般IT供应商"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
-
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
@@ -1450,32 +1274,12 @@ msgstr "盘存明细ID"
 msgid "Address of  customer or supplier."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gdu-smart-failing"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "分拣单"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
@@ -1483,11 +1287,6 @@ msgstr "STOCK_GO_DOWN"
 msgid "Customer Location"
 msgstr "客户库位"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OK"
-msgstr "STOCK_OK"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
@@ -1495,8 +1294,15 @@ msgid "Invalid action !"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-emblem-important"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Receive Information"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
 msgstr ""
 
 #. module: stock
@@ -1510,20 +1316,32 @@ msgid "General Informations"
 msgstr "一般信息"
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件!"
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "空"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr "向下追溯"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "OpenERP S.A."
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Receive"
+msgstr ""
+
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
@@ -1576,21 +1394,11 @@ msgstr ""
 msgid "Cannot deliver products which are already delivered !"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-face-plain"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
@@ -1604,11 +1412,6 @@ msgstr "供货商库位"
 msgid "were scrapped"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
-
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1620,11 +1423,6 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
-
 #. module: stock
 #: help:stock.picking,backorder_id:0
 msgid ""
@@ -1638,8 +1436,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.move.memory,currency:0
 #, python-format
 msgid "Currency"
 msgstr ""
@@ -1657,24 +1455,16 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"Variation Account is not specified for Product Category: %s' % "
-"(product_obj.categ_id.name)))\n"
-"        move_ids = []\n"
-"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gnome-cpu-frequency-applet+"
-msgstr ""
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr "库存调拨"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1693,62 +1483,26 @@ msgstr "取消可用"
 msgid "Scheduled date for the processing of this move"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-media-pause"
-msgstr ""
-
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "已创建存货调拨"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-scientific"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
 msgstr ""
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "待开票"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
-
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-today"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid ""
-"There is no stock input account defined ' \\n                                "
-"            'for this product: \"%s\" (id: %d)"
-msgstr ""
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Back Orders"
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
 msgstr ""
 
 #. module: stock
@@ -1762,6 +1516,11 @@ msgstr "对应库位属性"
 msgid "Localization"
 msgstr ""
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -1780,11 +1539,6 @@ msgstr ""
 msgid "Production Lot Numbers"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
-
 #. module: stock
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,date:0
@@ -1807,37 +1561,17 @@ msgstr "日期"
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-administration"
-msgstr "terp-administration"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
-
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
 msgstr "库位库存"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
 msgid "Merging is only allowed on draft inventories."
 msgstr "只允许合并草搞盘存"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-rtl"
-msgstr ""
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
@@ -1848,16 +1582,6 @@ msgstr ""
 msgid "Track moves"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-crm"
-msgstr "terp-crm"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
-
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
@@ -1874,11 +1598,6 @@ msgstr ""
 msgid "Warehouse Dashboard"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-"
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
@@ -1894,9 +1613,10 @@ msgid "Scrap Products"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -1914,11 +1634,7 @@ msgid "Return Picking"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview_all
-msgid "Inventory (with child locations)"
-msgstr ""
-
-#. module: stock
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
@@ -1945,21 +1661,6 @@ msgstr "运输地址"
 msgid "Provide the quantities of the returned products."
 msgstr "输入退货的数量"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-call-start"
-msgstr ""
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
@@ -1989,25 +1690,18 @@ msgid ""
 "location for goods you receive from the current partner"
 msgstr "默认作为你接收当前业务伙伴产品的来源库位"
 
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Picking"
-msgstr ""
-
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
 msgstr "拥有者地址"
 
 #. module: stock
-#: field:stock.location,parent_right:0
-msgid "Right Parent"
-msgstr "右父项"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2025,9 +1719,9 @@ msgid "Search Inventory"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr ""
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr "每批次数量"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2038,9 +1732,10 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:report.stock.move,month:0
-msgid "January"
-msgstr ""
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Received Qty"
+msgstr "已接收数量"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
@@ -2054,11 +1749,6 @@ msgid ""
 "[INT_REF]"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2073,6 +1763,12 @@ msgstr ""
 msgid "Name"
 msgstr "仓库"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is done."
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
@@ -2126,11 +1822,6 @@ msgstr ""
 msgid "Logistical shipping unit: pallet, box, pack ..."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-locked"
-msgstr ""
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "_Apply"
@@ -2144,6 +1835,11 @@ msgstr ""
 msgid "]"
 msgstr "]"
 
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "库存库位"
+
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
@@ -2151,8 +1847,11 @@ msgid "Total value"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-personal"
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations made on a "
+"specific product. You can filter on the product to see all the past or "
+"future movements made on the product."
 msgstr ""
 
 #. module: stock
@@ -2162,11 +1861,6 @@ msgid ""
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
 
-#. module: stock
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_incoming_product_board
@@ -2179,21 +1873,18 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.move.memory,cost:0
 #, python-format
 msgid "Cost"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr "入库科目"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2201,18 +1892,6 @@ msgstr "STOCK_COPY"
 msgid "Warehouse Management"
 msgstr ""
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "库存调拨"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-#: field:stock.change.standard.price,stock_account_output:0
-msgid "Stock Output Account"
-msgstr "出库科目"
-
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
@@ -2229,11 +1908,6 @@ msgstr ""
 msgid "Stock Location Analysis"
 msgstr "库存库位分析"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
 #. module: stock
 #: help:stock.move,date:0
 msgid ""
@@ -2279,14 +1953,10 @@ msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uom:0
+#: field:stock.move.memory,product_uom:0
 msgid "Unit of Measure"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -2300,17 +1970,23 @@ msgid ""
 "generated by a Manufacturing Order"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
 #: view:stock.move.track:0
 msgid "Tracking a move"
 msgstr "跟踪调拨"
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"The Internal Moves lists all inventory operations you have to perform in "
+"your warehouse. All operations can be categorized into stock journals, so "
+"that each worker has it's own list of operations to perform in his own "
+"journal. Most operations are prepared automatically by OpenERP according to "
+"your pre-configured logistics rules but you can also record manual stock "
+"operations."
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 msgid "Update"
@@ -2327,11 +2003,6 @@ msgstr ""
 msgid "Stock Journals"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-go-back-ltr"
-msgstr ""
-
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
@@ -2364,31 +2035,21 @@ msgstr ""
 msgid "Track Incoming Lots"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-replied"
-msgstr ""
-
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Physical Inventories"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2426,11 +2087,6 @@ msgstr "您只可删除草稿调拨"
 msgid "Products"
 msgstr "产品"
 
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "空"
-
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
@@ -2464,25 +2120,19 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "库存调拨"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Operation forbidden"
+#: view:report.stock.move:0
+msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
+#: field:stock.move.memory,move_id:0
+msgid "Move"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,min_date:0
@@ -2495,17 +2145,17 @@ msgstr ""
 msgid "P&L Qty"
 msgstr "益损数量"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-green"
-msgstr ""
-
 #. module: stock
 #: view:stock.production.lot:0
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
 msgstr "修订记录"
 
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
 #. module: stock
 #: help:product.product,valuation:0
 msgid ""
@@ -2516,6 +2166,14 @@ msgid ""
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"levels. Sort and group by selection criteria in order to better analyse and "
+"manage your company  activities."
+msgstr ""
+
 #. module: stock
 #: help:report.stock.move,location_id:0
 #: help:stock.move,location_id:0
@@ -2547,8 +2205,6 @@ msgstr ""
 
 #. module: stock
 #: code:addons/stock/stock.py:0
-#: model:ir.actions.report.xml,name:stock.report_location_overview
-#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2560,19 +2216,16 @@ msgstr "盘存"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
 msgid "Picking List"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
+#: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #, python-format
 msgid "Currency in which Unit Cost is expressed"
@@ -2612,34 +2265,11 @@ msgid "Fixed Location"
 msgstr "固定库位"
 
 #. module: stock
-#: constraint:ir.model:0
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_align_left_24"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-orange"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-accessories-archiver+"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
-
-#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+"This is the list of all the production lots (serial numbers) you recorded. "
+"After having selected a lot, you can get the up-stream or down-stream "
+"traceability of the products contained in lot."
 msgstr ""
 
 #. module: stock
@@ -2653,14 +2283,13 @@ msgid "Consumable"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2677,22 +2306,12 @@ msgstr ""
 msgid "Stock Journal"
 msgstr "库存业务类型"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
-
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "产品需求"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-folder-yellow"
-msgstr ""
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
@@ -2716,16 +2335,19 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 #: view:stock.move:0
+#, python-format
 msgid "Receive Products"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
-#: model:ir.actions.act_window,name:stock.action_partial_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
+#, python-format
 msgid "Deliver Products"
 msgstr ""
 
@@ -2739,11 +2361,6 @@ msgstr "查看库存产品"
 msgid "Internal Picking list"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
@@ -2761,11 +2378,6 @@ msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-dolar_ok!"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
@@ -2798,13 +2410,15 @@ msgid "Company"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-year"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
@@ -2817,6 +2431,12 @@ msgstr "实际库存"
 msgid "Fill Inventory"
 msgstr "填写盘存"
 
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid ""
@@ -2846,21 +2466,11 @@ msgstr "批次"
 msgid "Production Lot Number"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-jump-to-rtl"
-msgstr ""
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "数量(销售单位)"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
@@ -2876,27 +2486,6 @@ msgstr ""
 msgid "Back Order"
 msgstr "订单"
 
-#. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial Number"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#, python-format
-msgid "New picking invoices"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
-
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
@@ -2909,11 +2498,6 @@ msgstr "有效"
 msgid "Inventory Management"
 msgstr "库存管理"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-idea"
-msgstr ""
-
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
@@ -2925,15 +2509,6 @@ msgstr "属性"
 msgid "Error, no partner !"
 msgstr "错误，无业务伙伴！"
 
-#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
-#, python-format
-msgid ""
-"The current move line is already assigned to a pack, please remove it first "
-"if you really want to change it ' \\n            #                        "
-"'for this product: \"%s\" (id: %d)"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
@@ -2963,11 +2538,6 @@ msgid ""
 "be included as well."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
-
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
@@ -3012,11 +2582,6 @@ msgstr "修订版名称"
 msgid "Warehouse"
 msgstr "仓库"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
-
 #. module: stock
 #: view:stock.location.product:0
 msgid ""
@@ -3030,11 +2595,6 @@ msgstr ""
 msgid "Accounting Stock Properties"
 msgstr "会计库存属性"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NO"
-msgstr "STOCK_NO"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
@@ -3065,9 +2625,9 @@ msgid "Virtual Locations"
 msgstr "虚拟库位"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "待开票"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
@@ -3086,21 +2646,11 @@ msgstr "如果想生成发票，请在挑选列表上填写一家业务伙伴。
 msgid "Not urgent"
 msgstr "不紧急"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock_format-default"
-msgstr ""
-
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
@@ -3112,16 +2662,6 @@ msgstr "仓库"
 msgid "Responsible"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-check"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-camera_test"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -3129,11 +2669,6 @@ msgstr ""
 msgid "Inventory Analysis"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
-
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
@@ -3146,7 +2681,6 @@ msgid "Stock"
 msgstr "库存"
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:ir.model,name:stock.model_product_product
 #: model:ir.ui.menu,name:stock.menu_stock_product
@@ -3161,6 +2695,7 @@ msgstr "库存"
 #: view:stock.move:0
 #: field:stock.move,product_id:0
 #: field:stock.move.consume,product_id:0
+#: field:stock.move.memory,product_id:0
 #: field:stock.move.scrap,product_id:0
 #: field:stock.move.split,product_id:0
 #: view:stock.production.lot:0
@@ -3171,11 +2706,6 @@ msgstr "库存"
 msgid "Product"
 msgstr "产品"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
@@ -3199,12 +2729,6 @@ msgstr ""
 msgid "Product UOS"
 msgstr "产品销售单位"
 
-#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Received Qty"
-msgstr "已接收数量"
-
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
@@ -3221,22 +2745,17 @@ msgstr ""
 msgid "Consume Products"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
-#, python-format
-msgid "Product UOM"
-msgstr "产品计量单位"
-
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
-msgid "You cannot remove the picking which is in %s state !"
+msgid "Insufficient Stock in Lot !"
 msgstr ""
 
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr "右父项"
+
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
@@ -3259,24 +2778,15 @@ msgid "Suppliers"
 msgstr "供应商"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-tools"
-msgstr "terp-tools"
-
-#. module: stock
-#: report:lot.stock.overview:0
-msgid "Location Overview"
-msgstr "库位概述"
+#: field:stock.move.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3284,11 +2794,6 @@ msgstr "库位概述"
 msgid "Products by Location"
 msgstr "产品库位"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
-
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
@@ -3299,21 +2804,11 @@ msgstr ""
 msgid "Shelf 1"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-sale"
-msgstr "terp-sale"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
-
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
@@ -3326,11 +2821,6 @@ msgstr ""
 msgid "Source Location"
 msgstr "源库位"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-stop"
-msgstr ""
-
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
@@ -3343,9 +2833,9 @@ msgid "Unit Of Measure"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -3421,11 +2911,6 @@ msgstr ""
 msgid "Out Qty"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
-
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
@@ -3453,6 +2938,15 @@ msgstr "盘存明细"
 msgid "Reason"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"The stock journals system allows you assign each stock operation into a "
+"specific journal according to the type of operation to perform or the "
+"worker/team that should perform the operation. Examples of stock journals "
+"may be: quality control, pick lists, packing, etc."
+msgstr ""
+
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
@@ -3464,16 +2958,6 @@ msgstr "图标"
 msgid "UserError"
 msgstr "用户错误"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-week"
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory.line.split:0
 #: view:stock.move.consume:0
@@ -3492,6 +2976,7 @@ msgstr "非欧洲客户"
 #. module: stock
 #: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
 msgid "Error!"
@@ -3557,11 +3042,6 @@ msgid ""
 "Location if Fixed."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
@@ -3569,16 +3049,13 @@ msgid "Warning"
 msgstr "警告"
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "is done."
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"click on a location in order to get the list of the products and their stock "
+"level in this particular location and all its children."
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
-
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
@@ -3589,22 +3066,13 @@ msgstr "默认作为你发送货物到业务伙伴的目标库位."
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "确定"
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr ""
-
-#. module: stock
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
@@ -3615,22 +3083,12 @@ msgstr "确认"
 msgid "Icon show in  hierarchical tree view"
 msgstr ""
 
-#. module: stock
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr "合并盘存"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-home"
-msgstr ""
-
 #. module: stock
 #: field:product.product,location_id:0
 #: view:stock.location:0
@@ -3659,8 +3117,8 @@ msgid "Back Order of"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
+#: help:stock.move.memory,cost:0
 #, python-format
 msgid "Unit Cost for this product line"
 msgstr ""
@@ -3697,9 +3155,12 @@ msgid "Create invoice"
 msgstr "创建发票"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid ""
+"This is the list of all your packs. After having selected a Pack, you can "
+"get the up-stream or down-stream traceability of the products contained in "
+"the pack."
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -3727,6 +3188,12 @@ msgstr ""
 msgid "Chaining Journal"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
@@ -3739,8 +3206,13 @@ msgid "is cancelled."
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-document-new"
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"You will find here the list of all products you are waiting for, according "
+"to your preceding purchase orders. Once you receive an order, you can filter "
+"based on the name of the supplier or the purchase order reference. Then you "
+"can confirm all products received using the buttons on the right of each "
+"line."
 msgstr ""
 
 #. module: stock
@@ -3760,14 +3232,6 @@ msgstr ""
 msgid "Future Deliveries"
 msgstr ""
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
-msgstr ""
-
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
@@ -3803,6 +3267,15 @@ msgstr "库位"
 msgid "Date Expected"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"supplier. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
@@ -3824,13 +3297,18 @@ msgid "Automatic Move"
 msgstr "自动调拨"
 
 #. module: stock
-#: field:stock.location,stock_virtual_value:0
-msgid "Virtual Stock Value"
-msgstr "虚拟库存值"
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail_delete"
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
 msgstr ""
 
 #. module: stock
@@ -3840,21 +3318,11 @@ msgid ""
 "picking confirmation (when average price costing method is used)"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-go-month"
-msgstr ""
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
-
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
@@ -3865,11 +3333,6 @@ msgstr ""
 msgid "Destination Address"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
-
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
@@ -3910,9 +3373,10 @@ msgid "Draft"
 msgstr "草稿"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3925,14 +3389,14 @@ msgid ""
 msgstr ""
 
 #. module: stock
-#: field:stock.move.split.lines,use_exist:0
-msgid "Existing Lot"
+#: view:board.board:0
+msgid "Outgoing Products Delay"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -3973,11 +3437,6 @@ msgstr ""
 msgid "Direct Delivery"
 msgstr "直接送货"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
-
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
@@ -3990,6 +3449,7 @@ msgid "November"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/product.py:0
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
@@ -4018,9 +3478,8 @@ msgid "Check Availability"
 msgstr "检查可用"
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Not Available. Moves are not confirmed."
+#: selection:report.stock.move,month:0
+msgid "January"
 msgstr ""
 
 #. module: stock
@@ -4035,21 +3494,11 @@ msgstr ""
 msgid "Future Stock Moves"
 msgstr "未来库存调拨"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-gtk-select-all"
-msgstr ""
-
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-msgid "Extended options..."
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
@@ -4069,14 +3518,15 @@ msgid "XML File"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:res.request.link,name:stock.req_link_tracking
 #: field:stock.inventory.line,prod_lot_id:0
 #: report:stock.inventory.move:0
 #: field:stock.move,prodlot_id:0
+#: field:stock.move.memory,prodlot_id:0
 #: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
 #, python-format
 msgid "Production Lot"
 msgstr "生产批次"
@@ -4095,11 +3545,6 @@ msgstr "可跟踪的"
 msgid "To invoice"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mail-message-new"
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
@@ -4118,17 +3563,16 @@ msgid "Prefix"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr "STOCK_DISCONNECT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-product"
-msgstr "terp-product"
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
+#: field:stock.partial.move,product_moves:0
 msgid "Moves"
 msgstr "凭证"
 
@@ -4151,6 +3595,16 @@ msgstr ""
 msgid "quantity."
 msgstr ""
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory
+msgid "stock.move.memory"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
@@ -4199,9 +3653,10 @@ msgid "May"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Deliver"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -4217,6 +3672,7 @@ msgid "Upstream traceability"
 msgstr "向上追溯"
 
 #. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
 msgstr ""
@@ -4228,11 +3684,11 @@ msgid "Produced Qty"
 msgstr "产品数量"
 
 #. module: stock
-#: field:product.category,property_stock_account_input_categ:0
-#: field:product.template,property_stock_account_input:0
-#: field:stock.change.standard.price,stock_account_input:0
-msgid "Stock Input Account"
-msgstr "入库科目"
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr "出库科目"
 
 #. module: stock
 #: view:stock.move:0
@@ -4303,24 +3759,6 @@ msgstr ""
 msgid "Output"
 msgstr "发出"
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr "terp-mrp"
-
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid ""
-"Shipping Type of the Picking List that will contain the chained move (leave "
-"empty to automatically detect the type based on the source and destination "
-"locations)."
-msgstr ""
-
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
@@ -4336,16 +3774,6 @@ msgstr ""
 msgid "Optional: next stock move when chaining them"
 msgstr ""
 
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
@@ -4401,15 +3829,75 @@ msgstr ""
 #~ msgid "Stock Management"
 #~ msgstr "库存管理"
 
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
 #~ msgid "Revision"
 #~ msgstr "修订版"
 
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
+#~ msgid "terp-account"
+#~ msgstr "terp-account"
+
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
 #~ msgid "Move Lines"
 #~ msgstr "调拨明细"
 
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
 #~ msgid "Track line"
 #~ msgstr "跟踪明细"
 
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
 #~ msgid "Stock Level 1"
 #~ msgstr "库存层1"
 
@@ -4422,25 +3910,106 @@ msgstr ""
 #~ msgid "Customer Invoice"
 #~ msgstr "客户发票"
 
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
 #~ msgid "Calendar of Deliveries"
 #~ msgstr "送货日程表"
 
 #~ msgid "Latest Date of Inventory"
 #~ msgstr "最近盘存日期"
 
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
 #~ msgid "Tracking Lot"
 #~ msgstr "跟踪批次"
 
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#~ msgid "terp-stock"
+#~ msgstr "terp-stock"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
 #~ msgid "All Stock Moves"
 #~ msgstr "所有库存调拨"
 
 #~ msgid "Finished products"
 #~ msgstr "成品"
 
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
 #, python-format
 #~ msgid "Invoice state"
 #~ msgstr "发票状态"
 
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
 #, python-format
 #~ msgid "Invoice is not created"
 #~ msgstr "没有创建发票"
@@ -4449,19 +4018,67 @@ msgstr ""
 #~ msgid "Please select at least two inventories."
 #~ msgstr "请选择至少2个盘存"
 
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
 #~ msgid "Periodical Inventory"
 #~ msgstr "定期盘存"
 
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
 #~ msgid "Draft Periodical Inventories"
 #~ msgstr "定期盘存草稿"
 
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
 #~ msgid "Stock Tracking Lots"
 #~ msgstr "库存跟踪批次"
 
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
 #, python-format
 #~ msgid "Invoice is already created."
 #~ msgstr "发票已创建"
 
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
 #~ msgid "Invoice Status"
 #~ msgstr "发票状态"
 
@@ -4475,52 +4092,182 @@ msgstr ""
 #~ msgid "No production sequence defined"
 #~ msgstr "无生产序列定义"
 
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
 #~ msgid "Planned Date"
 #~ msgstr "计划日期"
 
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER"
+
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
 #~ msgid "Created Date"
 #~ msgstr "创建日期"
 
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
 #~ msgid "Tracking Lots"
 #~ msgstr "跟踪批次"
 
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
 #~ msgid "Nearest"
 #~ msgstr "最近"
 
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
 #~ msgid "Tiny sprl"
 #~ msgstr "Tiny sprl"
 
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
 #~ msgid "Chained Delay (days)"
 #~ msgstr "连锁延迟(天)"
 
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
 #~ msgid "Track Outging Lots"
 #~ msgstr "跟踪出库批次"
 
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
 #~ msgid "Moves Tracked"
 #~ msgstr "调拨跟踪"
 
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
+#~ msgid "terp-project"
+#~ msgstr "terp-project"
+
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
 #, python-format
 #~ msgid "Please select one and only one inventory !"
 #~ msgstr "请选定唯一的盘存"
 
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
 #~ msgid "Canceled"
 #~ msgstr "已取消"
 
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
 #~ msgid "Track Production Lots"
 #~ msgstr "跟踪生产批次"
 
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
 #~ msgid "Supplier Invoice"
 #~ msgstr "供应商发票"
 
+#~ msgid "terp-product"
+#~ msgstr "terp-product"
+
 #~ msgid "Close"
 #~ msgstr "关闭"
 
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
 #~ msgid "Inventory line"
 #~ msgstr "盘存明细"
 
 #~ msgid "Move State"
 #~ msgstr "调拨状态"
 
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+
 #~ msgid "Units"
 #~ msgstr "单位"
 
@@ -4590,6 +4337,9 @@ msgstr ""
 #~ msgid "Workshop"
 #~ msgstr "工厂"
 
+#~ msgid "Location Overview"
+#~ msgstr "库位概述"
+
 #~ msgid "Components"
 #~ msgstr "零部件"
 
@@ -4706,6 +4456,9 @@ msgstr ""
 #~ msgid "Fill Inventory for specific location"
 #~ msgstr "填写库存的具体库位"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在动作定义中使用了无效的模快名。"
+
 #~ msgid "Unreceived Products"
 #~ msgstr "未接收的产品"
 
@@ -4724,6 +4477,9 @@ msgstr ""
 #~ msgid "Location Content (With children)"
 #~ msgstr "库位内容(包括子项)"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效的视图结构xml文件!"
+
 #~ msgid "This account will be used to value the input stock"
 #~ msgstr "这科目用于记录入库值"
 
@@ -4792,9 +4548,6 @@ msgstr ""
 #~ msgid "Internal Ref"
 #~ msgstr "内部关联单号"
 
-#~ msgid "Packing list"
-#~ msgstr "分拣单列表"
-
 #~ msgid "Packing result"
 #~ msgstr "分拣单结果"
 
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index b7028b3f821..b0dcaf1a9e1 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:25+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -30,9 +30,9 @@ msgid "Pulled Paths"
 msgstr "Pfade durch Pull Regeln"
 
 #. module: stock_location
-#: view:product.product:0
-msgid "Logistics Flow"
-msgstr ""
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Buchung"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -42,7 +42,7 @@ msgstr "Warenfluss durch Push Regeln"
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "Automatisch kein neuer Lieferschein"
+msgstr "Automatische Erstellung Lieferauftrag ohne Beleg"
 
 #. module: stock_location
 #: view:product.product:0
@@ -68,20 +68,15 @@ msgid "Pulled Flows"
 msgstr "Warenfluss durch Pull Regeln"
 
 #. module: stock_location
-#: field:product.pulled.flow,type_proc:0
-msgid "Type of Procurement"
-msgstr "Beschaffungstyp"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
 msgstr "Lagerort (Ziel)"
 
-#. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
@@ -110,20 +105,6 @@ msgstr "Lagerort"
 msgid "Invoice Status"
 msgstr "Status Rechnung"
 
-#. module: stock_location
-#: selection:product.pulled.flow,invoice_state:0
-#: selection:stock.location.path,invoice_state:0
-msgid "Not from Picking"
-msgstr "Rechnung nicht durch Lieferung"
-
-#. module: stock_location
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: stock_location
 #: help:stock.location.path,auto:0
 msgid ""
@@ -155,9 +136,9 @@ msgid "Pack Zone"
 msgstr "Packzone"
 
 #. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Bezeichnung"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
@@ -177,7 +158,7 @@ msgstr "Einkaufen"
 #. module: stock_location
 #: view:product.product:0
 msgid "Pushed flows"
-msgstr "Push Warenfluss Regel"
+msgstr "Push Warenfluss"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_dispatch_zone
@@ -187,12 +168,12 @@ msgstr "Versandzone"
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr "Warenfluss im Hauptlager"
+msgstr "Lieferketten im Zentrallager"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled flows"
-msgstr "Steuern des Warenfluss durch Pull Regeln"
+msgstr "Pull Warenfluss"
 
 #. module: stock_location
 #: field:product.pulled.flow,company_id:0
@@ -230,7 +211,7 @@ msgstr "Disponiere von Auftrag"
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr "Dosponiere vom Lager"
+msgstr "Disponiere vom Lager"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -254,9 +235,9 @@ msgid "This field will fill the packing Origin and the name of its moves"
 msgstr "Verweis auf Lieferauftrag und Lieferscheine"
 
 #. module: stock_location
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Beschaffungstyp"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -265,9 +246,9 @@ msgstr ""
 "Unternehmen zu dem diese Lieferaufträge und Bestandsbuchungen gehören"
 
 #. module: stock_location
-#: field:product.pulled.flow,name:0
-msgid "Name"
-msgstr "Bezeichnung"
+#: view:product.product:0
+msgid "Logistics Flow"
+msgstr ""
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -304,21 +285,16 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Disponiere vom Lager' - wenn benötigt den Lagerbestand verwenden oder auf "
-"neue Lieferungen warten.\r\n"
-"'Disponiere von Auftrag' - wenn benötigt, einkaufen oder produzieren der "
-"Waren, die für die Erledigung erforerlich sind."
+"'Disponiere vom Lager' bedeutet: Wenn benötigt den Lagerbestand verwenden "
+"oder auf neue Lieferungen warten.\r\n"
+"'Disponiere von Auftrag'  bedeutet: Wenn benötigt, einkaufen oder "
+"produzieren der Waren, die für die Erledigung erforderlich sind."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
 msgstr "Lagerort (Ziel), das beliefert werden muss"
 
-#. module: stock_location
-#: sql_constraint:stock.warehouse.orderpoint:0
-msgid "Qty Multiple must be greater than zero."
-msgstr "Multiple Menge muss grösser 0 sein."
-
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
@@ -335,10 +311,16 @@ msgstr "Bezogen durch Pull Pfad von anderem Lagerort via Beschaffung %d"
 msgid "Quality Control"
 msgstr "Qualitätskontrolle"
 
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "Zeitverzug (Tage)"
+msgstr "Zeitverzögerung  (Tage)"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:0
@@ -363,10 +345,15 @@ msgid ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
 msgstr ""
-"Bestandsbuchung für Bezug unter Berücksichtigung einer vorhandenen Pull "
+"Bestandsbewertung für Bezug unter Berücksichtigung einer vorhandenen Pull "
 "Regel vom ursprünglichen Lager %s, mit Pull Regel %s und  ursprünglichem "
 "Beschaffungauftrag %s (#%d)"
 
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
 #. module: stock_location
 #: field:product.pulled.flow,location_src_id:0
 msgid "Location Source"
@@ -395,14 +382,9 @@ msgid "Action Type"
 msgstr "Aktionstyp"
 
 #. module: stock_location
-#: selection:product.pulled.flow,type_proc:0
-msgid "Move"
-msgstr "Buchung"
-
-#. module: stock_location
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -447,9 +429,18 @@ msgstr "Storno Kaskade"
 msgid "Invoiced"
 msgstr "Abgerechnet"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
 #~ msgid "Stock Location Paths"
 #~ msgstr "Lagerort Standorte"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "stock.location.path"
 #~ msgstr "stock.location.path"
 
@@ -458,3 +449,18 @@ msgstr "Abgerechnet"
 
 #~ msgid "Logistic Flow"
 #~ msgstr "Warenfluss"
+
+#~ msgid "Not from Picking"
+#~ msgstr "Rechnung nicht durch Lieferung"
+
+#~ msgid "Qty Multiple must be greater than zero."
+#~ msgstr "Multiple Menge muss grösser 0 sein."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 8993955501c..6da2ac91ae5 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:48+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:04+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -29,9 +29,9 @@ msgid "Pulled Paths"
 msgstr "Caminos arrastrados"
 
 #. module: stock_location
-#: view:product.product:0
-msgid "Logistic Flow"
-msgstr "Flujo logística"
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Movimiento"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -67,20 +67,15 @@ msgid "Pulled Flows"
 msgstr "Flujos arrastrados"
 
 #. module: stock_location
-#: field:product.pulled.flow,type_proc:0
-msgid "Type of Procurement"
-msgstr "Tipo de abastecimiento"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
 msgstr "Ubicación utilizada por la ubicación de destino para suministar."
 
-#. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
@@ -109,20 +104,6 @@ msgstr "Ubicación"
 msgid "Invoice Status"
 msgstr "Estado factura"
 
-#. module: stock_location
-#: selection:product.pulled.flow,invoice_state:0
-#: selection:stock.location.path,invoice_state:0
-msgid "Not from Picking"
-msgstr "No desde albarán"
-
-#. module: stock_location
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: stock_location
 #: help:stock.location.path,auto:0
 msgid ""
@@ -151,9 +132,9 @@ msgid "Pack Zone"
 msgstr "Zona empaquetado"
 
 #. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
@@ -251,9 +232,9 @@ msgstr ""
 "Este campo rellenará el origen del albarán y el nombre de sus movimientos."
 
 #. module: stock_location
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Tipo de abastecimiento"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -262,9 +243,9 @@ msgstr ""
 "Se usa para saber a que compañía pertenece los albaranes y movimientos."
 
 #. module: stock_location
-#: field:product.pulled.flow,name:0
-msgid "Name"
-msgstr "Nombre"
+#: view:product.product:0
+msgid "Logistics Flow"
+msgstr "Flujo de logística"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -312,11 +293,6 @@ msgstr ""
 msgid "Is the destination location that needs supplying"
 msgstr "Es la ubicación destino que necesita suministro."
 
-#. module: stock_location
-#: sql_constraint:stock.warehouse.orderpoint:0
-msgid "Qty Multiple must be greater than zero."
-msgstr "El múltiplo de la cantidad debe ser más grande que cero."
-
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
@@ -333,6 +309,12 @@ msgstr "Arrastrado desde otra ubicación vía abastecimiento %d"
 msgid "Quality Control"
 msgstr "Control calidad"
 
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "No aplicable"
+
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
@@ -363,6 +345,11 @@ msgstr ""
 "Movimiento para abastecimiento arrastrado proveniente de la ubicación "
 "original %s, regla de arrastre %s, vía abastecimiento original %s (#%d)"
 
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
 #. module: stock_location
 #: field:product.pulled.flow,location_src_id:0
 msgid "Location Source"
@@ -388,17 +375,12 @@ msgstr "De entrada"
 #. module: stock_location
 #: view:product.product:0
 msgid "Action Type"
-msgstr "Tipo acción"
+msgstr "Tipo de acción"
 
 #. module: stock_location
-#: selection:product.pulled.flow,type_proc:0
-msgid "Move"
-msgstr "Movimiento"
-
-#. module: stock_location
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -441,11 +423,38 @@ msgstr "Cancelar cascada"
 msgid "Invoiced"
 msgstr "Facturado"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Stock Location Paths"
 #~ msgstr "Rutas ubicación stock"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
 #~ msgid "stock.location.path"
 #~ msgstr "stock.ubicacion.ruta"
 
 #~ msgid "Procurement & Locations"
 #~ msgstr "Abastecimiento y Ubicaciones"
+
+#~ msgid "Logistic Flow"
+#~ msgstr "Flujo logística"
+
+#~ msgid "Not from Picking"
+#~ msgstr "No desde albarán"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "Qty Multiple must be greater than zero."
+#~ msgstr "El múltiplo de la cantidad debe ser más grande que cero."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index dd1d98a7e07..9568086a92a 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2009-11-17 10:52+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 18:26+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Wysyłanie towarów"
 
 #. module: stock_location
 #: view:product.product:0
@@ -28,9 +28,9 @@ msgid "Pulled Paths"
 msgstr ""
 
 #. module: stock_location
-#: view:product.product:0
-msgid "Logistics Flow"
-msgstr ""
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Przesunięcie"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -45,7 +45,7 @@ msgstr "Automatycznie i bezpośrednio"
 #. module: stock_location
 #: view:product.product:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametry"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
@@ -64,20 +64,20 @@ msgid "Pulled Flows"
 msgstr ""
 
 #. module: stock_location
-#: field:product.pulled.flow,type_proc:0
-msgid "Type of Procurement"
-msgstr ""
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Musisz podać nr partii dla tego produktu"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr ""
+msgstr "Strefa stosowana przez strefę docelową jako zaopatrzenie"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Internal"
-msgstr ""
+msgstr "Wewnętrzne"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:0
@@ -91,27 +91,13 @@ msgstr ""
 #: model:ir.model,name:stock_location.model_stock_location
 #: field:product.pulled.flow,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Strefa"
 
 #. module: stock_location
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
-
-#. module: stock_location
-#: selection:product.pulled.flow,invoice_state:0
-#: selection:stock.location.path,invoice_state:0
-msgid "Not from Picking"
-msgstr ""
-
-#. module: stock_location
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
+msgstr "Stan faktury"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -135,27 +121,32 @@ msgstr ""
 #. module: stock_location
 #: view:product.product:0
 msgid "Conditions"
-msgstr ""
+msgstr "Warunki"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_pack_zone
 msgid "Pack Zone"
-msgstr ""
+msgstr "Strefa pakowania"
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Nazwa"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
 msgid "Gate B"
-msgstr ""
+msgstr "Brama B"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_a
 msgid "Gate A"
-msgstr ""
+msgstr "Brama A"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Buy"
-msgstr ""
+msgstr "Kupno"
 
 #. module: stock_location
 #: view:product.product:0
@@ -165,12 +156,12 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_dispatch_zone
 msgid "Dispatch Zone"
-msgstr ""
+msgstr "Strefa wysyłki"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Warehouse Locations Paths"
-msgstr ""
+msgstr "Ścieżki magazynowe"
 
 #. module: stock_location
 #: view:product.product:0
@@ -181,48 +172,50 @@ msgstr ""
 #: field:product.pulled.flow,company_id:0
 #: field:stock.location.path,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Przesunięcie zapasu"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Zapotrzebowanie"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
 msgid "If checked, when this move is cancelled, cancel the linked move too"
 msgstr ""
+"Jeśli zaznaczone, to przy anulowaniu tego przesunięcia zostanie anulowane "
+"również przesunięcie połączone."
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
 msgid "Produce"
-msgstr ""
+msgstr "Produkcja"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Na zamówienie"
 
 #. module: stock_location
 #: selection:product.pulled.flow,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Na zapas"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
 msgid "Partner Address"
-msgstr ""
+msgstr "Adres partnera"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Do zafakturowania"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
@@ -233,21 +226,23 @@ msgstr "Liczba dni na wykonanie tego przesunięcia"
 #: help:product.pulled.flow,name:0
 msgid "This field will fill the packing Origin and the name of its moves"
 msgstr ""
+"To pole będzie stosowane jako Pochodzenie w pobraniu i jako nazwa w "
+"przesunięciach."
 
 #. module: stock_location
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Typ zapotrzebowania"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company belong packings and moves"
-msgstr ""
+msgstr "Oznacza firmę dla pobrania i przesunięć"
 
 #. module: stock_location
-#: field:product.pulled.flow,name:0
-msgid "Name"
-msgstr ""
+#: view:product.product:0
+msgid "Logistics Flow"
+msgstr "Przepływ logistyczny"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -266,18 +261,18 @@ msgstr "Ręczna operacja"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metoda zapotrzebowania"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
 #: field:stock.location.path,picking_type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Typ wysyłki"
 
 #. module: stock_location
 #: help:product.pulled.flow,procure_method:0
@@ -286,11 +281,13 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Na Zapas': Kiedy potrzeba pobierz z zapasu lub poczekaj na dostawę. 'Na "
+"Zamówienie': Kiedy potrzeba kup lub wyprodukuj na Zapotrzebowanie."
 
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr ""
+msgstr "Jest strefą docelową, która wymaga uzupełnienia"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -306,7 +303,13 @@ msgstr ""
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
 msgid "Quality Control"
-msgstr ""
+msgstr "Kontrola jakości"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "Nie odpowiednie"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
@@ -334,10 +337,15 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Próbujesz powiązac z numerem partii z innego produktu"
+
 #. module: stock_location
 #: field:product.pulled.flow,location_src_id:0
 msgid "Location Source"
-msgstr ""
+msgstr "Strefa źródłowa"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
@@ -354,17 +362,17 @@ msgstr "Automatyczne przesunięcie"
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Przyjęcie towarów"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Action Type"
-msgstr ""
+msgstr "Typ akcji"
 
 #. module: stock_location
-#: selection:product.pulled.flow,type_proc:0
-msgid "Move"
-msgstr ""
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -373,11 +381,12 @@ msgid ""
 "Depending on the company, choose whatever you want to receive or send "
 "products"
 msgstr ""
+"Zależnie od firmy wybierz, czy chcesz przyjmować, czy wysyłać produkty"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_order
 msgid "Order Processing"
-msgstr ""
+msgstr "Przetwarzanie zamówienia"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
@@ -393,19 +402,28 @@ msgstr "Ścieżki stref"
 #: field:product.pulled.flow,journal_id:0
 #: field:stock.location.path,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #. module: stock_location
 #: field:product.pulled.flow,cancel_cascade:0
 #: field:stock.move,cancel_cascade:0
 msgid "Cancel Cascade"
-msgstr ""
+msgstr "Anuluj kaskadowanie"
 
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Zafakturowano"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
 
 #~ msgid "Procurement & Locations"
 #~ msgstr "Nabycie i strefy"
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index f406c315de3..e722001048d 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-27 12:58+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 17:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -28,9 +28,9 @@ msgid "Pulled Paths"
 msgstr "Входящие пути"
 
 #. module: stock_location
-#: view:product.product:0
-msgid "Logistics Flow"
-msgstr "Товарно-транспортный поток"
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Перемещение"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
@@ -65,20 +65,15 @@ msgid "Pulled Flows"
 msgstr "Входящие потоки"
 
 #. module: stock_location
-#: field:product.pulled.flow,type_proc:0
-msgid "Type of Procurement"
-msgstr "Тип снабжения"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
 msgstr "Место хранения используемое местом назначения для поставки"
 
-#. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
 #: selection:stock.location.path,picking_type:0
@@ -105,20 +100,6 @@ msgstr "Место хранения"
 msgid "Invoice Status"
 msgstr "Статус счета"
 
-#. module: stock_location
-#: selection:product.pulled.flow,invoice_state:0
-#: selection:stock.location.path,invoice_state:0
-msgid "Not from Picking"
-msgstr "Не из комплектования"
-
-#. module: stock_location
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
 #. module: stock_location
 #: help:stock.location.path,auto:0
 msgid ""
@@ -141,9 +122,9 @@ msgid "Pack Zone"
 msgstr "Зона упаковки"
 
 #. module: stock_location
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Имя"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_gate_b
@@ -242,9 +223,9 @@ msgstr ""
 "перемещений"
 
 #. module: stock_location
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Тип снабжения"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -254,9 +235,9 @@ msgstr ""
 "перемещения"
 
 #. module: stock_location
-#: field:product.pulled.flow,name:0
-msgid "Name"
-msgstr "Имя"
+#: view:product.product:0
+msgid "Logistics Flow"
+msgstr "Товарно-транспортный поток"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -304,11 +285,6 @@ msgstr ""
 msgid "Is the destination location that needs supplying"
 msgstr "Место хранения которое нуждается в поставке"
 
-#. module: stock_location
-#: sql_constraint:stock.warehouse.orderpoint:0
-msgid "Qty Multiple must be greater than zero."
-msgstr ""
-
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
@@ -325,6 +301,12 @@ msgstr "Взято из другого места хранения по снаб
 msgid "Quality Control"
 msgstr "Контроль качества"
 
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr "Неприменимо"
+
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
@@ -351,6 +333,11 @@ msgid ""
 "via original Procurement %s (#%d)"
 msgstr ""
 
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+
 #. module: stock_location
 #: field:product.pulled.flow,location_src_id:0
 msgid "Location Source"
@@ -379,14 +366,9 @@ msgid "Action Type"
 msgstr "Тип действия"
 
 #. module: stock_location
-#: selection:product.pulled.flow,type_proc:0
-msgid "Move"
-msgstr "Перемещение"
-
-#. module: stock_location
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ошибка: Неправильный штрих-код"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -431,6 +413,15 @@ msgstr "Отменить каскад"
 msgid "Invoiced"
 msgstr "Счет"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
 #~ msgid "Procurement & Locations"
 #~ msgstr "Снабжение и местоположения"
 
@@ -439,3 +430,6 @@ msgstr "Счет"
 
 #~ msgid "stock.location.path"
 #~ msgstr "расположение патча"
+
+#~ msgid "Not from Picking"
+#~ msgstr "Не из комплектования"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index fde0495af83..a948eb15d4c 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -6,34 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:47+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:06+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#. module: stock_no_autopicking
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: stock_no_autopicking
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Producto"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
@@ -45,20 +32,15 @@ msgstr "Orden de fabricación"
 msgid "Auto Picking"
 msgstr "Auto empaquetado"
 
-#. module: stock_no_autopicking
-#: model:ir.model,name:stock_no_autopicking.model_product_product
-msgid "Product"
-msgstr "Producto"
-
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
 msgstr "Auto empaquetado para materiales a granel en órdenes de producción."
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -66,6 +48,24 @@ msgid "Stock No Auto-Picking"
 msgstr "Stock no auto empaquetado"
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index 2eabb5b80f3..04505caf37e 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 08:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 17:05+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -39,7 +39,7 @@ msgstr "Recolha automática para matérias-primas de ordens de produção."
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erro: Código EAN inválido"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -49,7 +49,7 @@ msgstr "Stock Sem Recolha-Automática"
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "A quantidade numa encomenda não pode ser igual ou inferior a zero!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 22889462dee..28dc3343fc3 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.po
@@ -6,33 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 08:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 17:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Идентификатор сертификата модуля должен быть уникальным !"
-
-#. module: stock_no_autopicking
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: stock_no_autopicking
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "ТМЦ"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
@@ -44,20 +31,15 @@ msgstr "Производственный заказ"
 msgid "Auto Picking"
 msgstr "Авто комплектование"
 
-#. module: stock_no_autopicking
-#: model:ir.model,name:stock_no_autopicking.model_product_product
-msgid "Product"
-msgstr "ТМЦ"
-
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
 msgstr "Авто комплектация для сырья производственных заказов."
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Название модуля должно быть уникальным !"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ошибка: Неправильный штрих-код"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -65,6 +47,24 @@ msgid "Stock No Auto-Picking"
 msgstr "Запасы без авто-комплектации"
 
 #. module: stock_no_autopicking
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Размер поля никогда не может быть меньше 1 !"
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "Количество в заказе не может быть отрицательным или нулевым !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Размер поля никогда не может быть меньше 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Название модуля должно быть уникальным !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Идентификатор сертификата модуля должен быть уникальным !"
diff --git a/addons/stock_planning/i18n/de.po b/addons/stock_planning/i18n/de.po
index c99b2c38eea..32f6cd2fa90 100644
--- a/addons/stock_planning/i18n/de.po
+++ b/addons/stock_planning/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -63,11 +63,6 @@ msgstr ""
 "Ein prognostiz. Umsatz wird konvertiert in die Produkt Menge durch "
 "einfachePreisumrechnung für das Produkt."
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Fehlerhafte Modellbezeichnung für diese Aktion"
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -345,15 +340,16 @@ msgid "Procure Incoming Left"
 msgstr "Berechne Bedarfsmenge"
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Beendet"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr "    Bedarfsmenge "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Pick List "
-msgstr "Pack Liste "
+msgstr "Lieferschein "
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
@@ -369,11 +365,6 @@ msgstr "Erstelle"
 msgid "Master Procurement Schedule"
 msgstr "Masterplan Beschaffung (MPS)"
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -388,11 +379,6 @@ msgstr "  Datum Erstellung "
 msgid "Period"
 msgstr "Periode"
 
-#. module: stock_planning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
 #. module: stock_planning
 #: view:stock.period:0
 #: field:stock.period,state:0
@@ -452,11 +438,6 @@ msgstr "Wähle Option um Verkäufe d. gesamten Unternehmens zu sehen."
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: stock_planning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
@@ -555,12 +536,6 @@ msgstr "Sie müssen Zentrallager als Quelle wählen !"
 msgid "Creates planning lines for selected period and warehouse."
 msgstr "Erzeuge Prognosepositionen für ausgew. Periode u. Zentrallager."
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "Kann bereits genehmigte Verkaufsprognose nicht löschen !"
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -690,9 +665,9 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erzeugen"
+#: view:stock.period:0
+msgid "Closed"
+msgstr "Beendet"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -700,11 +675,6 @@ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen"
 msgid "Warehouse "
 msgstr "Zentrallager "
 
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Diese Abteilung Periode5"
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -727,10 +697,11 @@ msgid ""
 "Period of selected Product. To plan this value look at Confirmed Out or "
 "Sales Forecasts. This value should be equal or greater than Confirmed Out."
 msgstr ""
-"Erfasse Prognose für den Warenabgang des Zentrallagers innerhalb der ausgew. "
-"Periodeu. f. die ausgew. Produkte. Für die Planung können Sie den bereits "
-"best. Abgang sowie die Verkaufsprognose heranziehen. Der Wert sollte >= des "
-"bereits bestät. Abgangs sein."
+"Erfassen den geplanten Abgang des ausgewählten Zentrallagers für die "
+"selektierten Perioden und Produkte. Vergleichen Sie für die Eingabe mit den "
+"Wert der bereits bestätigten Abgänge oder des Prognosewerts für den Verkauf. "
+"Der einzutragende Wert sollte größer oder gleich dem bereits bestätigten "
+"Abgang sein."
 
 #. module: stock_planning
 #: model:ir.module.module,description:stock_planning.module_meta_information
@@ -1208,8 +1179,8 @@ msgstr ""
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
-msgid "    Incoming Left: "
-msgstr "    Bedarfsmenge "
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr "Kann bereits genehmigte Verkaufsprognose nicht löschen !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1463,11 +1434,6 @@ msgstr "Offen"
 msgid "Copy quantities from last Stock and Sale Forecast."
 msgstr "Kopiere Mengen von letztmaligem Bestand und Verkauf Prognose"
 
-#. module: stock_planning
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_dept:0
 msgid "This Dept Period1"
@@ -1484,12 +1450,9 @@ msgid "This Dept Period2"
 msgstr "Diese Abteilung Periode2"
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-"Sonderzeichen haben !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "Diese Abteilung Periode5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
@@ -1514,7 +1477,7 @@ msgstr "Bestät. Abgang"
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr "Verantwortl."
+msgstr "Verantwortlich"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
@@ -1812,3 +1775,27 @@ msgstr "Anfangsbestand"
 #~ msgstr ""
 #~ "\n"
 #~ " Bereits Abgegangen: "
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
+#~ "Sonderzeichen haben !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/stock_planning/i18n/fr.po b/addons/stock_planning/i18n/fr.po
index 60425125df9..032ddab0ff4 100644
--- a/addons/stock_planning/i18n/fr.po
+++ b/addons/stock_planning/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-02 09:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-05 19:36+0000\n"
+"Last-Translator: swinter <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -54,11 +54,6 @@ msgid ""
 "prices."
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -76,7 +71,7 @@ msgstr ""
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
 #, python-format
 msgid "No products in selected category !"
-msgstr ""
+msgstr "Pas de produit dans la catégorie sélectionnée !"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,warehouse_id:0
@@ -137,6 +132,8 @@ msgid ""
 "\n"
 " Initial Stock: "
 msgstr ""
+"\n"
+" Stock initial: "
 
 #. module: stock_planning
 #: help:stock.planning,warehouse_forecast:0
@@ -314,8 +311,9 @@ msgid "Procure Incoming Left"
 msgstr ""
 
 #. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
 msgstr ""
 
 #. module: stock_planning
@@ -338,11 +336,6 @@ msgstr ""
 msgid "Master Procurement Schedule"
 msgstr ""
 
-#. module: stock_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -357,11 +350,6 @@ msgstr "  Date de création: "
 msgid "Period"
 msgstr "Période"
 
-#. module: stock_planning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
 #. module: stock_planning
 #: view:stock.period:0
 #: field:stock.period,state:0
@@ -414,11 +402,6 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#. module: stock_planning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
@@ -515,12 +498,6 @@ msgstr ""
 msgid "Creates planning lines for selected period and warehouse."
 msgstr ""
 
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
@@ -644,8 +621,8 @@ msgid "Draft"
 msgstr "Brouilon"
 
 #. module: stock_planning
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
+#: view:stock.period:0
+msgid "Closed"
 msgstr ""
 
 #. module: stock_planning
@@ -654,11 +631,6 @@ msgstr ""
 msgid "Warehouse "
 msgstr ""
 
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
@@ -916,7 +888,7 @@ msgstr ""
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
-msgid "    Incoming Left: "
+msgid "Cannot delete Validated Sale Forecasts !"
 msgstr ""
 
 #. module: stock_planning
@@ -1161,11 +1133,6 @@ msgstr ""
 msgid "Copy quantities from last Stock and Sale Forecast."
 msgstr ""
 
-#. module: stock_planning
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_dept:0
 msgid "This Dept Period1"
@@ -1182,9 +1149,8 @@ msgid "This Dept Period2"
 msgstr ""
 
 #. module: stock_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
 msgstr ""
 
 #. module: stock_planning
diff --git a/addons/stock_planning/i18n/pt.po b/addons/stock_planning/i18n/pt.po
new file mode 100644
index 00000000000..220eab4635a
--- /dev/null
+++ b/addons/stock_planning/i18n/pt.po
@@ -0,0 +1,1443 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:53+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <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: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "No products in selected category !"
+msgstr "Não há produtos na categoria selecionada!"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+"\n"
+" existências iniciais: "
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "Criar períodos mensais"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr "stock.period.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "Períodos:"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr "stock.sale.forecast"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr "Este departamento"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr "stock.planning.createlines"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick List "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr "Criar"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "  Creation Date: "
+msgstr "  Data de criação: "
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr "stock.sale.forecast.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr "Categoria de produto"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Manual planning for "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr "Este utilizador"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr "Previsões"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Procurement created in MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Ação inválida!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr "Criar períodos semanais"
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr "Por utilizador:"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr "Previsão de vendas"
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr "Nome do período"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr "Data de início"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "Por departamento:"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr "Previsão"
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr "Armazém "
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Minimum stock: "
+msgstr "    Stock mínimo: "
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr "Previsão de vendas"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr "Quantidade prevista."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr "Existências"
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr "Quantidade de produto"
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr "Fechar"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr "Validado"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr "Atual"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr "stock.planning"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr "Por armazém:"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick created from MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr "Aprovar"
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr "Este armazém"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr "Existências iniciais"
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index bc1b52bd544..c5a144f7b5a 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:38+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:07+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -28,19 +28,6 @@ msgstr "Documento origen"
 msgid "Object"
 msgstr "Objeto"
 
-#. module: subscription
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: subscription
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
@@ -82,11 +69,6 @@ msgstr "Borrador"
 msgid "Current Date"
 msgstr "Fecha actual"
 
-#. module: subscription
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "¡Error! No puede crear menús recursivos."
-
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
@@ -97,11 +79,6 @@ msgstr "Semanas"
 msgid "Today"
 msgstr "Hoy"
 
-#. module: subscription
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
@@ -176,11 +153,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
-
-#. module: subscription
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
+"Si el campo activo se desmarca, permite ocultar el documento de suscripción "
+"sin eliminarlo."
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -230,15 +204,6 @@ msgstr "Días"
 msgid "Active"
 msgstr "Activo"
 
-#. module: subscription
-#: help:subscription.subscription,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar la suscripción sin "
-"eliminarla."
-
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
@@ -277,11 +242,6 @@ msgstr "Datos de la suscripción"
 msgid "Description or Summary of Subscription"
 msgstr "Descripción o resumen de la suscripción."
 
-#. module: subscription
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
@@ -289,6 +249,15 @@ msgstr "¡El nombre del módulo debe ser único!"
 msgid "Subscription Document"
 msgstr "Documento de suscripción"
 
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Si el campo activo se desmarca, permite ocultar la suscripción sin "
+"eliminarla."
+
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
@@ -374,10 +343,11 @@ msgstr "Valor por defecto"
 msgid "Documents created"
 msgstr "Documentos creados"
 
-#. module: subscription
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
 
 #~ msgid "Status"
 #~ msgstr "Posición"
@@ -388,6 +358,9 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Configuration"
 #~ msgstr "Configuración"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
 #~ msgid "Subscription document"
 #~ msgstr "Documento periódico"
 
@@ -397,9 +370,31 @@ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
 #~ msgid "Tools"
 #~ msgstr "Herramientas"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the "
+#~ "subscription without removing it."
+#~ msgstr ""
+#~ "Si el campo activo se desmarca, permite ocultar la suscripción sin "
+#~ "eliminarla."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "¡Error! No puede crear menús recursivos."
+
 #~ msgid ""
 #~ "If the active field is set to true, it will allow you to hide the "
 #~ "subscription document without removing it."
 #~ msgstr ""
 #~ "Si el campo activo se desmarca, permite ocultar el documento de suscripción "
 #~ "sin eliminarlo."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 6627616beb4..8b5a29a2650 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 15:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 16:33+0000\n"
+"Last-Translator: Lorenzo Battistini - agilebg.com "
+"<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -22,33 +23,11 @@ msgstr ""
 msgid "Source Document"
 msgstr "Documento Originale"
 
-#. module: subscription
-#: help:subscription.document,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription document without removing it."
-msgstr ""
-
 #. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
 msgstr "Oggetto"
 
-#. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"Please provide another source document.\n"
-"This one does not exist !"
-msgstr ""
-"Si prega di fornire un altro documento d'origine.\n"
-"Quello indicato non esiste!"
-
-#. module: subscription
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome modello non valido nella definizione dell'azione."
-
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
@@ -59,14 +38,6 @@ msgstr ""
 msgid "Search Subscription"
 msgstr ""
 
-#. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"You cannot modify the Object linked to the Document Type!\n"
-"Create another Document instead !"
-msgstr ""
-
 #. module: subscription
 #: field:subscription.subscription,date_init:0
 msgid "First Date"
@@ -98,19 +69,6 @@ msgstr "Bozza"
 msgid "Current Date"
 msgstr "Data attuale"
 
-#. module: subscription
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: subscription
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
@@ -190,9 +148,11 @@ msgid "Number of documents"
 msgstr "Numero documenti"
 
 #. module: subscription
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -205,6 +165,14 @@ msgstr "Ordine di Vendita"
 msgid "Name"
 msgstr "Nome"
 
+#. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+
 #. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
@@ -232,13 +200,6 @@ msgstr "Giorni"
 msgid "Active"
 msgstr "Attivo"
 
-#. module: subscription
-#: help:subscription.subscription,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription without removing it."
-msgstr ""
-
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
@@ -284,6 +245,13 @@ msgstr ""
 msgid "Subscription Document"
 msgstr "Documento Abbonamento"
 
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
@@ -302,7 +270,7 @@ msgstr ""
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Process"
-msgstr "Processo"
+msgstr "Processa"
 
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
@@ -344,6 +312,16 @@ msgstr "Completato"
 msgid "Invoice"
 msgstr "Fattura"
 
+#. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Si prega di fornire un altro documento d'origine.\n"
+"Quello indicato non esiste!"
+
 #. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
@@ -355,6 +333,12 @@ msgstr "Valore predefinito"
 msgid "Documents created"
 msgstr "Documenti creati"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
 #~ msgid "Status"
 #~ msgstr "Stato"
 
@@ -364,6 +348,9 @@ msgstr "Documenti creati"
 #~ msgid "Configuration"
 #~ msgstr "Configurazione"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per Visualizzazione Architettura!"
+
 #~ msgid "Subscription document"
 #~ msgstr "Documento Abbonamento"
 
@@ -372,3 +359,6 @@ msgstr "Documenti creati"
 
 #~ msgid "Tools"
 #~ msgstr "Strumenti"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome modello non valido nella definizione dell'azione."
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index cfc85968965..7779ed081f6 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-03 07:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 12:55+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-04 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -152,6 +152,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"Se o campo 'ativo' estiver como 'Falso', então, isso permitir-lhe-á esconder "
+"o documento de subscrição sem ter de o eliminar"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -237,7 +239,7 @@ msgstr "Data de Subscrição"
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Descrição ou resumo da subscrição"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
diff --git a/addons/survey/__init__.py b/addons/survey/__init__.py
index 6ff3c246165..065d64a87e2 100644
--- a/addons/survey/__init__.py
+++ b/addons/survey/__init__.py
@@ -1,21 +1,20 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index f248b6027fd..51993239a01 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -1,21 +1,20 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 02b454d5e41..1d959db7044 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 07:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -111,9 +111,9 @@ msgid "A Range"
 msgstr "Ein Bereich"
 
 #. module: survey
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr "Tabelle"
 
 #. module: survey
 #: field:survey.history,date:0
@@ -132,15 +132,13 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Sie müssen einen oder mehrere Menüpunkte im Zeilenkopf wählen (Leerzeichen "
+"sind nicht erlaubt)"
 
 #. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-#: field:survey.question,descriptive_text:0
-#: selection:survey.question,type:0
-msgid "Descriptive Text"
-msgstr "Beschreibender Text"
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr "Ist die Menüauswahl sichtbar?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
@@ -225,11 +223,6 @@ msgstr "survey.name.wiz"
 msgid "Survey Questions"
 msgstr "Umfrage Fragen"
 
-#. module: survey
-#: view:survey.response.line:0
-msgid "Table Answer"
-msgstr "Tabelle"
-
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
@@ -408,6 +401,11 @@ msgstr "Validiere Text"
 msgid "Text"
 msgstr "Text"
 
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
@@ -447,16 +445,16 @@ msgstr "Erwarte Antwort"
 msgid "Late"
 msgstr "Spät"
 
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
 msgid "From"
 msgstr "Von"
 
-#. module: survey
-#: selection:survey,state:0
-msgid "Closed"
-msgstr "Abgeschlossen"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -499,12 +497,7 @@ msgstr "Anzahl"
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
-msgstr ""
-
-#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+msgstr "Sie müssen eine oder mehrere Menüpunkt im Zeilenkopf auswählen"
 
 #. module: survey
 #: view:survey:0
@@ -553,11 +546,6 @@ msgstr "Email"
 msgid "Answer Surveys"
 msgstr "Beantworte Fragen"
 
-#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
@@ -593,7 +581,7 @@ msgstr "Antworten"
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "You can not answer because the survey is not open"
-msgstr ""
+msgstr "Sie können nicht antworten da die Umfrage nicht offen ist."
 
 #. module: survey
 #: selection:survey.response,response_type:0
@@ -613,9 +601,13 @@ msgid "Page Nr"
 msgstr "Seitenzahl"
 
 #. module: survey
-#: field:survey.question.column.heading,in_visible_menu_choice:0
-msgid "Is Menu Choice Invisible??"
-msgstr "Ist die Menüauswahl sichtbar?"
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr "Beschreibender Text"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
@@ -641,11 +633,6 @@ msgstr "Fehlermeldung"
 msgid "You must enter one or more menu choices in column heading"
 msgstr "Sie müssen einer oder mehrere Menüoptionen in Spalten auswählen"
 
-#. module: survey
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML Code für diese Ansicht!"
-
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
@@ -689,7 +676,7 @@ msgstr "Sie müssen einer oder mehr Spaltenüberschriften eingeben."
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "Bitte geben Sie einen Integer Wert ein."
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
@@ -709,6 +696,8 @@ msgid ""
 "your maximum is greater than the number of answer.                           "
 "          Please use a number that is smaller than %d."
 msgstr ""
+"Die maximale Anzahl benötigter Antworten ist größer als die Anzahl "
+"Antworten. Bitte geben Sie eine Zahl kleiner als %d ein."
 
 #. module: survey
 #: view:survey.request:0
@@ -855,7 +844,7 @@ msgstr "Seitennummer"
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "Kann Umfrage für Fragenassistent nicht finden!"
 
 #. module: survey
 #: view:survey:0
@@ -931,9 +920,9 @@ msgid "survey.print.statistics"
 msgstr ""
 
 #. module: survey
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Abgeschlossen"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1027,11 +1016,6 @@ msgstr "Multiple Textbox"
 msgid "Landscape(Horizontal)"
 msgstr "Querformat (Horizontal)"
 
-#. module: survey
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
@@ -1292,11 +1276,6 @@ msgstr "Minimale Stellenanzahl"
 msgid "Open"
 msgstr "Öffnen"
 
-#. module: survey
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
@@ -1313,14 +1292,6 @@ msgstr ""
 "vorhandenen Antworten. Bitte geben Sie einen Wert ein, der kleiner ist als "
 "%d."
 
-#. module: survey
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
@@ -1397,7 +1368,7 @@ msgstr "Einladung verschicken"
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "You cannot select the same answer more than one time"
-msgstr ""
+msgstr "Sie können die selbe Antwort nicht mehr als einmal auswählen."
 
 #. module: survey
 #: view:survey.question:0
@@ -1516,7 +1487,7 @@ msgstr ""
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "You cannot select same answer more than one time'"
-msgstr ""
+msgstr "Sie können die selbe Antwort nicht mehr als einmal auswählen."
 
 #. module: survey
 #: selection:survey.print,paper_size:0
@@ -1768,6 +1739,9 @@ msgstr "Seitenposition"
 #~ msgid "Page :-"
 #~ msgstr "Seite :-"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML Code für diese Ansicht!"
+
 #~ msgid "Maximum Response per User"
 #~ msgstr "Maximale Antworten je Benutzer"
 
@@ -1811,6 +1785,12 @@ msgstr "Seitenposition"
 #~ msgid "Total Completed Survey :-"
 #~ msgstr "Gesamt abgeschlossene Umfrage :-"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
 #~ msgid "Survey Response"
 #~ msgstr "Umfrage Antwort"
 
@@ -1860,6 +1840,9 @@ msgstr "Seitenposition"
 #~ "Sie müssen eine oder mehrere Menübeschriftungen  \\n                         "
 #~ "        in der Spaltenüberschrift erfassen"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
 #, python-format
 #~ msgid ""
 #~ "Maximum Required Answer you\\n                                     entered "
@@ -1903,6 +1886,9 @@ msgstr "Seitenposition"
 #~ msgid "You can not give answer for this survey more than %s times"
 #~ msgstr "Sie können nicht häufiger als %s Mal diesen Fragebogen beantworten."
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
 #, python-format
 #~ msgid ""
 #~ "Maximum Required Answer is greater \\n                                    "
@@ -1936,3 +1922,9 @@ msgstr "Seitenposition"
 #~ msgstr ""
 #~ "Sie müssen ein oder mehrere Menüs eingeben\\                               "
 #~ "als Auswahl für die Spaltenüberschrift (Leerschritte nicht erlaubt)"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 5e686a1530f..0f99666b357 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 23:11+0000\n"
+"PO-Revision-Date: 2010-12-08 16:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -959,7 +959,7 @@ msgstr "Fecha y Hora"
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr "Estatus"
+msgstr "Estado"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
@@ -1149,7 +1149,7 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr "Histórico"
+msgstr "Historial"
 
 #. module: survey
 #: help:survey.browse.answer,response_id:0
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 5343ef3c229..31ba2fc92d5 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 1eee546a964..646f1d30f98 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -265,7 +265,7 @@
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1" default="1">
+                        <field name="responsible_id" select="1">
                             <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
@@ -1098,7 +1098,7 @@
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection" select="1"/>
                         <field name="email" select="1"/>
-                        <field name="user_id" select="1" default="1">
+                        <field name="user_id" select="1">
                         <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                     </group>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index 33ba7445f9e..aa1270da751 100644
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index c8979ee3a6f..b3ddba7ecd7 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index 095caeccc5a..ed6479885dc 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -3,20 +3,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index f041e2f2ada..e634a64c7a0 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 2b79e96d42a..57221e180da 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 2ef83d38fcf..0b504a71aed 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -2,20 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index a7e84ce8e06..48c5c863c75 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_ldap/i18n/es.po
@@ -7,40 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: users_ldap
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: users_ldap
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
-
-#. module: users_ldap
-#: field:res.company,ldaps:0
-msgid "LDAP Parameters"
-msgstr "Parámetros LDAP"
-
-#. module: users_ldap
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: users_ldap
 #: view:res.company:0
 msgid "LDAP Configuration"
@@ -61,6 +38,11 @@ msgstr "Crea el usuario si no está en la base de datos."
 msgid "Model used for user creation"
 msgstr "Modelo utilizado para la creación de usuarios."
 
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
 #. module: users_ldap
 #: field:res.company.ldap,company:0
 msgid "Company"
@@ -72,39 +54,9 @@ msgid "LDAP Server address"
 msgstr "Dirección servidor LDAP"
 
 #. module: users_ldap
-#: field:res.company.ldap,ldap_server_port:0
-msgid "LDAP Server port"
-msgstr "Puerto servidor LDAP"
-
-#. module: users_ldap
-#: field:res.company.ldap,ldap_base:0
-msgid "LDAP base"
-msgstr "Base LDAP"
-
-#. module: users_ldap
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: users_ldap
-#: field:res.company.ldap,ldap_password:0
-msgid "LDAP password"
-msgstr "Contraseña LDAP"
-
-#. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company_ldap
-msgid "res.company.ldap"
-msgstr "res.compañía.ldap"
-
-#. module: users_ldap
-#: field:res.company.ldap,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
@@ -112,26 +64,81 @@ msgid "Authenticate users with ldap server"
 msgstr "Autentifica los usuarios con un servidor LDAP"
 
 #. module: users_ldap
-#: field:res.company.ldap,create_user:0
-msgid "Create user"
-msgstr "Crear usuario"
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
 msgstr "Modelo usuario"
 
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
 msgid "res.users"
 msgstr "res.usuarios"
 
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
 msgid "LDAP filter"
 msgstr "Filtro LDAP"
 
 #. module: users_ldap
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML no válido para la estructura de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/users_ldap/i18n/nl.po b/addons/users_ldap/i18n/nl.po
new file mode 100644
index 00000000000..71f0dd70aef
--- /dev/null
+++ b/addons/users_ldap/i18n/nl.po
@@ -0,0 +1,123 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 14:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr ""
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr ""
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
index 26faab339a9..894b7580363 100644
--- a/addons/users_ldap/i18n/pt_BR.po
+++ b/addons/users_ldap/i18n/pt_BR.po
@@ -7,39 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-26 12:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 13:10+0000\n"
+"Last-Translator: Alexsandro Haag <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-27 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: users_ldap
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-"especial!"
-
-#. module: users_ldap
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo precisa ser único !"
-
-#. module: users_ldap
-#: field:res.company,ldaps:0
-msgid "LDAP Parameters"
-msgstr "Parâmetros LDAP"
-
-#. module: users_ldap
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID de certificado do módulo precisa ser único !"
-
 #. module: users_ldap
 #: view:res.company:0
 msgid "LDAP Configuration"
@@ -60,6 +37,11 @@ msgstr "Cria o usuário se não existe na base"
 msgid "Model used for user creation"
 msgstr "Modelo utilizado para criação do usuário"
 
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
 #. module: users_ldap
 #: field:res.company.ldap,company:0
 msgid "Company"
@@ -71,39 +53,9 @@ msgid "LDAP Server address"
 msgstr "Endereço do Servidor LDAP"
 
 #. module: users_ldap
-#: field:res.company.ldap,ldap_server_port:0
-msgid "LDAP Server port"
-msgstr "Porta do Servidor LDAP"
-
-#. module: users_ldap
-#: field:res.company.ldap,ldap_base:0
-msgid "LDAP base"
-msgstr "Base LDAP"
-
-#. module: users_ldap
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
-
-#. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
-#. module: users_ldap
-#: field:res.company.ldap,ldap_password:0
-msgid "LDAP password"
-msgstr "Senha LDAP"
-
-#. module: users_ldap
-#: model:ir.model,name:users_ldap.model_res_company_ldap
-msgid "res.company.ldap"
-msgstr "res.company.ldap"
-
-#. module: users_ldap
-#: field:res.company.ldap,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Voce não pode criar empresas recursivas"
 
 #. module: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
@@ -111,26 +63,80 @@ msgid "Authenticate users with ldap server"
 msgstr "Autenticar usuário com servidor ldap"
 
 #. module: users_ldap
-#: field:res.company.ldap,create_user:0
-msgid "Create user"
-msgstr "Criar usuário"
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porta do Servidor LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Senha LDAP"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parâmetros LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
 msgstr "Usuário Modelo"
 
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
 msgid "res.users"
 msgstr "res.users"
 
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
 msgid "LDAP filter"
 msgstr "Filtro LDAP"
 
 #. module: users_ldap
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo nunca pode ser menor que 1 !"
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Criar usuário"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID de certificado do módulo precisa ser único !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo precisa ser único !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index e58f09f593a..d0b50cf86f7 100644
--- a/addons/warning/i18n/el.po
+++ b/addons/warning/i18n/el.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: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-24 10:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-07 20:46+0000\n"
+"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-25 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -23,12 +23,6 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr ""
 
-#. module: warning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sale Order Line"
@@ -40,8 +34,8 @@ msgid "Message for Purchase Order Line"
 msgstr ""
 
 #. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: warning
@@ -60,21 +54,26 @@ msgstr ""
 msgid "Warning when Purchasing this Product"
 msgstr ""
 
-#. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Προϊόν"
 
 #. module: warning
 #: view:product.product:0
 #: view:res.partner:0
 msgid "Warnings"
-msgstr ""
+msgstr "Προειδοποιήσεις"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Προειδοποίηση"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -101,11 +100,6 @@ msgstr ""
 msgid "No Message"
 msgstr ""
 
-#. module: warning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: warning
 #: model:ir.model,name:warning.model_account_invoice
 #: field:res.partner,invoice_warn:0
@@ -129,8 +123,8 @@ msgid "Sale Order"
 msgstr ""
 
 #. module: warning
-#: field:res.partner,picking_warn:0
-msgid "Stock Picking"
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
 msgstr ""
 
 #. module: warning
@@ -165,8 +159,8 @@ msgid ""
 msgstr ""
 
 #. module: warning
-#: field:res.partner,invoice_warn_msg:0
-msgid "Message for Invoice"
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
 msgstr ""
 
 #. module: warning
@@ -196,13 +190,8 @@ msgid "Warning on the Sale Order"
 msgstr ""
 
 #. module: warning
-#: selection:product.product,purchase_line_warn:0
-#: selection:product.product,sale_line_warn:0
-#: selection:res.partner,invoice_warn:0
-#: selection:res.partner,picking_warn:0
-#: selection:res.partner,purchase_warn:0
-#: selection:res.partner,sale_warn:0
-msgid "Warning"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: warning
@@ -214,8 +203,3 @@ msgstr ""
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
 msgstr ""
-
-#. module: warning
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 4db9773ec2c..70c084778bc 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-23 09:49+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 23:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-24 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -23,14 +23,6 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Línea pedido de compra"
 
-#. module: warning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sale Order Line"
@@ -42,9 +34,9 @@ msgid "Message for Purchase Order Line"
 msgstr "Mensaje para la línea del pedido de compra"
 
 #. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "¡El nombre del módulo debe ser único!"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -62,11 +54,6 @@ msgstr "Línea pedido de venta"
 msgid "Warning when Purchasing this Product"
 msgstr "Aviso cuando compra este producto"
 
-#. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "¡El ID del certificado del módulo debe ser único!"
-
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
@@ -78,6 +65,16 @@ msgstr "Producto"
 msgid "Warnings"
 msgstr "Avisos"
 
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Aviso"
+
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
 #: selection:product.product,sale_line_warn:0
@@ -103,11 +100,6 @@ msgstr "Aviso en la factura"
 msgid "No Message"
 msgstr "Sin mensaje"
 
-#. module: warning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
 #. module: warning
 #: model:ir.model,name:warning.model_account_invoice
 #: field:res.partner,invoice_warn:0
@@ -131,9 +123,9 @@ msgid "Sale Order"
 msgstr "Pedido de venta"
 
 #. module: warning
-#: field:res.partner,picking_warn:0
-msgid "Stock Picking"
-msgstr "Empaquetado de stock"
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Mensaje para factura"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order
@@ -171,9 +163,9 @@ msgstr ""
 "siguiente campo."
 
 #. module: warning
-#: field:res.partner,invoice_warn_msg:0
-msgid "Message for Invoice"
-msgstr "Mensaje para factura"
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "Empaquetado de stock"
 
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
@@ -202,14 +194,9 @@ msgid "Warning on the Sale Order"
 msgstr "Aviso en el pedido de venta"
 
 #. module: warning
-#: selection:product.product,purchase_line_warn:0
-#: selection:product.product,sale_line_warn:0
-#: selection:res.partner,invoice_warn:0
-#: selection:res.partner,picking_warn:0
-#: selection:res.partner,purchase_warn:0
-#: selection:res.partner,sale_warn:0
-msgid "Warning"
-msgstr "Aviso"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -221,7 +208,20 @@ msgstr "Mensaje para empaquetado de stock"
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: warning
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "¡El nombre del módulo debe ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index 127d6f4fe66..8ebd2fc6fab 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/i18n/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-11-27 04:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 12:45+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-28 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -22,14 +22,6 @@ msgstr ""
 msgid "Purchase Order Line"
 msgstr "Linha de Ordem de Compra"
 
-#. module: warning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-"especial !"
-
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sale Order Line"
@@ -41,9 +33,9 @@ msgid "Message for Purchase Order Line"
 msgstr "Mensagem para Linha de Ordem de Compra"
 
 #. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "O nome do módulo deve ser único!"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Não pode criar membros associados recursivamente."
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -61,11 +53,6 @@ msgstr "Linha de Ordem de Venda"
 msgid "Warning when Purchasing this Product"
 msgstr "Atenção quando Adquerir este Produto"
 
-#. module: warning
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "O ID do certificado do módulo tem de ser único!"
-
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
@@ -77,6 +64,16 @@ msgstr "Produto"
 msgid "Warnings"
 msgstr "Avisos"
 
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "Aviso"
+
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
 #: selection:product.product,sale_line_warn:0
@@ -102,11 +99,6 @@ msgstr "Aviso sobre a Factura"
 msgid "No Message"
 msgstr "Sem Mensagem"
 
-#. module: warning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML Inválido para a Arquitectura de Vista!"
-
 #. module: warning
 #: model:ir.model,name:warning.model_account_invoice
 #: field:res.partner,invoice_warn:0
@@ -130,9 +122,9 @@ msgid "Sale Order"
 msgstr "Ordem de Venda"
 
 #. module: warning
-#: field:res.partner,picking_warn:0
-msgid "Stock Picking"
-msgstr "Recolha de Stock"
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "Mensagem para Factura"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order
@@ -169,9 +161,9 @@ msgstr ""
 "blqueio de fluxo. A mensagem tem de ser escrita no próximo campo."
 
 #. module: warning
-#: field:res.partner,invoice_warn_msg:0
-msgid "Message for Invoice"
-msgstr "Mensagem para Factura"
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "Recolha de Stock"
 
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
@@ -200,14 +192,9 @@ msgid "Warning on the Sale Order"
 msgstr "Aviso na Ordem de Venda"
 
 #. module: warning
-#: selection:product.product,purchase_line_warn:0
-#: selection:product.product,sale_line_warn:0
-#: selection:res.partner,invoice_warn:0
-#: selection:res.partner,picking_warn:0
-#: selection:res.partner,purchase_warn:0
-#: selection:res.partner,sale_warn:0
-msgid "Warning"
-msgstr "Aviso"
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN inválido"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -219,7 +206,20 @@ msgstr "Mensagem para Recolha de Stock"
 msgid "Partner"
 msgstr "Terceiro"
 
-#. module: warning
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "O tamanho do campo não pode ser inferior a 1 !"
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista!"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial !"
diff --git a/addons/wiki/i18n/pt_BR.po b/addons/wiki/i18n/pt_BR.po
index 5f50ca89b56..5d820ef9887 100644
--- a/addons/wiki/i18n/pt_BR.po
+++ b/addons/wiki/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: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 19:23+0000\n"
+"PO-Revision-Date: 2010-12-09 01:52+0000\n"
 "Last-Translator: Nédio Batista Marques <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -30,7 +30,7 @@ msgstr "Páginas do Wiki"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Forma de exibição"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -57,7 +57,7 @@ msgstr "Seção"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Indica se estas páginas têm uma tabela de conteúdo ou não"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -68,7 +68,7 @@ msgstr "Histórico do Wiki"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "Edição simples"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -79,18 +79,18 @@ msgstr "Conteúdo"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Páginas Secundárias"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Páginas Principais"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Último contribuidor(a)"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "Menu Superior(pai)"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Topico/Tema, também chamado de Grupo Wiki"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,7 +117,7 @@ msgstr "Título"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Assistente Para Criar Menu"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -159,7 +159,7 @@ msgstr "Descrição"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Necessita de revisão"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,6 +167,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Indica que esta página deve ser revista, aumentando a atenção dos outros "
+"participantes"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -182,7 +184,7 @@ msgstr "Página do Histórico"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Visão em árvore"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -192,7 +194,7 @@ msgstr "Modelo de Página"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Palavras-chave"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:0
@@ -203,7 +205,7 @@ msgstr "Atenção"
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "Obrigatório selecionar home page se o método de exibição é Home Page"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
@@ -240,7 +242,7 @@ msgstr "Use o código de seção da página como 1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Quer abrir uma página wiki? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -255,7 +257,7 @@ msgstr "Área de texto"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "Meta informações"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -271,7 +273,7 @@ msgstr "Observações"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "Listar"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -297,17 +299,17 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "Define o comportamento padrão do menu criado neste grupo"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
 msgid "wizard.wiki.history.show_diff"
-msgstr ""
+msgstr "assistente wiki demonstrador de diferença de histórico"
 
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
@@ -318,17 +320,17 @@ msgstr "Identificação da Wiki"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "Página Inicial"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Permite voçê linkar com a outra página com o mesmo tópico"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Modificação de Informação"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -359,11 +361,12 @@ msgstr "Criar Index"
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
 msgstr ""
+"Você precisa selecionar no mínimo 1 ou no máximo 2 revisões de histórico!"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar Por..."
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -373,6 +376,11 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Páginas Wiki permitem que você compartilhe suas idéias e dúvidas com seus "
+"colegas de trabalho. Você pode criar um novo documento que pode ser link "
+"para uma ou várias aplicações (CRM, Vendas, etc.) Você pode usar palavras-"
+"chave para facilitar o acesso às suas páginas wiki. Há uma edição wiki "
+"básica para o formato texto."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -385,7 +393,7 @@ msgstr "Criar Menu"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "Esta é uma edição Avançada ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -399,7 +407,7 @@ msgstr "Grupos de Wiki"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "Tópico"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -417,12 +425,12 @@ msgstr "Tabela de Conteúdos"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Abrir página Wiki"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "abrir página do assistente"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -444,12 +452,12 @@ msgstr "Revisão da Necessidade"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Páginas aguardando revisões"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "Página de Pesquisa"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/wiki_faq/i18n/el.po b/addons/wiki_faq/i18n/el.po
new file mode 100644
index 00000000000..57545a857da
--- /dev/null
+++ b/addons/wiki_faq/i18n/el.po
@@ -0,0 +1,27 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-08 17:49+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Αυτό το άρθρωμα παρέχει πρότυπο  Συχνών Ερωτήσεων WIKI\n"
+"    "
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index 0e74b15329b..b38bd94cda9 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -6,22 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
-"PO-Revision-Date: 2010-12-01 09:46+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-06 16:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: wiki_sale_faq
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
 msgid ""
@@ -33,36 +28,20 @@ msgid ""
 msgstr ""
 
 #. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
 msgid "Documents"
 msgstr "Dokumente"
 
 #. module: wiki_sale_faq
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#. module: wiki_sale_faq
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
-
-#. module: wiki_sale_faq
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wiki Seiten"
 
 #. module: wiki_sale_faq
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
 msgid "FAQ"
-msgstr "Häufig gestellte Fragen"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki Seiten"
+msgstr "Häufige Fragen"
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,description:wiki_sale_faq.module_meta_information
@@ -91,24 +70,30 @@ msgstr ""
 "Partner und indiziert hierzu ausserdem Inhalte für die Dokument Formate "
 ".DOC, .ODT, .TXT, .SXW and .PDF."
 
-#. module: wiki_sale_faq
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-"Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-"haben"
-
-#. module: wiki_sale_faq
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
-
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
 msgid "Wiki -Sale - FAQ"
 msgstr "Wiki -Verkauf - F&A"
 
-#. module: wiki_sale_faq
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Das Verzeichnis muss eindeutig sein"
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Directory must have a parent or a storage"
+#~ msgstr ""
+#~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
+#~ "haben"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The directory name must be unique !"
+#~ msgstr "Das Verzeichnis muss eindeutig sein"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/wiki_sale_faq/i18n/pt.po b/addons/wiki_sale_faq/i18n/pt.po
index 6f3e6471843..f6a6008544b 100644
--- a/addons/wiki_sale_faq/i18n/pt.po
+++ b/addons/wiki_sale_faq/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-06 12:50+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <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: 2010-12-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-09 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -68,6 +68,12 @@ msgid ""
 "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
 ".PDF documents."
 msgstr ""
+"Os documentos dão-lhe acesso a todos os ficheiros associados a um qualquer "
+"registo. Trata-se de um repositório de documentos como, por exemplo, emails, "
+"PDF's, etc. A partir deste ecrã, pode-se fazer pesquisas no conteúdo dos "
+"próprios documentos. O OpenERP gera automaticamente meta-dados com base na "
+"informação do registo ao qual se pretende associar um documento e ainda "
+"indexa ficheiros dos seguintes tipos: DOC, TXT, SXW e PDF."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information