diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 1331257e9f3..e4d2feeccac 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-02-09 21:06+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 21:06+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:12+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -25,12 +25,12 @@ msgstr "Sankt Helena"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Andere Konfigurationen"
+msgstr "Sonstige Konfiguration"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr "Datum mit Uhrzeit"
+msgstr "Datum/Zeit"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mailgate
@@ -44,14 +44,14 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
-"Das zweite Argument des many2many Feldes %s sollte eine SQL Tabelle sein! "
-"Sie benutzen  %s, welches keine gültige SQL Tabellenbezeichnung ist."
+"Das zweite Argument des m:n Feldes %s muss eine SQL Tabelle sein! Das von "
+"Ihnen benutzte %s ist kein gültiger Tabellenname."
 
 #. module: base
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr "Ansicht Aufbau"
+msgstr "Aufbau ansehen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project
@@ -76,7 +76,7 @@ msgstr ""
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
-msgstr "Kurzbez. (z.B.: de__DE)"
+msgstr "Länderkennung (z.B.: de_DE)"
 
 #. module: base
 #: view:workflow:0
@@ -121,7 +121,9 @@ msgstr "Zeige Menütips"
 #: help:ir.cron,model:0
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
-msgstr "Modellname, für die diese Methode gilt (zB res.partner)."
+msgstr ""
+"Modellname des Modells auf das diese Methode angewandt werden soll (z. B. "
+"res.partner)."
 
 #. module: base
 #: view:ir.module.module:0
@@ -135,8 +137,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
-"Sie haben keine Schreibrechte für den Beleg (%s) ! Stellen Sie sicher, dass "
-"Sie der folgenden Gruppe zugeordnet sind: %s."
+"Sie haben keine Schreibrechte für das Dokument (%s)! Stellen Sie sicher, "
+"dass Sie einer der folgenden Gruppen zugeordnet sind: %s."
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_project
@@ -147,6 +149,11 @@ msgid ""
 "\n"
 "This module allows you to create retro planning for managing your events.\n"
 msgstr ""
+"\n"
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"===========================================\n"
+"\n"
+"Dieses Modul dient der Verwaltung von Veranstaltungen mittels Retroplanung.\n"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -167,12 +174,12 @@ msgstr "Referenz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
 msgid "Belgium - Structured Communication"
-msgstr "Beligen - strukturierte Kommunikaiton"
+msgstr "Belgien - strukturierte Kommunikation"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr "Ziel Fenster"
+msgstr "Zielzeitraum"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -237,7 +244,7 @@ msgstr "erstellt."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
 msgid "Turkey - Accounting"
-msgstr ""
+msgstr "Türkei - Kontenführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_subproduct
@@ -578,7 +585,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_layout
 msgid "Sales Orders Print Layout"
-msgstr ""
+msgstr "Drucklayout für Kundenaufträge"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -693,7 +700,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Mexiko - Kontenführung"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -757,7 +764,7 @@ msgstr "Eritrea"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Der Unternehmensname muss eindeutig sein!"
 
 #. module: base
 #: view:res.config:0
@@ -774,7 +781,7 @@ msgstr "Automatische Aktionen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Rumänien - Kontenführung"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -893,6 +900,8 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
+"Das Modul fügt Google-Kontakte zu den Partneradressen hinzu und zeigt Google-"
+"Kalendereinträge bei den Treffen an."
 
 #. module: base
 #: view:res.users:0
@@ -989,7 +998,7 @@ msgstr "Niue"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "Mitgliederverwaltung"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -1016,7 +1025,7 @@ msgstr "Anfrage Bezug Typen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
 msgid "Google Users"
-msgstr ""
+msgstr "Google-Benutzer"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1084,7 +1093,7 @@ msgstr "Typ"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr ""
+msgstr "Benutzername"
 
 #. module: base
 #: code:addons/orm.py:398
@@ -1113,7 +1122,7 @@ msgstr ""
 #: code:addons/base/ir/ir_mail_server.py:192
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Verbindungstest fehlgeschlagen!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1235,12 +1244,12 @@ msgstr "Spanish (GT) / Español (GT)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP-Port"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr ""
+msgstr "von SugarCRM importieren"
 
 #. module: base
 #: view:res.lang:0
@@ -1257,12 +1266,12 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:55
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "Sprachpaket"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr ""
+msgstr "Tests"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1342,7 +1351,7 @@ msgstr "Zum Exportieren einer neuen Sprache wähle keine Sprachdatei aus."
 #: model:ir.module.module,shortdesc:base.module_document
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Document Management System"
-msgstr ""
+msgstr "Dokumentenverwaltungssystem"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
@@ -1450,6 +1459,9 @@ msgid ""
 "        OpenERP Web gantt chart view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Gantt-Diagramm Ansicht.\n"
+"        "
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1568,7 +1580,7 @@ msgstr "Login"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Terms"
-msgstr ""
+msgstr "Begriffe abgleichen"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1642,7 +1654,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luxemburg - Kontoführung"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1833,7 +1845,7 @@ msgstr "Tage"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_rpc
 msgid "OpenERP Web web"
-msgstr ""
+msgstr "OpenERP Web Netz"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
@@ -1858,7 +1870,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
 msgid "Employee Appraisals"
-msgstr ""
+msgstr "Personalbeurteilung"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1897,7 +1909,7 @@ msgstr "Übergeordneter Partner"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mrp
 msgid "Create Tasks on SO"
-msgstr ""
+msgstr "Aufgaben der Auftragserfassung"
 
 #. module: base
 #: field:ir.attachment,res_model:0
@@ -1907,7 +1919,7 @@ msgstr "Angehängte Vorlage"
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "Berichtsanzeige"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cn
@@ -1918,6 +1930,10 @@ msgid ""
 "        ============================================================\n"
 "    "
 msgstr ""
+"\n"
+"        ? some mess might need check ?\n"
+"Hier stimmt wohl etwas nicht - bitte mal prüfen.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2106,6 +2122,8 @@ msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
 msgstr ""
+"Dieses Bankkonto in der Fusszeile von gedruckten Dokumenten wie Rechnungen "
+"und Bestellungen anzeigen."
 
 #. module: base
 #: view:base.language.import:0
@@ -2179,7 +2197,7 @@ msgstr "Logo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Costa-Rica - Kontenführung"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2278,7 +2296,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
 msgid "Initial Setup Tools"
-msgstr ""
+msgstr "Werkzeuge zur Erstinstallation"
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -2540,7 +2558,7 @@ msgstr "Modul Übersicht"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
 msgid "Margins by Products"
-msgstr ""
+msgstr "Gewinnspannen nach Produkten"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
@@ -2856,7 +2874,7 @@ msgstr "Bangladesch"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_retro_planning
 msgid "Project Retro-planning"
