diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index b3fc6fc6a58..0e4d26915e6 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-14 09:09+0000\n"
+"PO-Revision-Date: 2010-02-18 09:24+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1599,7 +1599,7 @@ msgstr "Devise société"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr "Mapping du Compte Modèle de la Position Fiscale"
+msgstr "Affectation des comptes suivant le modèle de régime fiscal"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1657,7 +1657,7 @@ msgstr "Transaction non-lettrée"
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "Mapping des taxes"
+msgstr "Affectation des taxes"
 
 #. module: account
 #: view:account.config.wizard:0
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 94f21ef277a..c51ecc45b32 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-16 18:36+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
+"PO-Revision-Date: 2010-02-20 16:07+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <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-01-17 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -45,7 +45,7 @@ msgstr "Podaj wiadomość dla raportu o przeterminowanych należnościach."
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Zatwierdź projekt zestawienia"
+msgstr "Zatwierdź projekt wyciągu"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -60,7 +60,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Waluta zastosowana do wprowadzenia zestawienia"
+msgstr "Waluta zastosowana do wprowadzenia wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -334,7 +334,7 @@ msgstr "Odnośnik"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Oblicz subskrypcję"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -344,7 +344,7 @@ msgstr "Nr konta"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Przyrost Winien"
 
 #. module: account
 #: rml:account.invoice:0
@@ -466,7 +466,7 @@ msgstr "Specjalne Obliczenie"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Potwierdź projekt zestawienia z lub bez uzgodnienia"
+msgstr "Potwierdź projekt wyciągu z lub bez uzgodnienia"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
@@ -910,7 +910,7 @@ msgstr "Dziennik odpisów"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Waluta kwoty"
+msgstr "Kwota w walucie"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -981,7 +981,7 @@ msgstr "Domyślne konto Winien"
 #: 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 "Zapisy wg zestawień"
+msgstr "Zapisy wg wyciągów"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1471,7 +1471,7 @@ msgstr "Wyświetl konta "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "Pozycja uzgodnienia zestawienia"
+msgstr "Pozycja uzgodnienia wyciągu"
 
 #. module: account
 #: view:account.tax:0
@@ -1631,7 +1631,7 @@ msgstr "Konta należności i zobowiązań"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Pozycje subskrypcji"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1750,13 +1750,13 @@ msgstr "Włącz do kwoty bazowej"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Przyrost Ma"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Skasuj uzgodnienie zapisów"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1772,7 +1772,7 @@ msgstr "Rejestr kosztów dla okresu"
 #: 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 "Nowe zestawienie"
+msgstr "Nowy wyciąg"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1936,7 +1936,7 @@ msgstr "Projekty faktur dla klienta"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Pozycja konta subskrypcji"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -2154,7 +2154,7 @@ msgstr "Uzgodnienie płatności"
 #: 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 "Uzgodnienie zestawienia"
+msgstr "Uzgodnienie wyciagów"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -2187,7 +2187,7 @@ msgstr "Schemat podatków"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -2270,7 +2270,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Utwórz zapisy subskrypcji"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
@@ -2321,7 +2321,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Konto podstawy do deklaracji podatkowej"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2352,7 +2352,7 @@ msgstr "Typ odnośnika"
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account
 #: field:account.tax,type:0
@@ -2363,7 +2363,7 @@ msgstr "Typ podatku"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "Zapisy zestawienia"
+msgstr "Zapisy wyciągu"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2627,7 +2627,7 @@ msgstr "Konto zobowiązań"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "Importuj faktury do zestawienia"
+msgstr "Importuj faktury do wyciągu"
 
 #. module: account
 #: view:account.invoice:0
@@ -2673,7 +2673,7 @@ msgstr "Kapitał własny"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Komunikat przeterminowanej płatności"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2703,7 +2703,7 @@ msgstr "Zamykanie roku"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Ogólne raporty"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
@@ -2808,12 +2808,12 @@ msgstr "Nazwa"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr ""
+msgstr "Transakcje uzgodnień"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Kierunek analizy"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
@@ -2928,7 +2928,7 @@ msgstr "Konto Podatkowe"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Z zestawienia, utwórz zapisy"
+msgstr "Z wyciągu, utwórz zapisy"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -2981,7 +2981,7 @@ msgstr "Mapowanie podatków"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transakcje kasowania uzgodnień"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -3029,7 +3029,7 @@ msgstr "Dziennik analityczny -"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr ""
+msgstr "Winien - analityka"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -3268,7 +3268,7 @@ msgstr "Kurs średni"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr ""
+msgstr "Wprowadzenie wyciągu generuje zapisy płatności"
 
 #. module: account
 #: field:account.account,code:0
@@ -3342,7 +3342,7 @@ msgstr "30 dni od końca miesiąca"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Główny kod podatkowy"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3543,7 +3543,7 @@ msgstr "Zapłać i uzgodnij"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Dziennik główny"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3709,7 +3709,7 @@ msgstr "Wprowadzanie zapisów"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3754,7 +3754,7 @@ msgstr "Miesiąc"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Konto subskrypcji"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -3766,7 +3766,7 @@ msgstr "Data zapłaty"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Zapis subskrypcji"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3815,7 +3815,7 @@ msgstr "Data faktury"
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Skasowano uzgodnienie"
 
 #. module: account
 #: field:account.account,note:0
@@ -3880,7 +3880,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Komunikat raportu przeterminowanych płatności"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3966,6 +3966,9 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Podaje typ dziennika analitycznego. Kiedy dokument (np. faktura) ma utworzyć "
+"zapisy analityczne, to OpenERP będzie szukał odpowiedniego dziennika tego "
+"samego typu."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3975,7 +3978,7 @@ msgstr "Grupy"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Kod/Data"
 
 #. module: account
 #: field:account.account,active:0
@@ -4084,7 +4087,7 @@ msgstr "Zmiana stanu konta"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Pozycje zestawienia"
+msgstr "Pozycje wyciągu"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4160,7 +4163,7 @@ msgstr "Ogólne"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Trans. Ma"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4228,7 +4231,7 @@ msgstr "Szukaj zapisów"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..."
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4276,7 +4279,7 @@ msgstr ""
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -4397,7 +4400,7 @@ msgstr ""
 #: 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"
-msgstr ""
+msgstr "Działające subskrypcje"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4413,7 +4416,7 @@ msgstr "Zaksięgowano"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4587,7 +4590,7 @@ msgstr "Ważna zapisy"
 #: 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 "Utwórz zapisu z modeli"
+msgstr "Utwórz zapisy z modeli"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4642,7 +4645,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "Zestawienie"
+msgstr "Wyciąg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4719,7 +4722,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Projekt zestawienia"
+msgstr "Projekt wyciągu"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -4729,7 +4732,7 @@ msgstr "Nazwa dziennika"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr "Importuj fakturę z zestawienia"
+msgstr "Importuj fakturę z wyciągu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4825,7 +4828,7 @@ msgstr "Anulowano"
 #: 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 "Projekty zestawień"
+msgstr "Projekty wyciągów"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4852,7 +4855,7 @@ msgstr "Konta należności"
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr ""
+msgstr "Otwórz do kasowania uzgodnień"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
@@ -5082,7 +5085,7 @@ msgstr "Grupuj pozycje faktury"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr "Ustawienia"
+msgstr "Konfiguracja"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5098,7 +5101,7 @@ msgstr "Dziennik kont"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "pozycje subskrypcji"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5204,7 +5207,7 @@ msgstr "Szablon kodu konta podatkowego"
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr ""
+msgstr "Okresy subskrypcji"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5265,7 +5268,7 @@ msgstr "Podatek zamienny"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr "Ręcznie wprowadzone zestawienie jest projektem"
+msgstr "Ręcznie wprowadzony wyciąg jest projektem wyciągu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
@@ -5292,7 +5295,7 @@ msgstr "Płatności"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr "Zapisy księgowe przy potwierdzeniu zestawienia"
+msgstr "Zapisy księgowe przy potwierdzeniu wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5474,7 +5477,7 @@ msgstr "Zastosowanie podatku"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Zapisy subskrypcji"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5995,12 +5998,12 @@ msgstr "Obszary podatkowe"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Proces wyciągu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr ""
+msgstr "Uzgodnienia wyciągu"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index f37e09831bb..0b03cdeb1cc 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-14 10:44+0000\n"
-"Last-Translator: Carlos Paiva <Unknown>\n"
+"PO-Revision-Date: 2010-02-21 23:52+0000\n"
+"Last-Translator: Holverat Bortolossi <holverat@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-01-15 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -313,7 +313,7 @@ msgstr "Pagamentos atrasados"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "Periodo selecionado"
+msgstr "Selecione o período"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -1011,7 +1011,7 @@ msgstr "Período"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr "Grande total"
+msgstr "Total geral"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index f87507a75db..c1fa0fe36bc 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 09:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:28+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <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: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,12 +21,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "Domyślne ustawienia analityczne"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr ""
+msgstr "Domyślne ustawienia konta analitycznego"
 
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
@@ -84,7 +84,7 @@ msgstr "Użytkownik"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -111,4 +111,4 @@ msgstr "Warunki"
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "Reguły analityczne"
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
new file mode 100644
index 00000000000..9b7d1b3f53b
--- /dev/null
+++ b/addons/account_chart/i18n/nb.po
@@ -0,0 +1,23 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-21 07:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Fjern minimal konto diagram"
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index fb88848c6b7..5ea542a2016 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 15:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-21 07:34+0000\n"
+"Last-Translator: Kristian <kimocoder> Bremvaag <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: 2009-12-16 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Ta bort minimal konto diagram"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 1289b44a0cd..07028680a78 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -227,12 +227,14 @@ class crm_case(osv.osv):
             string='Latest E-Mail', type='text'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