-msgstr ""
+msgstr "Projekt Retro-Planung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_planning
@@ -3176,7 +3194,7 @@ msgstr "OpenERP Web Diagramm Ansicht"
 #. module: base
 #: model:res.groups,name:base.group_hr_user
 msgid "HR Officer"
-msgstr ""
+msgstr "Personalleitung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
@@ -3234,7 +3252,7 @@ msgstr "Partner Kontaktanrede"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_manufacturer
 msgid "Products Manufacturers"
-msgstr ""
+msgstr "Produktehersteller"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:217
@@ -3472,7 +3490,7 @@ msgstr "Objekte"
 #. module: base
 #: help:ir.mail_server,smtp_host:0
 msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "Hostname oder IP-Adresse des SMTP-Servers"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3793,7 +3811,7 @@ msgstr "USt-IdNr. / UID"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set password"
-msgstr ""
+msgstr "Passwort setzen"
 
 #. module: base
 #: view:res.lang:0
@@ -3917,7 +3935,7 @@ msgstr "Montenegro"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ics
 msgid "iCal Support"
-msgstr ""
+msgstr "iCal Unterstützung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
@@ -4026,6 +4044,17 @@ msgid ""
 "    * Cheque Register\n"
 "    "
 msgstr ""
+"\n"
+"Das Belege-Modul enthält alle Erfordernisse für Buchungsbelege der Bank, "
+"Kassenquittungen, \n"
+"Belege für Verkauf, Einkauf, Spesen, Gutschriften usw.\n"
+"============================================================================="
+"======\n"
+"\n"
+"    * Belegeingabe\n"
+"    * Belegerhalt\n"
+"    * Scheckeingang\n"
+"    "
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4246,6 +4275,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul hilft bei der Einrichtung des Systems bei installation einer "
+"neuen Datenbank.\n"
+"==========================================================================\n"
+"\n"
+"Es zeigt Ihnen eine Liste der installierbaren Anwendungs-Merkmale.\n"
+"\n"
+"    "
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 85df3886a60..ed37324ec10 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-06-09 01:13+0000\n"
+"PO-Revision-Date: 2012-07-08 22:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:50+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -885,7 +885,7 @@ msgstr "アルバニア語 / Shqip"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr "オポチュニティ"
+msgstr "商談"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -2042,7 +2042,7 @@ msgstr "優先度"
 #. module: base
 #: field:workflow.transition,act_from:0
 msgid "Source Activity"
-msgstr "ソースアクティビティ"
+msgstr "元の活動"
 
 #. module: base
 #: view:ir.sequence:0
@@ -2435,7 +2435,7 @@ msgstr "一般的な説明"
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
-msgstr "ワークフローアクティビティ"
+msgstr "ワークフロー活動"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2704,7 +2704,7 @@ msgstr "アイデア"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr "オポチュニティから見積り"
+msgstr "商談から見積り"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -4776,9 +4776,9 @@ msgstr ""
 "============================================================================="
 "=========================\n"
 "\n"
-"このモジュールを使うことで、あなたのオポチュニティを地理的ローカル化できます。\n"
+"このモジュールを使うことで、あなたの商談を地理的ローカル化できます。\n"
 "\n"
-"オポチュニティをパートナに割り当てる場合に地理的ローカル化を使います。\n"
+"商談をパートナに割り当てる場合に、地理的ローカル化を使います。\n"
 "パートナの住所によるGPS座標を決定します。\n"
 "最も適切なパートナの割り当てが可能です。\n"
 "また、GPS座標なしでも地理的ローカル化はできます。\n"
@@ -5871,8 +5871,8 @@ msgid ""
 "will automatically attach incoming emails to the right partner."
 msgstr ""
 "顧客は会社または組織といったビジネス対象の存在です。会社で働く人々のため顧客は複数のコンタクト者や住所を管理できます。顧客と関係する全てのトランザクション"
-"をたどるために履歴タブが利用できます：受注、Eメール、オポチュニティ、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲート"
-"ウェイを使う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
+"をたどるために履歴タブが利用できます：受注、Eメール、商談、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲートウェイを使"
+"う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -6002,7 +6002,7 @@ msgstr "南極大陸"
 msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
-msgstr "ソースアクティビティ。そのアクティビティを終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
+msgstr "元の活動。その活動を終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
@@ -7933,7 +7933,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールはCRMに１つあるいは幾つかのオポチュニティに近道を加えます。\n"
+"このモジュールはCRMに１つあるいは幾つかの商談に近道を加えます。\n"
 "===========================================================================\n"
 "\n"
 "この方法は選択されたケースに基づき受注オーダーを作成します。\n"
@@ -8676,7 +8676,7 @@ msgstr ""
 "===========================================================================\n"
 "\n"
 "所定のメールボックスに到着した新しいEメールを元にタスクの生成を許します。\n"
-"CRMアプリケーションがリード / オポチュニティを持つものも同様です。\n"
+"CRMアプリケーションがリード / 商談を持つものも同様です。\n"
 "メールボックス統合の設定のために２つの共通の選択肢があります：\n"
 "\n"
 " ・ fetchmailモジュールをインストールし、新しいメールボックスを設定し、それから\n"
@@ -8874,7 +8874,7 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr "行先のアクティビティ"
+msgstr "宛先の活動"
 
 #. module: base
 #: help:res.currency,position:0
@@ -9068,7 +9068,7 @@ msgid ""
 msgstr ""
 "顧客（システムの他のエリアではパートナと呼ばれる）は、彼らが見込み客、顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パート"
 "ナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
-"CRMをインストールした場合は、履歴タブでパートナと共にオポチュニティ、電子メール、発行された受注など全ての対話を追跡することができます。"
+"CRMをインストールした場合は、履歴タブでパートナと共に商談、電子メール、発行された受注など全ての対話を追跡することができます。"
 
 #. module: base
 #: model:res.country,name:base.ph
@@ -10257,7 +10257,7 @@ msgstr ""
 "\n"
 "受注予測の解決のために製品の\"受注履歴\"を使うことができます。\n"
 "あなたはこのテーブルの先頭と左のパラメータを入力しなければなりません。そして、システムはそれらのパラメータにより販売数量を計算します。\n"
-"そして、所定の販売チームや期間のための結果を得ることができます。\n"
+"そして、所定の営業チームや期間のための結果を得ることができます。\n"
 "\n"
 "MPSまたは調達計画\n"
 "---------------------------\n"
@@ -11064,7 +11064,7 @@ msgstr ""
 "以下のような多くの電子メール対応のOpenERPドキュメントのために、電子メールベースの\n"
 "ワークフローを簡単に作成するために利用することができます：\n"
 "\n"
-"・ CRMのリード / オポチュニティ\n"
+"・ CRMのリード / 商談\n"
 "・ CRMのクレーム\n"
 "・ プロジェクトの問題\n"
 "・ プロジェクトのタスク\n"