-        'date': fields.datetime('Date'),
-        'create_date': fields.datetime('Created' ,readonly=True),
-        'date_deadline': fields.datetime('Deadline'),
+        'create_date': fields.datetime('Creation Date' ,readonly=True),
+        'write_date': fields.datetime('Update Date' ,readonly=True),
+        'partner_phone': fields.char('Phone', size=32),
+        'date_deadline': fields.date('Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"),
         'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
@@ -274,7 +276,6 @@ class crm_case(osv.osv):
         'partner_address_id': _get_default_partner_address,
         'email_from': _get_default_email,
         'state': lambda *a: 'draft',
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'),
         'section_id': _get_section,
     }
@@ -430,6 +431,7 @@ class crm_case(osv.osv):
         if not part:
             return {'value':{'partner_address_id': False, 
                             'email_from': False,
+                            'partner_phone': False,
                             'partner_name2': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -442,6 +444,7 @@ class crm_case(osv.osv):
             return {'value': {'email_from': False, 'partner_name2': False}}
         address= self.pool.get('res.partner.address').browse(cr, uid, add)
         data['email_from'] = address.email
+        data['partner_phone'] = address.phone or ''
         data['partner_name2'] = address.name or ''
         return {'value': data}
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 74dc267439a..f6197d14ab4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -31,29 +31,29 @@ class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "id desc"
-    _inherit = 'crm.case'    
+    _inherit = 'crm.case'
     _columns = {
-            'name': fields.char('Lead Subject', size=64),
-            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-            'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-            'partner_name': fields.char("Lead Name", size=64),
-            'partner_name2': fields.char('Email', size=64),
-            'partner_phone': fields.char('Phone', size=32),
-            'partner_mobile': fields.char('Mobile', size=32),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-            'probability': fields.float('Probability (%)'),
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                            " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-            'planned_revenue': fields.float('Planned Revenue'),
-            'planned_cost': fields.float('Planned Costs'),
-            'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-            'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+         'name': fields.char('Lead Subject', size=64),
+         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+         'partner_name': fields.char("Lead Name", size=64),
+         'partner_name2': fields.char('Contact', size=64),
+         'partner_phone': fields.char('Phone', size=32),
+         'partner_mobile': fields.char('Mobile', size=32),
+         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+         'probability': fields.float('Probability (%)'),
+         'date_closed': fields.datetime('Closed', readonly=True),
+         'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+         'planned_revenue': fields.float('Planned Revenue'),
+         'planned_cost': fields.float('Planned Costs'),
+         'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+         'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                    "the partner mentality in relation to our services.The scale has" \
+                                                                    "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+         'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
     }
 
 crm_lead()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 03c51064bd7..288ee84196b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -4,18 +4,19 @@
 
 
 
-        # ------------------------------------------------------
-        # Stage
-        # ------------------------------------------------------
-        <record id="crm_lead_stage_act" model="ir.actions.act_window">
-            <field name="name">Lead Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-            <field name="context">{'object_id':'crm.lead'}</field>
-        </record>
-      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
+    # ------------------------------------------------------
+    # Stage
+    # ------------------------------------------------------
+    <record id="crm_lead_stage_act" model="ir.actions.act_window">
+        <field name="name">Lead Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+        <field name="context">{'object_id':'crm.lead'}</field>
+    </record>
+    <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
+
     # ------------------------------------------------------
     # Leads
     # ------------------------------------------------------
@@ -26,102 +27,113 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
+                <group colspan="4" col="7">
+                    <field name="partner_name" string="Lead Name" required="1"/>
+                    <field name="partner_name2"/>
+                    <field name="user_id"/>
+                    <button
+                        string="Convert to Opportunity" 
+                        name="%(wizard_crm_lead_opportunity_set)d" 
+                        icon="gtk-index" 
+                        type="action"/>
+                    <field name="name"/>
+                    <field name="email_from"/>
+                    <field name="partner_phone"/>
+                    <button string="Convert to Partner"
+                                icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                            />
+                </group>
+                <notebook colspan="4">
+                <page string="Leads">
+                    <separator colspan="4" string="Communication"/>
+                    <field name="partner_id" string="Partner"
+                        on_change="onchange_partner_id(partner_id)" />
+                    <field name="partner_address_id"
+                        string="Contact"
+                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                    <field name="partner_phone"/>
+                    <field name="partner_mobile"/>
+                    <separator colspan="4" string="Status and Categorization"/>
                     <group colspan="4" col="6">
-                        <field name="partner_name" string="Lead Name" required="1"/>
-                        <field name="name" string="Lead Subject"/>
-                        <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
-                        <field name="partner_name2" string="Contact Name"/>
-                        <field name="email_from" string="Email"/>
-                        <button string="Convert to Partner"
-                                    icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                                    type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                                />
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                        <field name="categ_id"
+                            on_change="onchange_categ_id(categ_id)"
+                            string="Lead Source" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                        <field name="type_id" string="Campaign" select="1"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="priority" string="Priority"/>
+                        <field name="create_date"/>
                     </group>
-                    <notebook colspan="4">
-                    <page string="Leads">
-                        <separator colspan="4" string="Communication"/>
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="partner_address_id"
-                            string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)" />
-                        <field name="partner_phone"/>
-                        <field name="partner_mobile"/>
-                        <separator colspan="4" string="Status and Categorization"/>
-                        <group colspan="4" col="6">
-                            <field name="user_id" select="2"/>
-                            <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                            <field name="categ_id" select="1"
-                                on_change="onchange_categ_id(categ_id)"
-                                string="Lead Source" widget="selection"
-                                domain="[('object_id.model', '=', 'crm.opportunity')]" />
-                            <field name="type_id" string="Campaign" select="1"/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                            <field name="priority" string="Priority"/>
-                            <field name="date" string="Create Date"/>
-                        </group>
-                        <separator colspan="4" string="Details"/>
-                        <field name="description" nolabel="1" colspan="4"/>
-                        <separator colspan="4"/>
-                        <group col="8" colspan="4">
-                            <field name="state" select="2"/>
-                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-jump-to"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                            <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
-                        </group>
-                     </page>
-                     <page string="Emails" groups="base.group_extended">
-                       <group colspan="4">
-                           <field colspan="4" name="email_cc" string="CC"/>
-                       </group>
-                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                            <form string="Communication history">
-                                <group col="7" colspan="4">
-                                    <field name="date"/>
-                                    <field name="email"/>
-                                    <field name="canal_id"/>
-                                    <button
-                                       string="Add a CC"
-                                        name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                        icon="gtk-add" type="action"/>
-                                </group>
-                                <newline/>
-                                <field name="description" colspan="4" nolabel="1"/>
-                                <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
-                            </form>
-                            <tree string="Communication history">
-                                <field name="description"/>
-                                <field name="email"/>
+                    <separator colspan="4" string="Details"/>
+                    <field name="description" nolabel="1" colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="2"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-jump-to"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                    </group>
+                 </page>
+                 <page string="Emails" groups="base.group_extended">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
-                            </tree>
-                        </field>
-                        <button colspan="4" string="Send New Email"
-                            name="%(crm.wizard_crm_new_send_mail)d"
-                            context="{'mail':'new'}" icon="gtk-go-forward"
-                            type="action" />
-                     </page>
-                    </notebook>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                                <button
+                                   string="Add a CC"
+                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                    icon="gtk-add" type="action"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email"
+                        name="%(crm.wizard_crm_new_send_mail)d"
+                        context="{'mail':'new'}" icon="gtk-go-forward"
+                        type="action" />
+                 </page>
+                </notebook>
             </form>
         </field>
     </record>
+
     <record model="ir.ui.view" id="crm_case_tree_view_leads">
         <field name="name">CRM - Leads Tree</field>
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
-                <field name="partner_name" string="Lead Name"/>
+            <tree string="Leads Tree"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+                <field name="create_date"/>
+                <field name="partner_name"/>
+                <field name="partner_name2"/>
+                <field name="email_from"/>
+                <field name="partner_phone"/>
+
                 <field name="stage_id" string="Status"/>
-                <field name="date" string="Create Date"/>
-                <field name="categ_id" string="Lead Source"/>
-                <field name="email_from" string="Email"/>
+                <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
+                <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-jump-to"/>
+                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" states="draft,open,pending" icon="gtk-index" type="action"/>
                 <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>
@@ -133,7 +145,7 @@
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meeting For Leads Generation" date_start="date" color="user_id" date_delay="duration">
+            <calendar string="Meeting For Leads Generation" date_start="create_date" color="user_id" date_delay="duration">
                 <field name="name"/>
                 <field name="partner_name"/>
                 <field name="partner_name2"/>
@@ -148,46 +160,43 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <group colspan="4">
-                   <group col="3" colspan="1">
-                    <filter icon="gtk-home" string="   Today   "
-                        separator="1"
-                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                        help="Todays's Leads"
+                <filter icon="gtk-home" string="Today"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                    help="Todays' Opportunities"
+                />
+                <filter icon="gtk-media-rewind" string="7 Days"
+                    help="Opportunities during last 7 days"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                />
+                <separator orientation="vertical"/>
+                <field name="name" string="Opportunity"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=',uid)]"
+                        help="My Opportunities" default="1"
                     />
-                    <filter icon="gtk-media-rewind" string="    7 Days    "
-                        separator="1" help="Leads during last 7 days"
-                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                    />
-                   </group>
-                    <separator orientation="vertical"/>
-                   <group col="6" colspan="2">
-                       <field name="name" select="1"/>
-                       <field name="user_id" select="1" widget="selection">
-                               <filter icon="terp-partner"
-                                   domain="[('user_id','=',uid)]" help="My Leads"
-                                   default="1"
-                               />
-                       </field>
-                       <field name="state" select="1">
-                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
-                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
-                       </field>
-                        <field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
-                             <filter icon="terp-crm"
-                                   domain="[('section_id','=',context.get('section_id',False))]"
-                                   help="My section"
-                               />
-                        </field>
-                   </group>
-                </group>
+                </field>
+                <field name="partner_id"/>
+                <field name="state">
+                    <filter icon="gtk-media-rewind"
+                        string="New and open opportunities"
+                        default="1"
+                        domain="[('state','in',('draft','open'))]"/>
+                </field>
+                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section"/>
+                </field>
                 <newline/>
-               <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
-                        <filter string="Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
-                        <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
-                 </group>
+                <group expand="1" string="Group By..." colspan="4">
+                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                    <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Exp.Closing" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
+                </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 9a90eb8ccd7..fc654554fcc 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -22,29 +22,34 @@
 from osv import fields,osv,orm
 import crm
 
+AVAILABLE_STATES = [
+    ('draft','New'),
+    ('open','Open'),
+    ('cancel', 'Lost'),
+    ('done', 'Won'),
+    ('pending','Pending')
+]
+
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
     _order = "id desc"
-    _inherit = 'crm.case'  
-    _columns = {        
+    _inherit = 'crm.case'
+    _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Resource Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'probability': fields.float('Probability (%)'),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                   "the partner mentality in relation to our services.The scale has" \
-                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'planned_revenue': fields.float('Expected Revenue'),
         'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
-        'partner_phone': fields.char('Phone', size=32),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \nWhen the case is over, the state is set to \'Done\'.\
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
     }
 
 crm_opportunity()
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index a9cae6bc916..2fb8658eb69 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -5,7 +5,7 @@
 	 
 	 <act_window
             id="act_crm_opportunity_crm_meeting_new"
-            name="Meeting Cases"
+            name="Meetings"
             res_model="crm.meeting"
             src_model="crm.opportunity"
             view_mode="calendar,graph"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 80618891a29..8f9dcd75a79 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Opportunity Categories
     # ------------------------------------------------------
 
@@ -11,22 +11,22 @@
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
         <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-		<field name="context">{'object_id':'crm.opportunity'}</field>
+        <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
+        <field name="context">{'object_id':'crm.opportunity'}</field>
     </record>
      <menuitem action="crm_opportunity_categ_action" id="menu_crm_case_opportunity-act" parent="crm.menu_crm_case_categ"/>
-		# ------------------------------------------------------
-	    # Stage
-	    # ------------------------------------------------------
-	    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
-	        <field name="name">Opportunity Stages</field>
-	        <field name="res_model">crm.case.stage</field>
-	        <field name="view_type">form</field>
- 			<field name="view_id" ref="crm.crm_case_stage_tree"/>
-			<field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-			 <field name="context">{'object_id':'crm.opportunity'}</field>
-	    </record>
-	  <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
+        # ------------------------------------------------------
+        # Stage
+        # ------------------------------------------------------
+        <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
+            <field name="name">Opportunity Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+             <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
+             <field name="context">{'object_id':'crm.opportunity'}</field>
+        </record>
+      <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Opportunities
     # ------------------------------------------------------
@@ -34,75 +34,69 @@
 
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
-        <field name="name">CRM - Opportunities Form</field>
+        <field name="name">Opportunities</field>
         <field name="model">crm.opportunity</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
-                <group colspan="4" col="4">                    
-                    <field name="name" select="1" string="Opportunity" colspan="4"/>
-                    <field name="planned_revenue" required="1"/>
-                    <field name="planned_cost"/>
-                    <field name="probability"/>
-                    <field name="date_deadline" string="Expected Close Date" required="1"/>
-                    <group colspan="4" col="5">
-                    <label string="" colspan="2"/>
+                <group colspan="4" col="7">
+                    <field name="name" string="Opportunity"/>
+                    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                    <field name="user_id"/>
                     <button string="Schedule Meeting"
                         name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                    <field name="planned_revenue"/>
+                    <field name="probability"/>
+                    <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
                         name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
                 </group>
-                </group>
-                
-                <group colspan="4" col="4">
-                <notebook>
+                <notebook colspan="4">
                 <page string="Opportunity">
-                    <separator colspan="4" string="Communication"/>                    
-                    <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from" colspan="2" string="Email"/>
-                    <field name="partner_phone" colspan="2"/>
-
-                    <separator colspan="4" string="Status and Categorization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" select="2" string="Responsible"/>                        
-                        <field name="stage_id" select="1" string="Sales Stage" required="1" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>                        
-                        <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Contacts"/>
+                        <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                        <field name="email_from" string="Email"/>
+                        <field name="partner_phone"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Categorization"/>
                         <field name="type_id" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
-                        <field name="date" string="Create Date"/>
+                        <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
                     </group>
-                    
-                    
-                    
+
                     <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
                         <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                         <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                        <button name="case_close" string="Mark Won" states="open,draft,pending" type="object" icon="gtk-close"/>
+                        <button name="case_cancel" string="Mark Lost" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                        <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
 
                 <page string="History" groups="base.group_extended">
-                    <field name="active"/>
-                    <field name="canal_id"/>
-                    <field name="som"/>
-
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
+                    <group col="2" colspan="2">
+                        <separator string="Dates" colspan="2"/>
+                        <field name="create_date"/>
+                        <field name="write_date"/>
+                        <field name="date_closed"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Misc" colspan="2"/>
+                        <field name="active"/>
+                    </group>
                     <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-
+                    <field name="ref"/>
+                    <field name="ref2"/>
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -125,9 +119,9 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-								   string="Add a CC"
-								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-								    icon="gtk-add" type="action"/>
+                                   string="Add a CC"
+                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
@@ -142,30 +136,30 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
-                </group>
             </form>
         </field>
     </record>
     <record model="ir.ui.view" id="crm_case_tree_view_oppor">
-        <field name="name">CRM - Opportunities Tree</field>
+        <field name="name">Opportunities Tree</field>
         <field name="model">crm.opportunity</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Opportunities Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id"/>
-                <field name="name" string="Opportunities"/>
-                <field name="stage_id"  string="Sales Stage"/>
-                <field name="partner_id" string="Partner"/>
+            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel','done')">
+                <field name="create_date"/>
+                <field name="name" string="Opportunity"/>
+                <field name="partner_id"/>
+                <field name="stage_id"/>
+                <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
+                <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                <field name="probability" avg="Avg. of Probability"/>
-                <field name="date" string="Create Date"/>
-                <field name="date_deadline" string="Excepted Close Date"/>
+                <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                <field name="date_deadline" string="Excepted Closing"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_close" string="Won" states="open,draft,pending" type="object" icon="gtk-close"/>
+                <button name="case_pending" string="Pending" states="open,draft" type="object" icon="gtk-media-pause"/>
+                <button name="case_cancel" string="Lost" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
@@ -188,45 +182,42 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-                <group colspan="4">
-               		<group col="3" colspan="1">
-                        <filter icon="gtk-home" string="   Today   "
-                        	separator="1"
-                        	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                        	help="Todays's Opportunities"
-                        />
-                        <filter icon="gtk-media-rewind" string="    7 Days    "
-                        	separator="1" help="Opportunities during last 7 days"
-                        	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
-               		</group>
-                    <separator orientation="vertical"/>
-                   <group col="6" colspan="2">
-                       <field name="name" select="1" string="Opportunity"/>
-                       <field name="user_id" select="1" widget="selection">
-                       	<filter icon="terp-partner"
-                       		domain="[('user_id','=',uid)]"
-                       		help="My Opportunities" default="1"
-                       	/>
-                       </field>
-                       <field name="partner_id" select="1"/>
-                       <field name="state" select="1">
-                           <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
-                       </field>
-				        <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-					        <filter icon="terp-crm"
-                                   domain="[('section_id','=',context.get('section_id',False))]"
-                                   help="My section"/>
-		           		</field>
-                   </group>
-                </group>
+                <filter icon="gtk-home" string="Today"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                    help="Todays' Opportunities"
+                />
+                <filter icon="gtk-media-rewind" string="7 Days"
+                    help="Opportunities during last 7 days"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                />
+                <separator orientation="vertical"/>
+                <field name="name" string="Opportunity"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=',uid)]"
+                        help="My Opportunities" default="1"
+                    />
+                </field>
+                <field name="partner_id"/>
+                <field name="state">
+                    <filter icon="gtk-media-rewind"
+                        string="New and open opportunities"
+                        default="1"
+                        domain="[('state','in',('draft','open'))]"/>
+                </field>
+                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section"/>
+                </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="4">
-                        <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
-                        <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
-                        <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
-                        
+                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                    <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Exp.Closing" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 1c3bf015489..223bb90db82 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -31,18 +31,14 @@ class crm_phonecall(osv.osv):
         'duration': fields.float('Duration'),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"),
         'partner_phone': fields.char('Phone', size=32),
+        'partner_contact': fields.related('partner_address_id', 'name', type="char", string="Contact", size=128),
         'partner_mobile': fields.char('Mobile', size=32),
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                   "the partner mentality in relation to our services.The scale has" \
-                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
                                                                 " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'probability': fields.float('Probability (%)'),
-        'planned_revenue': fields.float('Planned Revenue'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),        
+        'date': fields.datetime('Date'),
+        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
-    
 crm_phonecall()
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index e3d001583f0..07dfb5b89e7 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -50,6 +50,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+        <field name="context">{'set_editable':True}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index aca018fc7d7..bb5187f7a03 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -11,23 +11,11 @@
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-		<field name="context">{'object_id':'crm.phonecall'}</field>
+        <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
+        <field name="context">{'object_id':'crm.phonecall'}</field>
     </record>
 
    <menuitem action="crm_phonecall_categ_action" id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ"/>
-    # ------------------------------------------------------
-    # Phonecall Stage
-    # ------------------------------------------------------
-	    <record id="crm_phonecall_stage_act" model="ir.actions.act_window">
-	        <field name="name">Phonecall Stages</field>
-	        <field name="res_model">crm.case.stage</field>
-	        <field name="view_type">form</field>
- 			<field name="view_id" ref="crm.crm_case_stage_tree"/>
-			<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-			<field name="context">{'object_id':'crm.phonecall'}</field>
-	    </record>
-	  <menuitem action="crm_phonecall_stage_act" id="menu_crm_phonecall_stage_act" parent="crm.menu_crm_case_stage"/>
 
     # ------------------------------------------------------
     # Phone Calls
@@ -39,37 +27,26 @@
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
                 <field name="date" string="Date"/>
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
-                <field name="partner_address_id" string="Contact"/>
-                <field name="opportunity_id"/>
+                <field name="partner_contact"/>
+                <field name="partner_phone"/>
+                <field name="partner_mobile"/>
+                <field name="user_id"/>
                 <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    name="%(wizard_crm_phonecall_opportunity_set)d"
+                    states="draft,open,pending"
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
+                    states="draft,open,pending"
                     name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="crm_case_phone_incomming_tree_view">
-        <field name="name">CRM - Phone Calls Tree</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Phone Calls"  editable="bottom" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="date" string="Date"/>
-                <field name="name" string="Call Summary"/>
-                <field name="partner_id" string="Partner"/>
-                <field name="partner_address_id" string="Contact"/>
-                <group col="2">
-                <field name="opportunity_id"/>
-                <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                <button string="Meeting"
-                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
-                </group>
+                <field name="state"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
@@ -80,46 +57,46 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Phone Call">
-                <group colspan="4" col="8">
-                    <group colspan="7" col="4">
-                        <field name="name" string="Subject" />
-                        <field name="date" string="Planned Date" />
-                        <field name="partner_phone" />
-                        <field name="duration" />
-                    </group>
-                    <group col="1" colspan="1">
-                        <button string="Schedule a Meeting"
-                            name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo"
-                            type="action" />
-                        <button string="Convert to Opportunity"
-                            name="%(wizard_crm_phonecall_opportunity_set)d"
-                            icon="gtk-index" type="action"
-                            attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                    </group>
-                </group>
-                <separator colspan="4" string="Communication" />
-                <field name="partner_id" />
-                <button string="Convert to Partner"
-                    colspan="2"
-                    icon="terp-crm"
-                    name="%(wizard_crm_phonecall_partner_create)d"
-                    type="action"
-                    attrs="{'invisible':[('partner_id','!=',False)]}" />
-                <newline />
-                <field name="partner_address_id" string="Contact" />
-                <field name="partner_mobile" />
-                <separator colspan="4" string="Status and Categorization" />
-                <group colspan="4" col="6">
-                    <field name="user_id" string="Assigned to" select="2" />
+                <group colspan="4" col="7">
+                    <field name="name" string="Call Summary"/>
+                    <field name="date" string="Planned Date"/>
+                    <field name="user_id"/>
+                    <button string="Schedule a Meeting"
+                        name="%(wizard_crm_phonecall_meeting_set)d"
+                        icon="gtk-redo"
+                        type="action" />
+                    <newline/>
+
+                    <field name="partner_phone"/>
+                    <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
+
+                    <button string="Convert to Opportunity"
+                        name="%(wizard_crm_phonecall_opportunity_set)d"
+                        icon="gtk-index" type="action"
+                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                </group>
+                <group col="3" colspan="2">
+                    <separator colspan="3" string="Contacts" />
+                    <field name="partner_id" />
+                    <button string="Convert to Partner"
+                        icon="terp-crm"
+                        name="%(wizard_crm_phonecall_partner_create)d"
+                        type="action"
+                        attrs="{'invisible':[('partner_id','!=',False)]}" />
+                    <newline/>
+                    <field name="partner_address_id" string="Contact" />
+                    <newline/>
+                    <field name="partner_mobile" />
+                </group>
+                <group col="2" colspan="2">
+                    <separator colspan="2" string="Categorization" />
+                    <field name="priority"/>
                     <field name="opportunity_id"
                         on_change="onchange_case_id(case_id, name, partner_id)"
                         context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
                         'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
                         'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}" />
-                    <field name="som" />
-                    <field name="priority" />
-                    <field name="active" string="Reminder" />
                 </group>
                 <separator string="Description" colspan="4" />
                 <field name="description" nolabel="1" colspan="4" />
@@ -156,36 +133,40 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <group col="6" colspan="1">
-                   <filter icon="gtk-home" string="   Today   "
-                   	separator="1"
-                   	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                   	help="Todays's Phonecalls"
-                   />
-                   <filter icon="gtk-media-rewind"
-                   	string="    7 Days    " separator="1"
-                   	help="Phonecalls during last 7 days"
-                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                   />
-               </group>
+               <filter icon="gtk-home" string="Today"
+                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                   help="Todays's Phonecalls"
+               />
+               <filter icon="gtk-media-rewind"
+                   string="7 Days"
+                   help="Phonecalls during last 7 days"
+                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+               />
                <separator orientation="vertical"/>
-               <group col="6" colspan="2">
-             		<field name="name" select='1' string="Subject"/>
-               		<field name="user_id" select="1" widget="selection">
-	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
-                   </field>
-                   <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current " default="1"/>
-                   </field>
-					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-						<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"/>
-			   		</field>
-                   </group>
+               <field name="name" string="Call Summary"/>
+               <field name="partner_id"/>
+               <field name="user_id" widget="selection">
+                   <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
+                   <filter icon="terp-partner" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               </field>
+               <field name="state">
+                   <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current" default="1"/>
+               </field>
+               <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+                   <filter icon="terp-crm"
+                       domain="[('section_id','=',context.get('section_id',False))]"
+                       help="My section"/>
+               </field>
+               <newline/>
+               <group expand="1" string="Group By..." colspan="4">
+                   <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                   <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                   <separator orientation="vertical"/>
+                   <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                   <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+               </group>
            </search>
         </field>
     </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a5fa9e1a305..de9a6fab316 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -202,7 +202,7 @@
             <field name="model">crm.case</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date" date_stop="date_deadline" day_length="12" string="Cases">
+                <calendar color="user_id" date_start="create_date" date_stop="date_deadline" day_length="12" string="Cases">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="state"/>
@@ -219,7 +219,7 @@
                 <tree colors="red:date_deadline&lt;current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases">
                     <field name="id"/>
                     <field name="section_id"/>
-                    <field name="date"/>
+                    <field name="create_date"/>
                     <field name="date_deadline"/>
                     <field name="name"/>
                     <field name="partner_id"/>
@@ -244,7 +244,7 @@
                 <form string="Cases">
                     <field colspan="4" name="name" select="1"/>
                     <field colspan="2" name="section_id" widget="selection"/>
-                    <field name="date" select="1"/>
+                    <field name="create_date" select="1"/>
                     <field name="date_deadline" select="2"/>
                     <newline />
                     <notebook colspan="4">
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index eff7b49a2da..efe54b2f77f 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -1,31 +1,31 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* crm
+#	* crm
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-01-05 05:59:11+0000\n"
-"PO-Revision-Date: 2010-01-05 09:03+0000\n"
-"Last-Translator: Jay  (Open ERP) <jvo@tinyerp.com>\n"
+"POT-Creation-Date: 2010-01-05 05:59+0000\n"
+"PO-Revision-Date: 2010-02-21 19:17+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Skicka till"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
-"This property defines the list of date/time exceptions for arecurring "
-"calendar component."
+"This property defines the list                 of date/time exceptions for "
+"arecurring calendar component."
 msgstr ""
 
 #. module: crm
@@ -37,7 +37,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
@@ -47,17 +47,20 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Välj lead"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "    7 Days    "
 msgstr ""
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Administrera en supportavdelning"
 
 #. module: crm
 #: view:crm.job:0
@@ -72,7 +75,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "Planned costs"
-msgstr ""
+msgstr "Planerade kostnader"
 
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
@@ -85,13 +88,14 @@ msgid "Stage Name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.history:0
+#: view:crm.case:0
+#: view:crm.case.history:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr ""
+msgstr "Ärenden"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -103,7 +107,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Personalärenden"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -120,7 +124,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Belopp"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -131,15 +135,16 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Fast"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -150,7 +155,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanj"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -189,15 +194,18 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,partner_id:0
+#: view:crm.case:0
+#: field:crm.case,partner_id:0
 #: model:crm.case.categ,name:crm.categ_lead4
 #: model:crm.case.categ,name:crm.categ_oppor4
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
-#: field:crm.case.rule,trg_partner_id:0 selection:crm.email.add.cc,name:0
+#: field:crm.case.rule,trg_partner_id:0
+#: selection:crm.email.add.cc,name:0
 #: field:crm.email.add.cc,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
@@ -205,17 +213,19 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: crm
-#: field:crm.case.categ,section_id:0 field:crm.case.category2,section_id:0
-#: view:crm.case.section:0 field:crm.case.section,name:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.category2,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr ""
+msgstr "Ärende sektion"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Förslagen lön"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -228,7 +238,7 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
@@ -243,7 +253,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Inga"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -251,10 +261,14 @@ msgid "Special Keywords to Be Used in The Body"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Skicka ett nytt epost meddelande"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -264,13 +278,13 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "Villkor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr ""
+msgstr "Sektioner"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
@@ -295,12 +309,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Andra intervju"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Prenumerera på en extern kalender"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -312,13 +326,17 @@ msgstr "Kategorier"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -331,14 +349,15 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Kontaktnamn"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -352,15 +371,19 @@ msgid "Delay type"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Nästa intervju"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -370,12 +393,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Epost lägg till CC"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Tillfälle möte"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -394,7 +417,7 @@ msgstr ""
 #: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
-msgstr ""
+msgstr "Affärstillfällen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
@@ -411,7 +434,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikation"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -421,26 +444,27 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Död"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr "Konfiguration"
+msgstr "Godkänn möte"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Befintlig kund"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Hem"
 
 #. module: crm
-#: field:crm.case,categ_id:0 field:crm.case.rule,trg_categ_id:0
+#: field:crm.case,categ_id:0
+#: field:crm.case.rule,trg_categ_id:0
 #: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
 #: view:crm.opportunity:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
@@ -455,7 +479,7 @@ msgstr "Kategori"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Ärdenden per sektion, kategori och nivå"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -467,7 +491,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Sekretess"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -475,8 +499,12 @@ msgid "%(partner)s = Partner name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr ""
 
@@ -500,17 +528,19 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr ""
+msgstr "Öppna ärenden"
 
 #. module: crm
-#: field:crm.case.log,name:0 view:crm.claim:0 view:crm.job:0
+#: field:crm.case.log,name:0
+#: view:crm.claim:0
+#: view:crm.job:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -520,7 +550,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Skapa affärstillfälle"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -528,7 +558,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -536,18 +566,21 @@ msgid "Meetings Tree"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.fundraising:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Eskalera"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Alla möten"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -558,7 +591,7 @@ msgstr ""
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Lagg till CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -566,12 +599,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Standardvärde (0=inget)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
@@ -586,7 +619,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "Tillåt makulering"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -594,7 +627,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
@@ -609,7 +642,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Ny affär"
 
 #. module: crm
 #: help:crm.case,email_from:0
@@ -622,7 +655,10 @@ msgid "Allows to show calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "   Today   "
 msgstr ""
 
@@ -630,12 +666,12 @@ msgstr ""
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Telefonsamtal, beskrivning"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Ärendekategori"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -661,7 +697,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Tilldelad till"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -679,9 +715,12 @@ msgid "Jobs - Hiring Process"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Relaterade ärenden"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -689,11 +728,15 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr ""
 
@@ -736,15 +779,16 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Alla möjligheter"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Möjlighetersida"
 
 #. module: crm
-#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
 msgstr ""
 
@@ -761,17 +805,18 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Befintlig affär"
 
 #. module: crm
-#: field:crm.case,probability:0 field:crm.case.categ,probability:0
+#: field:crm.case,probability:0
+#: field:crm.case.categ,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Sannolikhet (%)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Möjlighetsärenden"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -781,26 +826,32 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0 model:ir.model,name:crm.model_crm_case_rule
+#: view:crm.case.rule:0
+#: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr ""
+msgstr "Möjlighetsregel"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_opportunity_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0 view:crm.opportunity:0
+#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: view:crm.opportunity:0
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Tillfälle"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "E-post"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
@@ -826,7 +877,7 @@ msgstr ""
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Fortsätt"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -847,7 +898,7 @@ msgstr ""
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -911,11 +962,12 @@ msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support3 view:crm.opportunity:0
+#: model:crm.case.section,name:crm.section_support3
+#: view:crm.opportunity:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Tillfällen"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -944,7 +996,8 @@ msgid "Direction"
 msgstr ""
 
 #. module: crm
-#: help:crm.case,email_cc:0 help:crm.case.rule,act_email_cc:0
+#: help:crm.case,email_cc:0
+#: help:crm.case.rule,act_email_cc:0
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
@@ -1017,7 +1070,8 @@ msgid "Mobile"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,name:0 field:crm.segmentation.line,name:0
+#: field:crm.case.rule,name:0
+#: field:crm.segmentation.line,name:0
 msgid "Rule Name"
 msgstr ""
 
@@ -1062,8 +1116,10 @@ msgid "Export ICS"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_claim.py:0 code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
@@ -1076,9 +1132,11 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
-#: model:crm.case.section,name:crm.section_support1 view:crm.meeting:0
+#: model:crm.case.section,name:crm.section_support1
+#: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
 msgstr ""
@@ -1094,8 +1152,10 @@ msgid "Next Action"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: field:crm.case,date_deadline:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr ""
 
@@ -1127,8 +1187,10 @@ msgid "Category of case"
 msgstr ""
 
 #. module: crm
-#: field:crm.email.add.cc,subject:0 view:crm.meeting:0
-#: wizard_field:crm.new.send.mail,init,subject:0 view:crm.phonecall:0
+#: field:crm.email.add.cc,subject:0
+#: view:crm.meeting:0
+#: wizard_field:crm.new.send.mail,init,subject:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
 msgstr ""
@@ -1193,13 +1255,15 @@ msgid "Print"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,som:0 field:crm.case.log,som:0
+#: field:crm.case,som:0
+#: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.meeting:0
+#: view:crm.claim:0
+#: view:crm.meeting:0
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
@@ -1234,7 +1298,8 @@ msgid "Creation Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
 msgstr ""
@@ -1245,8 +1310,13 @@ msgid "%(partner_email)s = Partner email"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Återställ till utdrag"
 
@@ -1270,7 +1340,8 @@ msgid "Open cases"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,stage_id:0 view:crm.case.stage:0
+#: field:crm.case,stage_id:0
+#: view:crm.case.stage:0
 #: field:report.crm.case.section.categ.categ2,stage_id:0
 #: field:report.crm.case.section.categ.stage,stage_id:0
 #: field:report.crm.case.section.categ2,stage_id:0
@@ -1321,7 +1392,9 @@ msgid "Meeting Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Partner"
 msgstr ""
 
@@ -1383,7 +1456,8 @@ msgid "done"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 msgid "Reminder"
 msgstr ""
 
@@ -1446,8 +1520,10 @@ msgid "Awaiting Response"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,date:0 field:crm.case.log,date:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.claim:0
+#: field:crm.case,date:0
+#: field:crm.case.log,date:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
 msgstr "Datum"
@@ -1474,8 +1550,12 @@ msgid "Converted"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Reply to Last Email"
 msgstr ""
 
@@ -1490,8 +1570,12 @@ msgid "Gives Location of Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "History"
 msgstr ""
 
@@ -1511,7 +1595,8 @@ msgid "Regular Expression on Case Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,state:0 field:report.crm.case.section.categ.categ2,state:0
+#: field:crm.case,state:0
+#: field:report.crm.case.section.categ.categ2,state:0
 #: field:report.crm.case.section.categ.stage,state:0
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
@@ -1524,27 +1609,36 @@ msgid "Send Reminder"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0 view:crm.claim.assign_wizard:0 view:crm.fundraising:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.fundraising:0
 #: view:crm.helpdesk.assign_wizard:0
 #: wizard_button:crm.job.meeting_set,init,end:0
 #: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0 view:crm.lead:0
+#: wizard_button:crm.job.reschedule_phone_call,init,end:0
+#: view:crm.lead:0
 #: wizard_button:crm.lead.opportunity_set,create_partner,end:0
 #: wizard_button:crm.lead.opportunity_set,opportunity,end:0
 #: wizard_button:crm.lead.partner_create,init,end:0
 #: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0 view:crm.opportunity:0
+#: wizard_button:crm.new.send.mail,init,end:0
+#: view:crm.opportunity:0
 #: view:crm.opportunity.assign_wizard:0
 #: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.assign_wizard:0
 #: wizard_button:crm.phonecall.meeting_set,init,end:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
 #: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
@@ -1591,7 +1685,8 @@ msgid "Claim Cost"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.opportunity:0
+#: view:crm.job:0
+#: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
 msgstr ""
 
@@ -1646,8 +1741,12 @@ msgid "Sale Amount"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Add a CC"
 msgstr ""
 
@@ -1657,7 +1756,9 @@ msgid "="
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.job:0 field:crm.menu.config_wizard,name:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Namn"
@@ -1678,7 +1779,8 @@ msgid "Mail to watchers (CC)"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.meeting:0
+#: view:crm.fundraising:0
+#: view:crm.meeting:0
 msgid "Next Meeting"
 msgstr ""
 
@@ -1706,14 +1808,19 @@ msgid "Bug Tracking"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.rule:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.case.rule:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
@@ -1811,7 +1918,8 @@ msgid "Email Fail!"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone1
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
@@ -1837,7 +1945,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Year"
 msgstr ""
 
@@ -1847,7 +1956,8 @@ msgid "Remind Partner"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
@@ -1928,7 +2038,8 @@ msgid "Convert To Opportunity"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone2
+#: view:crm.phonecall:0
 msgid "Held"
 msgstr ""
 
@@ -1971,7 +2082,9 @@ msgid "Send"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,priority:0 view:crm.fundraising:0 view:crm.lead:0
+#: field:crm.case,priority:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioritet"
@@ -2000,7 +2113,9 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.claim:0
+#: view:crm.job:0
+#: view:crm.lead:0
 msgid "Stage: "
 msgstr ""
 
@@ -2015,9 +2130,12 @@ msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0 code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0 code:addons/crm/crm_phonecall.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -2130,7 +2248,8 @@ msgid "%(case_date)s = Creation date"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone3
+#: view:crm.phonecall:0
 msgid "Not Held"
 msgstr ""
 
@@ -2173,7 +2292,8 @@ msgid "Month"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support2 view:crm.lead:0
+#: model:crm.case.section,name:crm.section_support2
+#: view:crm.lead:0
 #: field:crm.menu.config_wizard,lead:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
@@ -2217,7 +2337,8 @@ msgstr ""
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
 
 #. module: crm
@@ -2249,14 +2370,16 @@ msgid "Delay Close"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
 msgstr "Låg"
 
 #. module: crm
-#: field:crm.case,date_closed:0 selection:crm.case,state:0
+#: field:crm.case,date_closed:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
@@ -2284,7 +2407,10 @@ msgid "Internal Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,child_ids:0 view:crm.claim:0 view:crm.lead:0
+#: view:crm.case:0
+#: field:crm.case,child_ids:0
+#: view:crm.claim:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
 msgstr ""
@@ -2337,7 +2463,8 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
 #: model:crm.case.section,name:crm.section_support_phone
-#: field:crm.menu.config_wizard,phonecall:0 view:crm.phonecall:0
+#: field:crm.menu.config_wizard,phonecall:0
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
@@ -2372,7 +2499,8 @@ msgid "Cheque"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,active:0 field:crm.case.rule,active:0
+#: field:crm.case,active:0
+#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
 msgstr "Aktiv"
@@ -2410,8 +2538,10 @@ msgid "Months"
 msgstr ""
 
 #. module: crm
-#: view:crm.claim.assign_wizard:0 view:crm.helpdesk.assign_wizard:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall.assign_wizard:0
 #: model:ir.actions.act_window,name:crm.action_crm_claim_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_helpdesk_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
@@ -2443,8 +2573,10 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
-#: model:crm.case.section,name:crm.section_support_claims view:crm.claim:0
-#: field:crm.menu.config_wizard,claims:0 view:crm.phonecall:0
+#: model:crm.case.section,name:crm.section_support_claims
+#: view:crm.claim:0
+#: field:crm.menu.config_wizard,claims:0
+#: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
@@ -2482,7 +2614,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.phonecall:0
 msgid "General"
 msgstr ""
 
@@ -2503,8 +2636,12 @@ msgid "Other"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 msgid "Done"
 msgstr ""
 
@@ -2519,12 +2656,18 @@ msgid "All Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -2562,11 +2705,17 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,user_id:0 field:crm.case.rule,trg_user_id:0 view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0 view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0 view:crm.job:0
-#: view:crm.meeting:0 field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0 field:crm.opportunity.assign_wizard,user_id:0
+#: field:crm.case,user_id:0
+#: field:crm.case.rule,trg_user_id:0
+#: view:crm.claim:0
+#: field:crm.claim.assign_wizard,user_id:0
+#: view:crm.fundraising:0
+#: field:crm.helpdesk.assign_wizard,user_id:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: field:crm.meeting.generic_wizard,user_id:0
+#: view:crm.opportunity:0
+#: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr ""
@@ -2645,7 +2794,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Month"
 msgstr ""
 
@@ -2662,12 +2812,12 @@ msgstr ""
 #. module: crm
 #: help:crm.case,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"
+"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 ""
 
@@ -2831,7 +2981,8 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
 msgstr ""
 
@@ -2891,7 +3042,8 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,display,end:0
-#: wizard_button:caldav.crm.subscribe,display,end:0 view:crm.email.add.cc:0
+#: wizard_button:caldav.crm.subscribe,display,end:0
+#: view:crm.email.add.cc:0
 msgid "Ok"
 msgstr ""
 
@@ -2913,7 +3065,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -2930,7 +3083,8 @@ msgid "All Jobs Requests"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,state:0 selection:crm.case.rule,act_state:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -2998,7 +3152,8 @@ msgid "%(case_subject)s = Case subject"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,section_id:0 field:crm.case.log,section_id:0
+#: field:crm.case,section_id:0
+#: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
 #: field:crm.claim.assign_wizard,section_id:0
 #: field:crm.helpdesk.assign_wizard,section_id:0
@@ -3042,13 +3197,15 @@ msgstr "Beskrivning"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0 field:crm.email.add.cc,email:0
+#: field:crm.case.history,email:0
+#: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,canal_id:0 field:crm.case.log,canal_id:0
+#: field:crm.case,canal_id:0
+#: field:crm.case.log,canal_id:0
 msgid "Channel"
 msgstr "Kanal"
 
@@ -3093,12 +3250,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3154,7 +3317,8 @@ msgid "Lead Subject"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Opportunity"
 msgstr ""
 
@@ -3242,7 +3406,8 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0 view:crm.meeting:0
+#: field:crm.case.section,calendar:0
+#: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
 msgstr ""
@@ -3268,7 +3433,8 @@ msgid "Sales Purchase"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
+#: view:crm.job:0
+#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
 msgstr ""
@@ -3279,7 +3445,8 @@ msgid "Arts And Culture"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone2
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
@@ -3309,10 +3476,12 @@ msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.meeting:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.meeting:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3337,7 +3506,8 @@ msgid "Set section to"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
@@ -3371,7 +3541,8 @@ msgid "Change RRule"
 msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0 field:crm.email.add.cc,user_id:0
+#: selection:crm.email.add.cc,name:0
+#: field:crm.email.add.cc,user_id:0
 #: field:report.crm.case.section.categ.categ2,user_id:0
 #: field:report.crm.case.section.categ.stage,user_id:0
 #: field:report.crm.case.section.categ2,user_id:0
@@ -3451,10 +3622,15 @@ msgid "Healthcare"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.claim.assign_wizard:0
-#: view:crm.helpdesk.assign_wizard:0 view:crm.meeting:0
-#: view:crm.meeting.generic_wizard:0 view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.meeting:0
+#: view:crm.meeting.generic_wizard:0
+#: view:crm.opportunity:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
 msgstr ""
@@ -3480,7 +3656,9 @@ msgid "Stage of case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr ""
 
@@ -3490,7 +3668,8 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Close"
 msgstr ""
@@ -3548,9 +3727,14 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,name:0 field:crm.case.history,description:0
-#: field:crm.case.history,note:0 view:crm.job:0 view:crm.meeting:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: field:crm.case,name:0
+#: field:crm.case.history,description:0
+#: field:crm.case.history,note:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Beskrivning"
@@ -3575,9 +3759,14 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 wizard_field:crm.new.send.mail,init,cc:0
-#: view:crm.opportunity:0 wizard_field:crm.send.mail,init,cc:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: wizard_field:crm.new.send.mail,init,cc:0
+#: view:crm.opportunity:0
+#: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
 msgstr ""
 
@@ -3592,10 +3781,14 @@ msgid "_Import"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0 field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0 field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0 field:crm.meeting,inherit_case_id:0
+#: code:addons/crm/crm.py:0
+#: field:crm.case.log,case_id:0
+#: field:crm.claim,inherit_case_id:0
+#: field:crm.fundraising,inherit_case_id:0
+#: field:crm.helpdesk,inherit_case_id:0
+#: field:crm.job,inherit_case_id:0
+#: field:crm.lead,inherit_case_id:0
+#: field:crm.meeting,inherit_case_id:0
 #: field:crm.opportunity,inherit_case_id:0
 #: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
@@ -3605,7 +3798,8 @@ msgid "Case"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
@@ -3639,7 +3833,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0 wizard_view:crm.send.mail,init:0
+#: wizard_view:crm.new.send.mail,init:0
+#: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
 msgstr ""
 
@@ -3715,7 +3910,8 @@ msgid "Export ICS File"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0 field:crm.case.section,sequence:0
+#: field:crm.case.rule,sequence:0
+#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr ""
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index 60c923400d7..21c4de6732a 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -116,7 +116,6 @@ class lead2opportunity(wizard.interface):
                 'date_deadline': lead.date_deadline,
                 'partner_address_id':lead.partner_address_id.id, 
                 'priority': lead.priority,
-                'date': lead.date,
                 'partner_phone': lead.partner_phone,
                 'canal_id': lead.canal_id,
                 'som': lead.som,
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index 2626c2ae863..ec50a41c948 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -135,21 +135,7 @@ class opportunity2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        opportunity_case_obj = pool.get('crm.opportunity')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for opportunity in opportunity_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': opportunity.name,
-                'date': opportunity.date,
-                'section_id' : opportunity.section_id and opportunity.section_id.id or False,
-                'date_deadline': opportunity.date_deadline,
-                'description':opportunity.description,
-                'opportunity_id':opportunity.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            opportunity_case_obj.write(cr, uid, [opportunity.id], vals)            
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])        
+        opportunity_case_obj = pool.get('crm.opportunity')                
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index dd4172a4345..b2d717a553a 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -78,8 +78,7 @@ class phonecall2opportunity(wizard.interface):
         for case in case_obj.browse(cr, uid, data['ids']):
             if not case.partner_id:
                 return 'create_partner'