@@ -11312,7 +11312,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"CRMのリードとオポチュニティのためのToDoリスト\n"
+"CRMのリードと商談のためのToDoリスト\n"
 "    "
 
 #. module: base
@@ -11626,7 +11626,7 @@ msgstr "Googleインポート"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Segmentation"
-msgstr "分割"
+msgstr "分類"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
@@ -12203,7 +12203,7 @@ msgstr "モジュール更新結果"
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
 msgid "Activity"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. module: base
 #: view:res.partner:0
@@ -12489,8 +12489,7 @@ msgstr ""
 "さまざまな画面のアクションを自動的にトリガーする自動アクションの使用ができます。\n"
 "\n"
 "例：特定のユーザにより作成されたリードは自動的に特定のセールスチームにセットされたり、\n"
-"あるいは14日以上保留状態であるオポチュニティは自動的にリマインダー電子メールの\n"
-"トリガーになります。\n"
+"あるいは14日以上保留状態である商談は自動的に通知電子メールのトリガーになります。\n"
 "    "
 
 #. module: base
@@ -12748,9 +12747,8 @@ msgid ""
 "            \"Contacts\", \"Employees\", Meetings, Phonecalls, Emails, and "
 "Project, Project Tasks Data into OpenERP Module."
 msgstr ""
-"このモジュールはSugarCRMの以下のデータをOpenERPモジュールにインポートします：\n"
-"　　リード、オポチュニティ、ユーザ、会計、コンタクト、従業員、ミーティング、\n"
-"　　電話、Eメール、プロジェクト、プロジェクトタスク"
+"このモジュールはSugarCRMの以下のデータをOpenERPモジュールの中にインポートします：\n"
+"　　リード、商談、ユーザ、会計、コンタクト、従業員、ミーティング、電話、Eメール、プロジェクト、プロジェクトタスク"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
@@ -15655,7 +15653,7 @@ msgstr ""
 #: view:workflow:0
 #: field:workflow,activities:0
 msgid "Activities"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
@@ -15867,7 +15865,7 @@ msgstr "DBパスワードの暗号化"
 #. module: base
 #: help:workflow.transition,act_to:0
 msgid "The destination activity."
-msgstr "行先のアクティビティ"
+msgstr "宛先の活動"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
@@ -16388,7 +16386,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "リードとオポチュニティ"
+msgstr "リードと商談"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17199,7 +17197,7 @@ msgstr ""
 "一般的なOpenERPのCRM（Customer Relationship Management）\n"
 "=====================================================\n"
 "\n"
-"このシステムは人々のグループがリード、オポチュニティ、ミーティング、電話他を知的に効果的に\n"
+"このシステムは人々のグループがリード、商談、ミーティング、電話他を知的に効果的に\n"
 "管理することを可能にします。これはコミュニケーション、身分証明、優先度付け、割り当て、\n"
 "問題解決、通知といった主要なタスクを管理します。\n"
 "\n"
@@ -17216,8 +17214,8 @@ msgstr ""
 "Eメールゲートウェイを持ちます。\n"
 "\n"
 "CRMのために作成されるダッシュボードは次のものを含みます：\n"
-"　・ 分類別のオポチュニティ（グラフ）\n"
-"　・ 工程別のオポチュニティ（グラフ）\n"
+"　・ 分類別の商談（グラフ）\n"
+"　・ 工程別の商談（グラフ）\n"
 "　・ 工程とユーザ別の計画収益（グラフ）\n"
 
 #. module: base
@@ -17630,7 +17628,7 @@ msgstr "ウィジットの検索"
 msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
-msgstr "リード、オポチュニティ、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
+msgstr "リード、商談、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
 
 #. module: base
 #: selection:res.partner.address,type:0
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 047047b7e5b..78f0877d2a2 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2009-11-30 07:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-07-10 17:36+0000\n"
+"Last-Translator: Felix Malmenbeck <felixm@kth.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: 2012-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -24,7 +24,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "latlh Qur"
 
 #. module: base
 #: selection:ir.property,type:0
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 1a0a8dcf33d..25537cef4b3 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -9,21 +9,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Bindings" version="7.0">
-                  <sheet>
                     <group>
-                        <group string="Action Binding">
+                        <group>
                             <field name="name"/>
                             <field name="model_id" on_change="onchange_object_id(model_id)"/>
                             <field name="model"/>
                             <field name="res_id"/>
                             <field name="key2"/>
                         </group>
-                        <group string="Action">
+                        <group>
                             <field name="action_id" on_change="onchange_action_id(action_id)"/>
                             <field name="value_unpickle" colspan="4" string="Action Reference"/>
                         </group>
                     </group>
-                  </sheet>
                 </form>
             </field>
         </record>
@@ -34,24 +32,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User-defined Defaults" version="7.0">
-                   <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
                     <group>
-                        <group string="Model">
-                            <field name="model_id" on_change="onchange_object_id(model_id)"/>
+                        <group>
+                            <field name="name"/>
                             <field name="model"/>
-                            <field name="key2" string="Condition"/>
-                        </group>
-                        <group string="Default Value">
+                            <field name="model_id" on_change="onchange_object_id(model_id)"/>
                             <field name="value_unpickle" nolabel="1"/>
                         </group>
-                        <group string="Default Value Scope">
+                        <group>
+                            <field name="key2" string="Condition"/>
                             <field name="user_id"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
-                   </sheet> 
                 </form>
             </field>
         </record>
@@ -288,13 +281,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action" version="7.0">
-                  <sheet>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
                         <field name="usage"/>
                     </group>
-                   </sheet>
                 </form>
             </field>
         </record>
@@ -341,17 +332,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Report" version="7.0">
-                  <sheet>
-                    <group col="6">
-                        <field name="name"/>
-                        <field name="model"/>
-                        <field name="usage"/>
-
-                        <field name="report_name"/>
-                        <field name="report_type"/>
-                        <field name="report_file"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="report_name"/>
+                            <field name="model"/>
+                        </group>
+                        <group>
+                            <field name="usage"/>
+                            <field name="report_type"/>
+                            <field name="report_file"/>
+                        </group>
                     </group>
-
                     <notebook>
                         <page string="Other Configuration">
                             <group>
@@ -376,7 +368,6 @@
                             <field name="groups_id"/>
                         </page>
                     </notebook>
-                   </sheet>
                 </form>
             </field>
         </record>
@@ -445,14 +436,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open a Window" version="7.0">
-                  <sheet>
-                    <group col="6">
-                        <field name="name"/>
-                        <field name="res_model"/>
-                        <field name="type" readonly="1"/>
-                        <field name="src_model"/>
-                        <field name="usage"/>
-                        <field name="target"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="res_model" string="Object"/>
+                            <field name="src_model" string="Source Object"/>
+                        </group>
+                        <group>
+                            <field name="usage"/>
+                            <field name="type" readonly="1"/>
+                            <field name="target"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="General Settings">
@@ -496,7 +490,6 @@
                             <field name="groups_id"/>
                         </page>
                     </notebook>