-        return {'name': case.name, 'probability': case.probability or 20.0,
-                'planned_revenue':case.planned_revenue, 'partner_id':case.partner_id.id}
+        return {'name': case.name, 'partner_id':case.partner_id.id}
 
     def _selectChoice(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
@@ -115,7 +114,6 @@ class phonecall2opportunity(wizard.interface):
                 'section_id': phonecall.section_id.id,
                 'description': phonecall.description,         
                 'phonecall_id': phonecall.id,
-                'date': phonecall.date,
                 'priority': phonecall.priority    
             })
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
@@ -204,22 +202,7 @@ class phonecall2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        phonecall_case_obj = pool.get('crm.phonecall')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': phonecall.name,
-                'date': phonecall.date,
-                'section_id' : phonecall.section_id and phonecall.section_id.id or False,
-                'duration': phonecall.duration,
-                'description':phonecall.description,
-                'phonecall_id':phonecall.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
-            phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])             
+        phonecall_case_obj = pool.get('crm.phonecall')                   
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index b27e59bf8e9..7088826572d 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-15 01:57+0000\n"
-"Last-Translator: thunk <thunk77@gmail.com>\n"
+"PO-Revision-Date: 2010-02-21 16:01+0000\n"
+"Last-Translator: Μάριος Ζηντίλης <m.zindilis@dmajor.org>\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-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -312,7 +312,7 @@ msgstr "Χρήστης"
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
-msgstr "Ηεμρ/νία"
+msgstr "Ημερ/νία"
 
 #. module: hr_expense
 #: rml:hr.expense:0
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 9bc5b008c54..696c03a5593 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index a111decbd34..bceeed37cf3 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 19:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-19 14:44+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -24,7 +24,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -36,7 +36,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "Tjänst"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr ""
+msgstr "Leverantör av denna produkt"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -70,7 +70,7 @@ msgstr ""
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Netto vikt"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -90,7 +90,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr ""
+msgstr "Bredd"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -132,12 +132,12 @@ msgstr ""
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Produktens prislista"
 
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr ""
+msgstr "Säljbar"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -147,17 +147,17 @@ msgstr ""
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "Prisbenämning"
 
 #. module: product
 #: field:product.product,price:0
 msgid "Customer Price"