-                  </sheet>
                 </form>
             </field>
         </record>
@@ -756,34 +749,34 @@
             <field name="arch" type="xml">
                 <form string="Attachments" version="7.0">
                    <sheet>
-                    <group col="4">
-                        <field name="name" />
-                        <field name="type"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook>
-                    <page string="Attachment">
-                        <group>
-                            <group attrs="{'invisible':[('type','=','url')]}" string="Data">
-                                <field name="datas" filename="datas_fname"/>
-                                <field name="datas_fname"/>
-                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                            </group>
-                            <group>
-                                <field name="res_model"/>
-                                <field name="res_id"/>
-                                <field name="res_name"/>
-                            </group>
-                            <group groups="base.group_no_one">
-                                <field name="create_uid"/>
-                                <field name="create_date"/>
-                            </group>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <group>
+                        <group string="Data">
+                            <field name="type"/>
+                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                            <field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
+                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
                         </group>
-                    </page>
-                    <page string="Notes">
-                        <field name="description"/>
-                    </page>
-                    </notebook>
+                        <group string="Attached To">
+                            <field name="res_model"/>
+                            <field name="res_id"/>
+                            <field name="res_name"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group groups="base.group_no_one" string="History">
+                            <label for="create_uid" string="Creation"/>
+                            <div name="creation_div">
+                                <field name="create_uid" readonly="1" class="oe_inline"/> on 
+                                <field name="create_date" readonly="1" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group name="description_group" string="Description" colspan="4">
+                            <field name="description" nolabel="1"/>
+                        </group>
+                    </group>
                   </sheet>
                 </form>
             </field>
@@ -858,12 +851,16 @@
             <field name="arch" type="xml">
                 <form string="Model Description" version="7.0">
                   <sheet>
-                    <group col="6">
-                        <field name="name"/>
-                        <field name="model"/>
-                        <field name="osv_memory"/>
-                        <field name="state"/>
-                        <field name="modules" colspan="4"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="model"/>
+                            <field name="osv_memory"/>
+                        </group>
+                        <group>
+                            <field name="state"/>
+                            <field name="modules"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Fields">
@@ -980,38 +977,37 @@
             <field name="arch" type="xml">
                 <form string="Fields" version="7.0">
                   <sheet>
-                    <group colspan="4" col="6">
-                        <field name="name" />
-                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
-                        <field name="field_description"/>
-                        <field name="state"/>
+                    <group>
+                        <group>
+                            <field name="name" string="Field Name"/>
+                            <field name="field_description"/>
+                        </group>
+                        <group>
+                            <field name="state"/>
+                            <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+                            <field name="modules"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Properties">
-                            <group>
-                                <field name="ttype"/>
-                                <field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
+                    <group>
+                        <group>
+                            <field name="ttype"/>
+                            <field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
                                                                           'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>
-                                <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
-                                <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
-                                <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
-                                <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
-                                <field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
-                            </group>
-
-                            <group>
-                                <field name="required"/>
-                                <field name="readonly"/>
-                                <field name="select_level"/>
-                                <field name="translate"/>
-                                <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
-                                <field name="modules"/>
-                            </group>
-                        </page>
-                        <page string="Security">
-                            <field name="groups"/>
-                        </page>
-                    </notebook>
+                            <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
+                            <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
+                            <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
+                            <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
+                            <field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
+                            <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
+                        </group>
+                        <group>
+                            <field name="required"/>
+                            <field name="readonly"/>
+                            <field name="select_level"/>
+                            <field name="translate"/>
+                        </group>
+                    </group>
+                    <field name="groups" invisible="1"/>
                   </sheet>  
                 </form>
             </field>
@@ -1694,13 +1690,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Server Action" version="7.0">
-                  <sheet> 
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="state"/>
-                        <field name="sequence"/>
-                        <field name="condition"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="model_id"/>
+                            <field name="state"/>
+                        </group>
+                        <group>
+                            <field name="condition"/>
+                            <field name="sequence"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
@@ -1771,7 +1770,6 @@
                         </page>
                     </notebook>
                     <field name="type" readonly="1"/>
-                  </sheet>  
                 </form>
             </field>
         </record>
@@ -1849,6 +1847,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Config Wizard Steps" version="7.0">
+                  <header>
+                        <button name="action_launch"
+                            states="open" string="Launch"
+                            type="object" icon="gtk-execute" class="oe_highlight" 
+                            help="Launch Configuration Wizard"/>
+                        <button name="action_open" states="done"
+                            string="Set as Todo" type="object"
+                            icon="gtk-convert" class="oe_highlight"/>
+                        <field name="state" widget="statusbar" statusbar_visible="open,done" nolabel="1" readonly="1" statusbar_colors='{"open":"red","done":"blue"}'/>
+                  </header>
                   <sheet>
                     <group col="4">
                         <field name="action_id"/>
@@ -1859,16 +1867,6 @@
                     <group string="Groups">
                         <field name="groups_id" nolabel="1" colspan="4"/>
                     </group>
-                    <group col="4">
-                        <field name="state" readonly="1"/>
-                        <button name="action_launch"
-                            states="open" string="Launch"
-                            type="object" icon="gtk-execute"
-                            help="Launch Configuration Wizard"/>
-                        <button name="action_open" states="done"
-                            string="Set as Todo" type="object"
-                            icon="gtk-convert"/>
-                    </group>
                   </sheet>
                 </form>
             </field>
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 1d91ab823db..8861a59c368 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -210,10 +210,6 @@ class act_window(osv.osv):
             res[act.id] = str(field_get)
         return res
 
-    def _get_help_status(self, cr, uid, ids, name, arg, context=None):
-        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
-        return dict([(id, activate_tips) for id in ids])
-
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
@@ -251,8 +247,6 @@ class act_window(osv.osv):
         'help': fields.text('Action description',
             help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
             translate=True),
-        'display_menu_tip':fields.function(_get_help_status, type='boolean', string='Display Menu Tips',
-            help='It gives the status if the tip has to be displayed or not when a user executes an action'),
         'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),
     }
 
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index beed30a2178..42b582f38b6 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -96,9 +96,9 @@ class ir_model(osv.osv):
         'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
         'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type',readonly=True),
         'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
-        'osv_memory': fields.function(_is_osv_memory, string='In-Memory Model', type='boolean',
+        'osv_memory': fields.function(_is_osv_memory, string='Transient Model', type='boolean',
             fnct_search=_search_osv_memory,
-            help="Indicates whether this object model lives in memory only, i.e. is not persisted (osv.osv_memory)"),
+            help="This field specifies whether the model is transient or not (i.e. if records are automatically deleted from the database or not)"),
         'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the object is defined or inherited'),
         'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
     }