-msgstr ""
+msgstr "Kundoris"
 
 #. module: product
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Företag"
 
 #. module: product
 #: field:product.template,rental:0
@@ -167,23 +167,23 @@ msgstr ""
 #. module: product
 #: field:product.product,lst_price:0
 msgid "List Price"
-msgstr ""
+msgstr "Listpris"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type_action
 msgid "Prices Types"
-msgstr ""
+msgstr "Pristyper"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Lagerförd artikel"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
 msgid "Services"
-msgstr ""
+msgstr "Tjänster"
 
 #. module: product
 #: help:product.template,list_price:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -220,7 +220,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Leverera till lager"
 
 #. module: product
 #: view:product.product:0
@@ -254,7 +254,7 @@ msgstr ""
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Försäljingsprislista"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -268,7 +268,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "Produkter"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -281,23 +281,23 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "Nytt pris ="
 
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Virtuellt lager"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Fast"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Enhetskategorier"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -311,23 +311,23 @@ msgstr ""
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Prislisttyp"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Försäljningspriser"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_price
 msgid "Prices Computations"
-msgstr ""
+msgstr "Prisberäkningar"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Regelnamn"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_config_product
@@ -347,17 +347,17 @@ msgstr ""
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Standard enhet"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Tillverkningsledtid"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Leverantörsprislista"
 
 #. module: product
 #: view:product.packaging:0
@@ -378,12 +378,12 @@ msgstr "Tangentbord"
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Kundledtid"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -401,7 +401,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Prislistenamn"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -411,12 +411,12 @@ msgstr "Alternativa leverantörer"
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "Snittpris"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Create new Product"
-msgstr ""
+msgstr "Skapa en ny produkt"
 
 #. module: product
 #: help:product.pricelist.item,name:0
@@ -441,22 +441,22 @@ msgstr ""
 #. module: product
 #: selection:product.template,state:0
 msgid "In Production"
-msgstr ""
+msgstr "I produktion"
 
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Underkategori"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr ""
+msgstr "Tillbehör"
 
 #. module: product
 #: field:product.supplierinfo,sequence:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
@@ -467,17 +467,17 @@ msgstr "HDD vid behov"
 #: field:product.uom,factor_inv:0
 #: field:product.uom,factor_inv_data:0
 msgid "Factor"
-msgstr ""
+msgstr "Faktor"
 
 #. module: product
 #: wizard_button:product.price_list,init,price:0
 msgid "Print"
-msgstr ""
+msgstr "Skriv ut"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
 msgid "Supplier Info"
-msgstr ""
+msgstr "Leverantörsinfo"
 
 #. module: product
 #: field:product.ul,type:0
@@ -487,13 +487,13 @@ msgstr "Typ"
 #. module: product
 #: wizard_field:product.price_list,init,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "Prislista"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "Enhet"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -505,18 +505,18 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Prislistor"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Partner Product Name"