@@ -225,7 +225,7 @@ class ir_model_fields(osv.osv):
         'required': fields.boolean('Required'),
         'readonly': fields.boolean('Readonly'),
         'select_level': fields.selection([('0','Not Searchable'),('1','Always Searchable'),('2','Advanced Search (deprecated)')],'Searchable', required=True),
-        'translate': fields.boolean('Translate', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
+        'translate': fields.boolean('Translatable', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
         'size': fields.integer('Size'),
         'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Type', required=True, readonly=True, select=1),
         'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On Delete', help='On delete property for many2one fields'),
diff --git a/openerp/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
index 58bd98ef785..9f5d912ed1a 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="name"/>
                         <field name="menu_id" domain="[('parent_id','&lt;&gt;',False)]"/>
                     </group>
+                    <footer>
+                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 89809d327ae..00662a68f29 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -15,14 +15,12 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="Workflow" version="7.0">
-             <sheet>
               <group col="4">
                   <field name="name"/>
                   <field name="osv"/>
                   <field name="on_create"/>
               </group>
               <field name="activities"/>
-            </sheet>
           </form>
       </field>
     </record>
@@ -206,14 +204,18 @@
       <field name="arch" type="xml">
         <form string="Transition" version="7.0">
           <sheet>
-            <group col="6">
-                <field name="act_from"/>
-                <field name="act_to"/>
-                <field name="signal"/>
-                <field name="condition"/>
-                <field name="trigger_model"/>
-                <field name="trigger_expr_id"/>
-                <field name="group_id"/>
+            <group>
+                <group>
+                    <field name="act_from"/>
+                    <field name="act_to"/>
+                    <field name="signal"/>
+                    <field name="condition"/>
+                </group>
+                <group>
+                    <field name="group_id"/>
+                    <field name="trigger_model"/>
+                    <field name="trigger_expr_id"/>
+                </group>
             </group>
           </sheet>
         </form>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 392850f7b77..fde8fcf5b9a 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -80,6 +80,7 @@ class module_category(osv.osv):
 
 class module(osv.osv):
     _name = "ir.module.module"
+    _rec_name = "shortdesc"
     _description = "Module"
 
     @classmethod
@@ -177,6 +178,7 @@ class module(osv.osv):
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
         'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
+        'summary': fields.char('Summary', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
@@ -454,7 +456,7 @@ class module(osv.osv):
                     to_install.extend(ids2)
 
         self.button_install(cr, uid, to_install, context=context)
-        return dict(ACTION_DICT, name=_('Upgrade'))
+        return dict(ACTION_DICT, name=_('Apply Schedule Upgrade'))
 
     def button_upgrade_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'installed'})
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 97df3bd26d2..5624c8ff58c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -113,38 +113,32 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module" version="7.0">
-                <header>
-                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
-                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
-                    <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
-                        confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
-                    <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
-                    <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
-                    <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
-                </header>
                 <sheet>
-                    <div class="oe_right oe_button_box">
-                        <field name="icon_image" widget="image"/>
-                    </div>
+                    <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
-                        <label for="shortdesc" class="oe_edit_only"/>
                         <h1><field name="shortdesc"/></h1>
-                        <label for="category_id" class="oe_edit_only"/>
-                        <h2><field name="category_id" class="oe_inline"/></h2>
+                        <h2 class="oe_fade"><field name="summary"/></h2>
+                        <button name="button_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
+                        <button name="button_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
+                        <button name="button_uninstall" states="installed" string="Uninstall" type="object"
+                            confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                        <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
+                        <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
+                        <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
                     </div>
                     <group>
+                        <group>
+                            <field name="author"/>
+                            <field name="website" widget="url"/>
+                            <field name="category_id" widget="selection"/>
+                        </group>
                         <group>
                             <field name="name"/>
                             <field name="license"/>
                             <field name="installed_version"/>
                         </group>
-                        <group>
-                            <field name="author"/>
-                            <field name="website" widget="url"/>
-                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Description">
                             <field name="description"/>
                         </page>
@@ -152,7 +146,9 @@
                             <group col="4">
                                 <field name="demo"/>
                                 <field name="application"/>
+                                <field name="state"/>
                             </group>
+                            <label for="dependencies_id"/>
                             <field name="dependencies_id">
                                 <tree string="Dependencies">
                                     <field name="name"/>
diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index 4ed31c3af69..9927a647c1b 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -8,39 +8,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export Translations" version="7.0">
-                    <header>
-                        <button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight"/>
-                        <label string="or" states="choose"/>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
-                            <label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
-                            <label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
-                            <label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export Translation"/>
-                                <field name="lang"/>
-                                <field name="format" required="1"/>
-                                <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                <field invisible="1" name="state"/>
-                            </group>
-                            <group colspan="4" states="get">
-                                <separator string="Export done" colspan="4"/>
-                                <field name="name" invisible="1" colspan="4"/>
-                                <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                        </group>
+                    <group colspan="4" states="choose">
+                        <separator colspan="4" string="Export Translation"/>
+                        <field name="lang"/>
+                        <field name="format" required="1"/>
+                        <field name="modules" nolabel="1"/>
+                        <field invisible="1" name="state"/>
                     </group>
+                    <group colspan="4" states="get">
+                        <separator string="Export done" colspan="4"/>
+                        <field name="name" invisible="1" colspan="4"/>
+                        <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
+                        <field height="80" name="advice" nolabel="1" colspan="4"/>
+                    </group>
+                    <footer states="choose">
+                        <button name="act_getfile" string="_Export" type="object" class="oe_highlight"/> or 
+                        <button name="act_cancel" special="cancel" string="_Cancel" type="object" class="oe_link"/>
+                    </footer>
+                    <footer states="get">
+                        <button name="act_cancel" special="cancel" string="_Close" type="object"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index 3c6a34752c7..1d62c74b781 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -8,21 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Translation" version="7.0">
-                    <header>
+                    <group>
+                        <field name="name"/>
+                        <field name="code" string="Code" placeholder="en_US"/>
+                        <field name="data"/>
+                        <field name="overwrite"/>
+                    </group>
+                    <footer>
                         <button name="import_lang" string="_Import" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group>