-msgstr ""
+msgstr "Leverantörens artikelbenämning"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diverse"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -529,17 +529,17 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "Kundreferens"
 
 #. module: product
 #: field:product.supplierinfo,qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minsta antal"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -557,7 +557,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Leverantörens ledtid"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -567,12 +567,12 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "Nyckel"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "Prislisteversion"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -676,7 +676,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr ""
+msgstr "Produkter per kategori"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -731,7 +731,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Försäljningsbeslrivning"
 
 #. module: product
 #: field:product.template,uos_id:0
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 979b4d3cc89..1f7fc3f3c72 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--        <menuitem icon="terp-product" id="menu_main_product" name="Products"/>-->
-<!--        <menuitem-->
-<!--            id="menu_config_product"-->
-<!--            name="Configuration"-->
-<!--            parent="product.menu_main_product"-->
-<!--            sequence="1"-->
-<!--            groups="group_product_manager"/>-->
-		<menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
             <field name="model">product.product</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                    <group col='8' colspan='4'>
-                        <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-                        <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
-                        <field name="default_code" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="categ_id" select="1" widget="selection"/>
-                   </group>
+                   <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
+                   <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <separator orientation="vertical"/>
+                   <field name="default_code" select="1"/>
+                   <field name="name" select="1"/>
+                   <field name="categ_id" select="1" widget="selection"/>
                    <newline/>