-                        <separator string="Import Translation" colspan="2"/>
-                        <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
-                        <group col="4">
-                            <field name="name"/>
-                            <field name="code"/>
-                            <field name="data"/>
-                            <field name="overwrite"/>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 166c1b05e70..d31956c6a04 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -8,33 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load a Translation" version="7.0">
-                    <header>
-                        <button name="lang_install" string="Load" type="object" states="init" class="oe_highlight"/>
-                        <label string="or" states="init"/>
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" colspan="1" rowspan="12"/>
-                        <group colspan="6">
-                            <separator string="Load a Translation" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <field name="lang" colspan="4"/>
-                                <field name="overwrite" colspan="4" groups="base.group_no_one"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <label string="The selected language has been successfully installed.
-You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                            </group>
-                        </group>
+                    <field name="state" invisible="1"/>
+                    <group states="init">
+                        <field name="lang"/>
+                        <field name="overwrite" groups="base.group_no_one"/>
                     </group>
+                    <group states="done" colspan="4">
+                        <label string="The selected language has been successfully installed.
+You must change the preferences of the user and open a new menu to view the changes."/>
+                    </group>
+                    <footer states="init">
+                        <button name="lang_install" string="Load" type="object" class="oe_highlight"/> or 
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
+                    <footer states="done">
+                        <button special="cancel" string="Close"/>
+                    </footer>
                 </form>
            </field>
         </record>
@@ -49,10 +38,10 @@ You must change the preferences of the user and open a new menu to view the chan
         </record>
 
         <menuitem
-        name="Load a Translation"
-        action="action_view_base_language_install"
-        id="menu_view_base_language_install"
-        parent="menu_translation" sequence="2"/>
+            name="Load a Translation"
+            action="action_view_base_language_install"
+            id="menu_view_base_language_install"
+            parent="menu_translation" sequence="2"/>
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
index 3174103ea4f..61f920b4333 100644
--- a/openerp/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_configuration_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Configuration Done" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
+                    <footer>
+                        <button string="Close" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index dc7d1df43e6..3201bd83e10 100644
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -8,35 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import module" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Import" colspan="4"/>
+                    <group states="init" col="4">
+                        <label string="Select module package to import (.zip file):" colspan="4"/>
+                        <field name="module_file" colspan="4"/>
+                    </group>
+                    <group states="done" col="4">
+                        <label string="Module file successfully imported!" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="importzip" string="Import module" type="object" states="init" class="oe_highlight"/>
                         <label string="or" states="init"/>
                         <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
                         <label string="or" states="done"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3" col="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label width="220" string='This wizard helps you to import a new module to your OpenERP system.
-After importing a new module you can install it by clicking on the button "Install" from the form view.'/>
-                            <label width="220"/>
-                            <label width="220" string="Please be patient, this operation may take a few minutes..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="5"/>
-                        <group colspan="4">
-                            <separator string="Module Import" colspan="4"/>
-                            <group states="init" col="4">
-                                <label string="Select module package to import (.zip file):" colspan="4"/>
-                                <field name="module_file" colspan="4"/>
-                            </group>
-                            <group states="done" col="4">
-                                <label string="Module file successfully imported!" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_scan_view.xml b/openerp/addons/base/module/wizard/base_module_scan_view.xml
index fc9fae11a65..a885dcb60d8 100644
--- a/openerp/addons/base/module/wizard/base_module_scan_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_scan_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Scan for new modules" version="7.0">
-                <header>
+                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                <footer>
                     <button name="watch_dir" string="Check new modules" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 2d1fa4b44f1..43b89190ed0 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -8,37 +8,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Update Module List" version="7.0">
-                    <header>
-                        <button name="update_module" string="Update" type="object" states="init" class="oe_highlight"/>
-                        <label string="or" states="init"/>
-                        <button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight"/>
-                        <label string="or" states="done"/>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Module Update Result" colspan="4"/>
-                            <group states="init" colspan="4">
-                                <label string="Click on Update below to start the process..." colspan="4"/>
-                            </group>
-                            <group states="done" colspan="4">
-                                <field name="update" colspan="4"/>
-                                <field name="add" colspan="4"/>
-                            </group>
-                        </group>
+                    <field name="state" invisible="1"/>
+                    <separator string="Module Update Result"/>
+                    <group states="init">
+                        <label string="Click on Update below to start the process..." />
                     </group>
+                    <group states="done" >
+                        <field name="update"/>
+                        <field name="add" />
+                    </group>
+                    <footer>
+                        <div states="init">
+                            <button name="update_module" string="Update" type="object" class="oe_highlight"/> or 
+                            <button special="cancel" string="Cancel" class="oe_link"/>
+                        </div>
+                        <div states="done">
+                            <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or 
+                            <button special="cancel" string="Close" class="oe_link"/>
+                        </div>
+                    </footer>
                 </form>
             </field>
-        </record>
+        </record>        
 
         <record id="action_view_base_module_update" model="ir.actions.act_window">
             <field name="name">Module Update</field>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index 649f5e2a6f9..04b7e785e48 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -46,19 +46,14 @@ class base_module_upgrade(osv.osv_memory):
 
         ids = self.get_module_list(cr, uid, context=context)
         if not ids:
-            res['arch'] = """
-                <form string="Apply Scheduled Upgrades" version="7.0">
-                    <header>
-                        <button name="config" string="Start configuration" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="System update completed"/>
-                    <label string="The selected modules have been updated / installed !"/>
-                    <newline/>
-                    <label string="We suggest to reload the page to see the new menus."/>
-                </form>
-            """
+            res['arch'] = '''<form string="Apply Schedule Upgrade" version="7.0">
+                                <header>
+                                    <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
+                                    <button special="cancel" string="Close" icon="gtk-cancel"/>
+                                </header>
+                                <separator string="Apply Schedule Upgrade" colspan="4"/>
+                             </form>'''
+
         return res
 
     def get_module_list(self, cr, uid, context=None):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index b0316bdbf4b..8ba9432dce8 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -8,21 +8,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Update" version="7.0">
-                    <header>
-                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <div><label string="Your system will be updated."/></div>
                     <div><label string="Note that this operation might take a few minutes."/></div>
                     <separator string="Modules to Update"/>
                     <field name="module_info"/>
+                    <footer>
+                        <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
 
         <record id="action_view_base_module_upgrade" model="ir.actions.act_window">
-            <field name="name">Module Upgrade</field>
+            <field name="name">Apply Schedule Upgrade</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.module.upgrade</field>
             <field name="view_type">form</field>
@@ -44,14 +44,14 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Apply Scheduled Upgrades" version="7.0">
-                    <header>
+                <form string="Apply Schedule Upgrade" version="7.0">
+                    <div><label string="The selected modules have been updated / installed !"/></div>
+                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    <footer>
                         <button name="config" string="Start configuration" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <div><label string="The selected modules have been updated / installed !"/></div>
-                    <div><label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/></div>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index b80259194de..c80c81d9d05 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -7,23 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Synchronize Terms" version="7.0">
-                    <header>
-                        <button name="act_update" string="Update" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <group col="8">
-                        <group colspan="3">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
-                        </group>
-                        <separator orientation="vertical" rowspan="15"/>
-                        <group colspan="4">
-                            <separator string="Synchronize Translation" colspan="4"/>
-                            <field name="lang" colspan="4"/>
-                        </group>
+                    <group string="Synchronize Translation">
+                        <field name="lang"/>
                     </group>
+                    <footer>
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 334dbc93199..97fa2b50c3a 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -94,32 +94,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Register a Contract" version="7.0">
-                    <header>
-                        <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"  />
-                        <label string="or" states="draft"/>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you register a publisher warranty contract in your OpenERP system. After the contract has been registered, you will be able to send issues directly to OpenERP."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string=""/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="12" colspan="1"/>
-                        <group colspan="6">
-                            <separator string="Register a Contract" colspan="4"/>
-                            <group states="draft" colspan="4">
-                                <label string="Please enter the serial key provided in your contract document:" colspan="4"/>
-                                <field name="name" colspan="4"/>
-                            </group>
-                            <group states="finished" colspan="4">
-                                <label string="Publisher warranty contract successfully registered!" colspan="4"/>
-                            </group>
-                        </group>
+                    <field name="state" invisible="1"/>
+                    <separator string="Register a Contract"/>
+                    <group states="draft">
+                        <label string="Please enter the serial key provided in your contract document:" colspan="2"/>
+                        <field name="name"/>
                     </group>
+                    <group states="finished">
+                        <label string="Publisher warranty contract successfully registered!" colspan="4"/>
+                    </group>
+                    <footer>
+                        <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"/>
+                        <label string="or" states="draft"/>
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index c9010b64319..c5c05c1807c 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -172,6 +172,17 @@ class res_partner_bank(osv.osv):
                             ('required', field.required)]
         return res
 
+    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+        """
+        Format the name of a res.partner.bank.
+        This function is designed to be inherited to add replacement fields.
+        :param browse_record bank_type_obj: res.partner.bank.type object
+        :param browse_record bank_obj: res.partner.bank object
+        :rtype: str
+        :return: formatted name of a res.partner.bank record
+        """
+        return bank_type_obj.format_layout % bank_obj._data[bank_obj.id]
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -187,7 +198,7 @@ class res_partner_bank(osv.osv):
                         # avoid the default format_layout to result in "False: ..."
                         if not val._data[val.id]['bank_name']:
                             val._data[val.id]['bank_name'] = _('BANK')
-                        result = t.format_layout % val._data[val.id]
+                        result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
                         raise
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 0d20c646114..54835258283 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -108,12 +108,12 @@ class res_company(osv.osv):
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'rml_header1': fields.char('Report Header / Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents."),
+        'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
         'rml_footer1': fields.char('General Information Footer', size=200),
         'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
-        'rml_header3': fields.text('RML Internal Header', required=True),
+        'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
         'logo': fields.related('partner_id', 'photo', string="Logo", type="binary"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 5740042b160..6e46ce4e073 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -24,17 +24,23 @@
                     <div class="oe_right oe_avatar">
                         <field name="logo" nolabel="1" widget="image"/>
                     </div>
-                    <div class="oe_right oe_button_box">
-                        <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
+                    <div class="oe_right oe_button_box" name="button_box">
+                                <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline oe_right"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <group col="4">
-                            <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
-                            <field name="parent_id"  groups="base.group_multi_company"/>
-                        </group>
+                        <h1>
+                            <field name="name" class="oe_inline"/>
+                        </h1>
+                        <label for="rml_header1" class="oe_edit_only"/>
+                        <div>
+                            <field name="rml_header1" placeholder="Global Business Solutions"/>
+                        </div>
                     </div>
+                    <group col="4">
+                        <field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
+                        <field name="parent_id"  groups="base.group_multi_company"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <group>
@@ -44,40 +50,38 @@
                                         <field name="street" placeholder="Street..."/>
                                         <field name="street2"/>
                                         <div>
-                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                            <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="state_id" placeholder="State"/>
-                                        <field name="country_id" placeholder="Country"/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button"/>
                                     </div>
-                                    <field name="website" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>
                                 <group>
                                     <field name="phone" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
-                                    <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
                                     <field name="fax" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
+                                    <field name="email" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
                                     <field name="vat" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
                                     <field name="company_registry" on_change="on_change_header(phone, email, fax, website, vat, company_registry)"/>
                                 </group>
                             </group>
-                            <separator string="Header/Footer of Reports"/>
-                            <group>
-                                <field name="rml_header1" placeholder="Global Business Solutions"/>
-                                <field name="rml_footer1" groups="base.group_no_one"/>
+                            <group string="Bank Accounts">
+                                <field name="bank_ids" colspan="4" nolabel="1"/>
                                 <label for="rml_footer2"/>
-                                <div>
+                                <div name="bank_acc">
                                     <field name="rml_footer2"/>
-                                    <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+                                    <!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
                                 </div>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">
                             <group>
                                <field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
-                                <field name="rml_header"/>
+                                <field name="rml_footer1"/>
                             </group>
-                        </page>
-                        <page string="Internal Header/Footer" groups="base.group_no_one">
+                            <label for="rml_header"/>
+                            <field name="rml_header"/>
                             <label for="rml_header2"/>
                             <field name="rml_header2"/>
                             <label for="rml_header3"/>
@@ -85,12 +89,11 @@
                         </page>
                         <page string="Configuration">
                             <group>
-                                <field name="currency_id"/>
+                                <group name="account_grp" string="Accounting">
+                                    <field name="currency_id"/>
+                                </group>
                             </group>
                         </page>
-                        <page string="Bank Accounts">
-                            <field name="bank_ids"/>
-                        </page>
                     </notebook>
                     </sheet>
                 </form>
@@ -150,17 +153,18 @@
             <field name="arch" type="xml">
                 <form string="Multi Company" version="7.0">
                   <sheet>
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="6"/>
-                        <separator string="Matching" colspan="6"/>
-                        <field name="company_id"/>
-                        <field name="object_id"/>
-                        <field name="field_id" domain="[('model_id','=',object_id)]"/>
-                        <separator string="Condition" colspan="6"/>
-                        <field name="expression" colspan="4"/>
-                        <field name="sequence"/>
-                        <separator string="Returning" colspan="6"/>
-                        <field name="company_dest_id"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="company_id"/>
+                            <field name="company_dest_id"/>
+                        </group>
+                        <group>
+                            <field name="object_id"/>
+                            <field name="field_id" domain="[('model_id','=',object_id)]"/>
+                            <field name="expression"/>
+                            <field name="sequence"/>
+                        </group>
                     </group>
                    </sheet> 
                 </form>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 90857abfe9c..d814ca231f9 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -101,10 +101,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="photo" widget='image' class="oe_avatar oe_right" height="70"/>
-                    <div class="oe_right oe_button_box" name="buttons">
-
-                    </div>
+                    <field name="photo" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name" string="Customer Name"/> 
@@ -113,55 +110,22 @@
                         <h1>
                             <field name="name"/>
                         </h1>
-                        <table>
-                            <tr>
-                                <td>
-                                    <div attrs="{'invisible': [('is_company','=', True)]}">
-                                        <label for="parent_id" class="oe_edit_only"/>
-                            
-                                    </div>
-                                </td>
-                                <td>
-                                </td>
-                                <td>
-                                    <label for="function" class="oe_edit_only"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                                        
-                                        <field name="parent_id" nolabel="1"
-                                            domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                            class="oe_inline"
-                                            on_change="onchange_address(use_parent_address, parent_id)"/>
-                                        
-                                    </h2>
-                                </td>
-                                <td>
-                                    <h2>
-                                        <label string="," class="oe_inline" attrs="{'invisible': ['|', ('parent_id', '=', False), ('function', '=', False)]}"/>
-                                    </h2>
-                                </td>
-                                <td>
-                                    <h2>
-                                        <field nolabel="1" name="function" class="oe_inline"/>
-                                    </h2>
-                                </td>
-                            </tr>
-                        </table>
-                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
+                        <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
                     </div>
+                    <div class="oe_right oe_button_box" name="buttons"> </div>
 
                     <group>
                         <group>
+                            <field name="parent_id"
+                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                attrs="{'invisible': [('is_company','=', True)]}"
+                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
                             <div attrs="{'invisible': [('parent_id','=', False)]}">
                                 <field class="oe_inline"
                                     name="type"/>
-                                <label for="use_parent_address"/>
-                                <field name="use_parent_address"
-                                    class="oe_inline"
+                                <label for="use_parent_address" class="oe_edit_only"/>
+                                <field name="use_parent_address" class="oe_edit_only oe_inline"
                                     on_change="onchange_address(use_parent_address, parent_id)"/>
                             </div>
 
@@ -169,21 +133,24 @@
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
-                                <div>
-                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_inline" placeholder="City"/>
+                                <div class="address_format">
+                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="state_id" placeholder="State"/>
-                                <field name="country_id" placeholder="Country"/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button"/>
                             </div>
-                            <field name="website" widget="url" placeholder="www.openerp.com"/>
+                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
                         <group>
-                            <field name="phone" placeholder="+32.81.81.37.00"/>
+                            <field name="function" placeholder="e.g. Sales Director"
+                                attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                             <field name="email" widget="email"/>
-                            <field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="title" domain="[('domain', '=', 'contact')]"
+                                class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
                         </group>
                     </group>
 
@@ -402,9 +369,17 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="domain">[('customer','=',1)]</field>
             <field name="context">{'default_customer':1, 'search_default_customer':1}</field>
             <field name="filter" eval="True"/>
+            <field name="help">
+                Click on "Create" to add a new customer in your address book.
+                &lt;p&gt;
+                A contact is either a person or a company; a person can be linked to a company as a contact of that company.
+                &lt;p&gt;
+                You will be able to follow documents and history of your contacts (invoices, meetings, projects, etc.)
+            </field>
         </record>
 
         <record id="action_partner_supplier_form" model="ir.actions.act_window">
@@ -416,7 +391,13 @@
             <field name="view_mode">kanban,tree,form</field>
             <field name="context">{'search_default_supplier': 1,'default_customer': 0,'default_supplier': 1}</field>
             <field name="filter" eval="True"/>
-            <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>
+            <field name="help">
+                Click on "Create" to add a new supplier in your address book.
+                &lt;p&gt;
+                A supplier is either a person or a company; a person can be linked to a company as a contact of that company.
+                &lt;p&gt;
+                You will be able to follow documents and history of your contacts (invoices, meetings, projects, etc.)
+            </field>
         </record>
 
         <record id="action_partner_employee_form" model="ir.actions.act_window">
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e22b5addf48..97ca6ec32dc 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -231,7 +231,6 @@ class users(osv.osv):
             help="The user's timezone, used to output proper date and time values inside printed reports. "
                  "It is important to set a value for this field. You should use the same timezone "
                  "that is otherwise used to pick and render date and time values: your computer's timezone."),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
         'date': fields.datetime('Latest Connection', readonly=True),
     }
 