-                   <group col='8' colspan='4'>
-                          <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
-                    </group>
+                   <group col='8' colspan='7' expand="1" string="Extended options...">
+                       <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                   </group>
                 </search>
             </field>
         </record>
@@ -78,7 +70,7 @@
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="	Requisition" colspan="2"/>
+                                <separator string="    Requisition" colspan="2"/>
                                 <field name="type" select="2"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
@@ -188,8 +180,8 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-		<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
-		<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 <!--        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
@@ -255,7 +247,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
 <!--        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
-		<menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
+        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -316,7 +308,7 @@
             <field name="view_id" ref="product_uom_tree_view"/>
         </record>
         <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
-		<menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
+        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
@@ -367,7 +359,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 <!--        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
-		<menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
+        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index a67fff415cf..6897406c25b 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 08:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-21 19:41+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Tilldelade aktiviteter"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Aktivitetsprocess"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
@@ -34,22 +34,22 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Ändra återstående timmar"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Avsluta aktivitet"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projektaktiviteter"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Öppna avslutade aktiviteter"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Upparbetning"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -115,7 +115,7 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Uppdatera"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Alla bilagor"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -141,7 +141,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Aktivtetstyoer"
 
 #. module: project
 #: view:project.project:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projektets aktiviteter"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -161,7 +161,7 @@ msgstr ""
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Validera"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -175,17 +175,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Definiera som mall"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Preliminär aktivitet"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -211,7 +211,7 @@ msgstr "Anteckningar"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dagar"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -229,7 +229,7 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Starta aktivitet"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
@@ -247,7 +247,7 @@ msgstr ""
 #: selection:project.project,state:0
 #: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: project
 #: view:project.project:0
@@ -258,12 +258,12 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Avslutade aktiviteter"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Aktiviteten är avslutad"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Utfört av"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -307,24 +307,24 @@ msgstr "Alla uppgifter"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planering"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Tilläggsinformation"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: view:project.project:0
@@ -350,13 +350,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Alla projekt"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -376,17 +376,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Ny aktivitetsbeskrivning"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Intern beskrivning av projektet"
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Överliggande projekt"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -402,19 +402,19 @@ msgstr "Typ"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Veckor"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Nytt projekt"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -426,17 +426,17 @@ msgstr ""
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Återstående timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Projekt aktivitetstyp"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -448,7 +448,7 @@ msgstr ""
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -461,7 +461,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -478,7 +478,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -488,7 +488,7 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -500,23 +500,23 @@ msgstr "Konfiguration"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Aktivitetsdetaljer"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
@@ -559,13 +559,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Nedlagd tid"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -576,13 +576,13 @@ msgstr "Uppgifter"
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Aktivitetstyp"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Ny aktivitet"
 
 #. module: project
 #: help:project.project,timesheet_id:0
@@ -608,7 +608,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: view:project.project:0
@@ -618,7 +618,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planerad"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -633,17 +633,17 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Granska"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
@@ -660,7 +660,7 @@ msgstr ""
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -670,7 +670,7 @@ msgstr "Låg"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projektledare"
 
 #. module: project
 #: view:project.project:0
@@ -679,12 +679,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntande"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -702,17 +702,17 @@ msgstr ""
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projektnamn"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Skicka meddelande"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Total tid"
 
 #. module: project
 #: field:project.task,active:0
@@ -722,12 +722,12 @@ msgstr "Aktiv"
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Fel"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Offert"
 
 #. module: project
 #: view:project.task:0
@@ -744,17 +744,17 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Öppna aktivitet"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Arbetstid"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Månader"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -764,7 +764,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -852,7 +852,7 @@ msgstr ""
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: field:project.task,name:0
@@ -879,7 +879,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -890,17 +890,17 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Skapa en aktivitet"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 #. module: project
 #: view:project.project:0
@@ -910,7 +910,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: project
 #: constraint:ir.model:0
@@ -942,7 +942,7 @@ msgstr "Mycket låg"
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Skicka epost till kunden"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -979,13 +979,13 @@ msgstr ""
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Aktivtetsfaktura"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Projektstruktur"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -995,7 +995,7 @@ msgstr ""
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Avslutat arbete"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1029,7 +1029,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Ny funktion"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1039,17 +1039,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Din aktivitets titel"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projektaktivitet"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Nedlagda timmar"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1066,7 +1066,7 @@ msgstr ""
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1103,7 +1103,7 @@ msgstr "Slutdatum"
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Tilldela till"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1135,4 +1135,4 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Pågående projekt"
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 2f8dfedbe90..58e5e7affeb 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-09 17:33+0000\n"
-"Last-Translator: Antoni Górski <Unknown>\n"
+"PO-Revision-Date: 2010-02-18 15:42+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <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-02-10 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -24,12 +24,12 @@ msgstr "Zafakturowane i zapłacone"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Faktura od dostawcy wygenerowana z przyjęcia dla sprawdzenia"
+msgstr ""
 
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr "Miejsce docelowe"
+msgstr "Przeznaczenie"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -44,7 +44,7 @@ msgstr "Zatwierdzone przez"
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index a59969fc98c..2e66078874e 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\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 10:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:42+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <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: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -860,6 +860,16 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"Zasady wysyłki są stosowane do synchronizowania operacji fakturowych i "
+"wysyłkowych.\n"
+"  - 'Płać przed wysyłką' najpierw wygeneruje fakturę a potem, po otrzymaniu "
+"wpłaty, wygeneruje zamówienie wysyłki.\n"
+"  - 'Wysyłka i faktura ręczna' utworzy zamówienie wysyłki od razu i poczeka, "
+"aż użytkownik naciśnie przycisk 'Faktura', aby wygenerować projekt faktury.\n"
+"  - 'Faktura wg zamówienia po postawie' utworzy projekt faktury po wysyłce "
+"na podstawie zamówienia.\n"
+"  - 'Faktura wg wysyłki' jest stosowana do tworzenia faktury w trakcie "
+"procesu wysyłki."
 
 #. module: sale
 #: rml:sale.order:0
@@ -947,6 +957,11 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Podaje stan oferty lub zamówienia sprzedaży. Stan wyjątku jest ustawiany "
+"automatycznie gdy wystąpi operacja anulowania w trakcie zatwierdzania "
+"faktury (Wyjątek faktury) lub w procesie listy przesunięć (Wyjątek wysyłki). "
+"Stan 'Oczekiwanie na planistę' jest ustawiany, gdy faktura jest zatwierdzona "
+"ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5bb75fdd7a3..60d925d6fe4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -232,24 +232,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='11' colspan='4'>
-                        <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
-                        <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
-                        </field>
-                        <field name="date_order" select="1" string="Order date" />
-					</group>
-					<group expand="1" string="Group By..." colspan="4" col="8">
-						<filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
+                    </field>
+                    <field name="date_order" select="1" string="Order date" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-					</group>                       
-
+                    </group>
                </search>
             </field>
         </record>
@@ -391,22 +389,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <group col='8' colspan='4'>
-                        <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
-                        <separator orientation="vertical"/>
-                        <field name="order_id" select="1"/>
-                        <field name="order_partner_id" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="salesman_id" select="1" widget="selection">
-                            <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                            <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
-                        </field>
-					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <separator orientation="vertical"/>
+                    <field name="order_id" select="1"/>
+                    <field name="order_partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="salesman_id" select="1" widget="selection">
+                        <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                    </field>
+                    <newline/>
+                    <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-					</group>                                                
-
                     </group>
                 </search>
             </field>
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index b294f579fc3..b5e9f185209 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -7,130 +7,130 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 16:34+0000\n"
+"PO-Revision-Date: 2010-02-21 20:40+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.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: 2009-12-16 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr ""
+msgstr "Месечни продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr ""
+msgstr "Назначени пакетирания"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr ""
+msgstr "назначен"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Очакващ график"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr ""
+msgstr "за фактуриране"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Дневник продажби"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
 msgid "Sale Stats"
-msgstr ""
+msgstr "Състояние на продажба"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "waiting"
-msgstr ""
+msgstr "чакащ"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Пращане в проект"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr ""
+msgstr "Дата от дневник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr ""
+msgstr "Пакетиране според метода на фактуриране"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr ""
+msgstr "Дневници на пакетиране"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Notes"
-msgstr ""
+msgstr "Бележки"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr ""
+msgstr "Моите отворени дневници"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# от редове"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr ""
+msgstr "Всички отворени дневници"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Управление на продажби и доставки по дневник"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "done"
-msgstr ""
+msgstr "готов"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_average:0
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
@@ -140,14 +140,14 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Групиран"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
 #: field:sale_journal.picking.stats,state:0
 #: field:sale_journal.sale.journal,state:0
 msgid "State"
-msgstr ""
+msgstr "Състояние"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
@@ -160,12 +160,12 @@ msgstr "Всички месеци"
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Обща цена"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr ""
+msgstr "Дневник на опаковане"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -175,42 +175,42 @@ msgstr "Справки"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr ""
+msgstr "Моите отворени дневници на опаковане"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr ""
+msgstr "Поръчки за продажби по дневник"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr ""
+msgstr "Отваряне на дневници"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr ""
+msgstr "Опаковане"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Вида дневник използван при продажби и пакетиране"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr ""
+msgstr "Няма"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Продажби по дневник (този месец)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,141 +218,141 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr ""
+msgstr "Пакетиране по дневник"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr ""
+msgstr "Прекратяване на пакетиране"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr ""
+msgstr "Потвърдени опакования"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "In progress"
-msgstr ""
+msgstr "В развитие"
 
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr ""
+msgstr "Опаковане по дневник"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
 #: field:sale_journal.picking.stats,name:0
 #: field:sale_journal.sale.stats,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,invoice_state:0
 msgid "Invoice state"
-msgstr ""
+msgstr "Състояние на фактура"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr ""
+msgstr "Опаковане според метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 #: field:sale_journal.picking.journal,note:0
 #: field:sale_journal.sale.journal,note:0
 msgid "Note"
-msgstr ""
+msgstr "Бележка"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Проект"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "cancel"
-msgstr ""
+msgstr "отказан"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешла при фактура"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_validation:0
 #: field:sale_journal.sale.journal,date_validation:0
 msgid "Validation date"
-msgstr ""
+msgstr "Дата на проверка"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "draft"
-msgstr ""
+msgstr "проект"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr ""
+msgstr "Продажби в проект"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Запитване"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr ""
+msgstr "Дневници за продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
 msgid "sale_journal.invoice.type.tree"
-msgstr ""
+msgstr "sale_journal.invoice.type.tree"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr ""
+msgstr "Потвърждаване на продажби"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
 #: field:sale_journal.picking.journal,state:0
 #: field:sale_journal.sale.journal,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "Дата на създаване"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index f76d777dec7..c0fd04b38bd 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 05:52+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:47+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <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: 2009-12-16 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,13 +44,13 @@ msgstr ""
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 #: model:ir.ui.menu,name:stock.menu_stock_root
 msgid "Inventory Management"
-msgstr ""
+msgstr "Inwentaryzacja"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -571,7 +571,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
@@ -657,6 +657,11 @@ msgstr "Data wykonania"
 msgid "Expected Shipping Date"
 msgstr "Spodziewana data wysyłki"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
@@ -1370,7 +1375,7 @@ msgstr "Stan faktury"
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Jednostki"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1625,7 +1630,7 @@ msgstr "Incoterms"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Suma:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1680,7 +1685,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr ""
+msgstr "Sklep"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -2075,7 +2080,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "Ustawienia"
+msgstr "Konfiguracja"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2266,6 +2271,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
+"Planowana data przesunięcia produktów lub rzeczywista data, jeśli "
+"przesunięcie już nastąpiło."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9c67c73ccbc..9cc79afae68 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -389,6 +389,7 @@
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
             <field name="type">tree</field>
+            <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
                     <field name="complete_name"/>
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 6b15c22ddcd..83912434c70 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 15:42+0000\n"
+"PO-Revision-Date: 2010-02-20 15:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <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: 2009-12-16 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -78,7 +78,7 @@ msgstr "Stan"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -99,7 +99,7 @@ msgstr "Ustaw na projekt"
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr ""
+msgstr "Moduł pozwala tworzyć dokumenty i dodawać subskrypcję do nich."
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -175,7 +175,7 @@ msgstr "Dni"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "Subskrypcje i operacje powtarzalne"
 
 #. module: subscription
 #: field:subscription.subscription,active:0
@@ -185,7 +185,7 @@ msgstr "Aktywny"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -212,7 +212,7 @@ msgstr "Dane subskrypcji"
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -245,7 +245,7 @@ msgstr "Typy dokumentów"
 #. module: subscription
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0