@@ -336,11 +335,10 @@ class users(osv.osv):
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'menu_tips': False
     }
 
     # User can write to a few of her own fields (but not her groups for example)
-    SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
+    SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
 
     def write(self, cr, uid, ids, values, context=None):
         if not hasattr(ids, '__iter__'):
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..4f8fb9f94fd 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -81,19 +81,17 @@
                 <form string="Users" version="7.0">
                     <field name="id" invisible="1"/>
                     <sheet>
-                        <div class="oe_right">
-                            <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
-                        </div>
+                        <field name="avatar" widget='image' on_change="onchange_avatar(avatar)" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
-                            <label for="company_id" class="oe_edit_only"/>
-                            <h2><field name="company_id" context="{'user_preference': 0}"/></h2>
+                            <label for="login" class="oe_edit_only"/>
+                            <h2><field name="login"/></h2>
                         </div>
                         <group>
                             <group>
-                                <field name="login"/>
                                 <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
+                                <field name="company_id" context="{'user_preference': 0}"/>
                             </group>
                             <group>
                                 <field name="active"/>
@@ -106,7 +104,6 @@
                                     <group name="preferences">
                                         <field name="context_lang"/>
                                         <field name="context_tz"/>
-                                        <field name="menu_tips"/>
                                     </group>
                                     <group groups="base.group_no_one">
                                         <field name="action_id"/>
@@ -119,12 +116,12 @@
                                 </group>
                             </page>
                             <page string="Access Rights">
-                                <group col="4">
-                                <field name="groups_id"/>
+                                <group string="Allowed Companies" groups="base.group_multi_company">
+                                    <field name="company_ids" nolabel="1" widget="many2many_tags"/>
+                                </group>
+                                <group col="4">
+                                    <field name="groups_id"/>
                                 </group>
-                            </page>
-                            <page string="Allowed Companies" groups="base.group_multi_company">
-                                <field name="company_ids"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -198,20 +195,17 @@
                     <div class="oe_right oe_avatar">
                         <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
                     </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1" class="oe_edit_only"/>
-                            (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1>
-                        <label for="company_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                        </h2>
-                    </div>
-                    <group col="4" string="Preferences">
+                    <h1>
+                        <field name="name" readonly="1" class="oe_inline"/>
+                        (<field name="login" readonly="1" class="oe_inline"/>)
+                    </h1>
+                    <group col="4">
                         <field name="context_lang" readonly="0"/>
+                        <field name="company_id" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         <field name="context_tz" readonly="0"/>
+                        <field name="company_id" widget="selection" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                     </group>
                     <group string="Email Preferences">
                         <field name="user_email" widget="email" readonly="0"/>